forked from bartvdbraak/blender
32b23b9f74
---------------------------------------------------------------
This was a test drive to see how painful the merge will be.
Next batches are:
- use desktop option for fullscreen
- multisampling option
- bullet collision mask
- python
- storage (vbo, dl, ...)
- lighting
[lighting still needs review]
[python could use review, although it should be straightforward]
[storage should be tested more I think]
Merged /branches/soc-2011-cucumber:r
36991,37059,37157,37416,37497-37499,37501,37522,39036,40593
36991:
==UI==
* Made some options available in Blender Game that were only available in Blender Render (camera resolution, animation fps)
* Created a panel for the embedded player
* Renamed the FPS option for the standalone player to Refresh Rate
* Moved framing options to display
* Made a button to launch the blender player from within blender (only tested on windows for now)
37059:
==UI==
* Added the option to change the exit key for the BGE. The UI currently just sets a number, and this feature most likely does not work for blenderplayer yet. More work on this to come.
* Removed the physics settings from the scene panel for the BGE.
* Added an Add menu in the logic brick header.
37157:
Making the bake options available in Blender Game
37416:
Making the exit key UI element accept key presses instead of numbers. It still does not work for the Blenderplayer, and it does not limit the input to key presses (other events don't work for exiting)
37497:
Some more work on getting the exit key to work in the Blenderplayer.
Input is now restricted to keyboard events only for the exit key UI.
37498:
Some clean up from the last commit.
The exit key setting affects the Blenderplayer now.
37499:
Cleaning up some duplicate code. Now the reverseTranslateTable for converting blender key codes to ketsji key codes is only defined in BL_BlenderDataConverter.
37501:
Centralizing the exit key methods to the keyboard devices. This should make it easier to get exit key control to the python API.
[37517: committed previously]
37522:
Moved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.
Added setExitKey and getExitKey to the python API
39036:
A couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.
[not committed entirely, see below]]
40552: space_logic.py (* fixed an error in space_logic.py *)
40593:
launch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me
########################################################
code left behind (to be included in next commit):
########################################################
{
/* Initialize default values for collision masks */
Object *ob;
for(ob=main->object.first; ob; ob=ob->id.next)
ob->col_group = ob->col_mask = 1;
}
|
||
|---|---|---|
| .. | ||
| __init__.py | ||
| properties_animviz.py | ||
| properties_data_armature.py | ||
| properties_data_bone.py | ||
| properties_data_camera.py | ||
| properties_data_curve.py | ||
| properties_data_empty.py | ||
| properties_data_lamp.py | ||
| properties_data_lattice.py | ||
| properties_data_mesh.py | ||
| properties_data_metaball.py | ||
| properties_data_modifier.py | ||
| properties_data_speaker.py | ||
| properties_game.py | ||
| properties_material.py | ||
| properties_object_constraint.py | ||
| properties_object.py | ||
| properties_particle.py | ||
| properties_physics_cloth.py | ||
| properties_physics_common.py | ||
| properties_physics_dynamicpaint.py | ||
| properties_physics_field.py | ||
| properties_physics_fluid.py | ||
| properties_physics_smoke.py | ||
| properties_physics_softbody.py | ||
| properties_render.py | ||
| properties_scene.py | ||
| properties_texture.py | ||
| properties_world.py | ||
| space_clip.py | ||
| space_console.py | ||
| space_dopesheet.py | ||
| space_filebrowser.py | ||
| space_graph.py | ||
| space_image.py | ||
| space_info.py | ||
| space_logic.py | ||
| space_nla.py | ||
| space_node.py | ||
| space_outliner.py | ||
| space_sequencer.py | ||
| space_text.py | ||
| space_time.py | ||
| space_userpref_keymap.py | ||
| space_userpref.py | ||
| space_view3d_toolbar.py | ||
| space_view3d.py | ||