griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
a42ba82f638e481d7fd3c3ed2ba05c331ef6717e
test/source/gameengine/GameLogic
History
Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
..
Joystick
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
CMakeLists.txt
bge.logic.keyboard.getClipboard() and .setClipboard methods
2012-06-27 21:57:33 +00:00
SCA_2DFilterActuator.cpp
style cleanup
2012-03-28 05:03:24 +00:00
SCA_2DFilterActuator.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_ActuatorEventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_ActuatorEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_ActuatorSensor.cpp
use defines for property name lenghths in the BGE, were using 31,32,64,100.
2012-01-16 05:27:11 +00:00
SCA_ActuatorSensor.h
code cleanup: header cleanup
2012-04-30 14:24:11 +00:00
SCA_AlwaysEventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_AlwaysEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_AlwaysSensor.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_AlwaysSensor.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_ANDController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_ANDController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_BasicEventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_BasicEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_DelaySensor.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_DelaySensor.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_EventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_EventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_ExpressionController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_ExpressionController.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_IActuator.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_IActuator.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_IController.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_IController.h
code cleanup:
2012-05-20 19:49:27 +00:00
SCA_IInputDevice.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_IInputDevice.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_ILogicBrick.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_ILogicBrick.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_IObject.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_IObject.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_IScene.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_IScene.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_ISensor.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_ISensor.h
style cleanup
2012-03-02 16:05:54 +00:00
SCA_JoystickManager.cpp
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
SCA_JoystickManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_JoystickSensor.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_JoystickSensor.h
style cleanup
2012-06-06 22:38:39 +00:00
SCA_KeyboardManager.cpp
style cleanup: pep8, indentation
2012-03-24 07:36:32 +00:00
SCA_KeyboardManager.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_KeyboardSensor.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_KeyboardSensor.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_LogicManager.cpp
style cleanup: comments
2012-06-30 22:49:33 +00:00
SCA_LogicManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_MouseManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_MouseManager.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_MouseSensor.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_MouseSensor.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_NANDController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_NANDController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_NORController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_NORController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_ORController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_ORController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_PropertyActuator.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PropertyActuator.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_PropertyEventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_PropertyEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_PropertySensor.cpp
Fix for [#31122] "Properties cant have Spaces in names when using interval as a evaluation. Or else it'll fail to activate actuator." reported by Auuman Anubis.
2012-07-05 20:34:42 +00:00
SCA_PropertySensor.h
Fix for [#31122] "Properties cant have Spaces in names when using interval as a evaluation. Or else it'll fail to activate actuator." reported by Auuman Anubis.
2012-07-05 20:34:42 +00:00
SCA_PythonController.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PythonController.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PythonKeyboard.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PythonKeyboard.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PythonMouse.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_PythonMouse.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_RandomActuator.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_RandomActuator.h
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_RandomEventManager.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_RandomEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_RandomNumberGenerator.cpp
style cleanup, use { on newline after function definition.
2012-02-25 16:49:59 +00:00
SCA_RandomNumberGenerator.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_RandomSensor.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_RandomSensor.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_TimeEventManager.cpp
Merged changes in the trunk up to revision 50829.
2012-09-23 18:50:56 +00:00
SCA_TimeEventManager.h
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
2012-06-25 09:14:37 +00:00
SCA_XNORController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_XNORController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SCA_XORController.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
SCA_XORController.h
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
2012-02-23 10:41:31 +00:00
SConscript
bge.logic.keyboard.getClipboard() and .setClipboard methods
2012-06-27 21:57:33 +00:00