kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
c6da2a59d8
blender/source/gameengine/GameLogic
History
Brecht Van Lommel bdfe7d89e2 Merge of trunk into blender 2.5: 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.
2008-11-12 21:16:53 +00:00
..
Joystick Fix for a relative paths issue in the game engine. G.sce was being 2008-10-11 00:56:49 +00:00
CMakeLists.txt Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
Makefile converted my gen_utils.h fix to PyObjectPlus.h 2008-09-06 14:13:31 +00:00
SCA_2DFilterActuator.cpp Fix for bug #17620: the motion blur actuator did not work correct 2008-09-15 00:57:11 +00:00
SCA_2DFilterActuator.h improvement of 2d-filter custom shader, 2008-07-12 10:21:37 +00:00
SCA_ActuatorEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_ActuatorEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_ActuatorSensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_ActuatorSensor.h BGE patch: Add PyDoc for new logic bricks, set exception message on Py error, remove args on Py functions that don't take any to save CPU time 2008-07-23 21:37:37 +00:00
SCA_AlwaysEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_AlwaysEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_AlwaysSensor.cpp BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_AlwaysSensor.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_ANDController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_ANDController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_DelaySensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_DelaySensor.h BGE patch: New Delay sensor (derived from patch #17472) 2008-08-16 20:45:37 +00:00
SCA_EventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_EventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_ExpressionController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_ExpressionController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_IActuator.cpp BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_IActuator.h BGE logic patch: new "Add" mode for Ipo actuator, several corrections in state system. 2008-07-08 12:18:43 +00:00
SCA_IController.cpp BGE state system improvement: the sensor with Level option enabled will trigger the controller of a newly activated state, even if the sensor is already connected to an active state; new isTriggered() python function to determine which sensor triggered the current controller. 2008-08-23 11:54:27 +00:00
SCA_IController.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_IInputDevice.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_IInputDevice.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_ILogicBrick.cpp converted my gen_utils.h fix to PyObjectPlus.h 2008-09-06 14:13:31 +00:00
SCA_ILogicBrick.h BGE patch: Relink actuators with target within group when duplicating group; generalize protection against object deletion for all actuators that point to objects. 2008-07-19 07:45:19 +00:00
SCA_IObject.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_IObject.h BGE logic patch: new "Add" mode for Ipo actuator, several corrections in state system. 2008-07-08 12:18:43 +00:00
SCA_IScene.cpp BGE bug fix: crash at exit when object with Radar/Near sensor has debug properties 2008-04-19 21:15:37 +00:00
SCA_IScene.h BGE bug fix: crash at exit when object with Radar/Near sensor has debug properties 2008-04-19 21:15:37 +00:00
SCA_ISensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_ISensor.h BGE bug fix (continuation of previous bug fix): 2008-10-17 09:24:35 +00:00
SCA_JoystickManager.cpp Fix for a relative paths issue in the game engine. G.sce was being 2008-10-11 00:56:49 +00:00
SCA_JoystickManager.h BGE patch approved: BGE Multiple Joysticks 2008-08-31 18:42:58 +00:00
SCA_JoystickSensor.cpp source/blender/blenloader/intern/readfile.c - use memmove rather then strncpy for overlapping strings. 2008-10-19 04:02:37 +00:00
SCA_JoystickSensor.h joystick update 2008-10-07 05:09:24 +00:00
SCA_KeyboardManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_KeyboardManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_KeyboardSensor.cpp * Joystick sensor is now only triggered from events of the selected type. 2008-10-08 03:16:19 +00:00
SCA_KeyboardSensor.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_LogicManager.cpp BGE state system improvement: the sensor with Level option enabled will trigger the controller of a newly activated state, even if the sensor is already connected to an active state; new isTriggered() python function to determine which sensor triggered the current controller. 2008-08-23 11:54:27 +00:00
SCA_LogicManager.h BGE state system improvement: the sensor with Level option enabled will trigger the controller of a newly activated state, even if the sensor is already connected to an active state; new isTriggered() python function to determine which sensor triggered the current controller. 2008-08-23 11:54:27 +00:00
SCA_MouseManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_MouseManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_MouseSensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_MouseSensor.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_NANDController.cpp BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_NANDController.h BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_NORController.cpp BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_NORController.h BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_ORController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_ORController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_PropertyActuator.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_PropertyActuator.h BGE patch: Relink actuators with target within group when duplicating group; generalize protection against object deletion for all actuators that point to objects. 2008-07-19 07:45:19 +00:00
SCA_PropertyEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_PropertyEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_PropertySensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_PropertySensor.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_PythonController.cpp make sure BPY_Err_Handle clears python errors, even if the exception cant be printed. Added PyErr_Clear() incase there are other references to exception data (sys.exc_info() from python) 2008-10-22 07:09:15 +00:00
SCA_PythonController.h [#17600] char* -> const char* 2008-09-20 11:08:35 +00:00
SCA_RandomActuator.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_RandomActuator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_RandomEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_RandomEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_RandomNumberGenerator.cpp big warning hunt commit 2005-03-09 19:45:59 +00:00
SCA_RandomNumberGenerator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
SCA_RandomSensor.cpp Python 2.4 should build with the game engine now, no thanks to python for switching from char to const char 2008-10-02 00:22:28 +00:00
SCA_RandomSensor.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
SCA_TimeEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_TimeEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
SCA_XNORController.cpp BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_XNORController.h BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_XORController.cpp BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SCA_XORController.h BGE patch: Add NAND, NOR, XOR, XNOR controllers. 2008-06-23 20:41:18 +00:00
SConscript Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00