Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

2012-11-14 02:01:02 +00:00

..

blender

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

blenderplayer

Merged changes in the trunk up to revision 52118.

2012-11-12 00:30:55 +00:00

creator

Merged changes in the trunk up to revision 52118.

2012-11-12 00:30:55 +00:00

darwin

initial retina support for osx \ to take effect you must perhaps logout/in \i prefer in terminal: /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -v -f

2012-09-07 15:44:20 +00:00

gameengine

BGE: Renaming KX_GameObject.group_parent and group_children to groupObject and groupMembers to be a bit more descriptive and match the rest of the BGE Py API. KX_MeshProxy.transform_uv has also been renamed to transformUV. It would be nice to switch to PEP8 names for the BGE Python API, but for now, consistency is better.

2012-11-13 04:38:34 +00:00

icons

…

tests

code cleanup: cmake - add missing headers, remove directories from source listing.

2012-11-03 15:49:38 +00:00

CMakeLists.txt

…

SConscript

Scons:

2012-06-30 22:44:36 +00:00