kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
131fa2e00c
blender/source/gameengine/Ketsji
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
..
KXNetwork Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00
BL_BlenderShader.cpp * GLSL lamps now respect 3d viewport layers. 2008-09-05 14:33:36 +00:00
BL_BlenderShader.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
BL_Material.cpp Sync with Apricot Game Engine 2008-07-10 12:47:20 +00:00
BL_Material.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
BL_Shader.cpp [#17600] char* -> const char* 2008-09-20 11:08:35 +00:00
BL_Shader.h [#17600] char* -> const char* 2008-09-20 11:08:35 +00:00
BL_Texture.cpp Game Engine: alpha blending and sorting 2008-07-29 15:48:31 +00:00
BL_Texture.h Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
CMakeLists.txt Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00
KX_BlenderMaterial.cpp Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_BlenderMaterial.h VideoTexture: Add support for GLSL. FIx small printout bug in Exception printout 2008-11-05 13:22:10 +00:00
KX_BulletPhysicsController.cpp BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_BulletPhysicsController.h BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_Camera.cpp Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_Camera.h fix BGE bug #8646: unusable anaglyph settings 2008-05-24 08:34:04 +00:00
KX_CameraActuator.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
KX_CameraActuator.h Python API get/setObject update for Actuators. (SetParent, AddObject, Camera and TrackTo) 2008-08-14 08:58:25 +00:00
KX_CameraIpoSGController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_CameraIpoSGController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_CDActuator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_CDActuator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ClientObjectInfo.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ConstraintActuator.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
KX_ConstraintActuator.h BGE patch: new force field constraint actuator 2008-10-01 19:16:13 +00:00
KX_ConstraintWrapper.cpp converted my gen_utils.h fix to PyObjectPlus.h 2008-09-06 14:13:31 +00:00
KX_ConstraintWrapper.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ConvertPhysicsObject.h enable -noaudio option, so it actually works (and doesn't get overwritten by a game flag). audio initialization delays startup of game engine 2 seconds 2008-09-28 03:07:13 +00:00
KX_ConvertPhysicsObjects.cpp Add Fh/Rot Fh to Bullet. 2008-09-29 06:58:49 +00:00
KX_EmptyObject.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_EmptyObject.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_GameActuator.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
KX_GameActuator.h save and load configuration actuator, (option in game actuator menu) 2008-09-12 02:15:16 +00:00
KX_GameObject.cpp Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_GameObject.h face transp option CLIP wasnt added to the py api. 2008-10-27 15:47:58 +00:00
KX_IInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_IPhysicsController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_IPhysicsController.h BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_IPO_SGController.cpp BGE bug #17657 fixed: dRotY doesn't work properly after 90 degrees rotation. 2008-09-23 20:07:15 +00:00
KX_IPO_SGController.h BGE bug #17657 fixed: dRotY doesn't work properly after 90 degrees rotation. 2008-09-23 20:07:15 +00:00
KX_IpoActuator.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
KX_IpoActuator.h BGE patch: add frameProp to Ipo actuator (Carsten's request). 2008-10-01 21:17:00 +00:00
KX_IPOTransform.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_IScalarInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ISceneConverter.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_ISystem.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_KetsjiEngine.cpp Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_KetsjiEngine.h Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_Light.cpp Fix for bug #17589: removing a lamp in the game engine with glsl 2008-09-10 09:51:06 +00:00
KX_Light.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_LightIpoSGController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_LightIpoSGController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_MaterialIpoController.cpp Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported! 2008-08-17 17:08:00 +00:00
KX_MaterialIpoController.h BGE patch: approve patch #17312: Multiple material IPOs per mesh in BGE. 2008-07-25 13:45:57 +00:00
KX_MeshProxy.cpp converted my gen_utils.h fix to PyObjectPlus.h 2008-09-06 14:13:31 +00:00
KX_MeshProxy.h BGE patch: KX_GameObject::rayCast() improvements to have X-Ray option, return true face normal and hit polygon information. 2008-08-27 19:34:19 +00:00
KX_MotionState.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_MotionState.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_MouseFocusSensor.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
KX_MouseFocusSensor.h Fix for bug #3858: the game engine mouse focus sensor did not work 2008-09-18 01:46:28 +00:00
KX_NearSensor.cpp BGE bug fix (continuation of previous bug fix): 2008-10-17 09:24:35 +00:00
KX_NearSensor.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
KX_ObColorIpoSGController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ObColorIpoSGController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ObjectActuator.cpp game engine python api 2008-08-14 03:23:36 +00:00
KX_ObjectActuator.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
KX_OdePhysicsController.cpp BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_OdePhysicsController.h BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_OrientationInterpolator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_OrientationInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ParentActuator.cpp Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_ParentActuator.h Python API get/setObject update for Actuators. (SetParent, AddObject, Camera and TrackTo) 2008-08-14 08:58:25 +00:00
KX_PhysicsEngineEnums.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PhysicsObjectWrapper.cpp converted my gen_utils.h fix to PyObjectPlus.h 2008-09-06 14:13:31 +00:00
KX_PhysicsObjectWrapper.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PhysicsPropertiesobsolete.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PolygonMaterial.cpp Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_PolygonMaterial.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_PolyProxy.cpp Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_PolyProxy.h BGE patch: KX_GameObject::rayCast() improvements to have X-Ray option, return true face normal and hit polygon information. 2008-08-27 19:34:19 +00:00
KX_PositionInterpolator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PositionInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PyConstraintBinding.cpp Fix bug in rigid body constraint buttons drawing, and while we are at it, add 'Collision' button to disable collisions between bodies, linked between constraint. 2008-10-10 05:12:57 +00:00
KX_PyConstraintBinding.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PyMath.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_PyMath.h added exception messages to game engine matrix and vector conversions. also removed own unneeded defines in arithb.c 2008-07-25 21:14:23 +00:00
KX_PythonInit.cpp Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00
KX_PythonInit.h Preparation to VideoTexture: everything but the VideoTexture module itself. 2008-10-31 21:06:48 +00:00
KX_RadarSensor.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
KX_RadarSensor.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_RayCast.cpp BGE patch: KX_GameObject::rayCast() improvements to have X-Ray option, return true face normal and hit polygon information. 2008-08-27 19:34:19 +00:00
KX_RayCast.h BGE patch: KX_GameObject::rayCast() improvements to have X-Ray option, return true face normal and hit polygon information. 2008-08-27 19:34:19 +00:00
KX_RayEventManager.cpp BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
KX_RayEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
KX_RaySensor.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
KX_RaySensor.h BGE patch: add X-Ray option to ray sensor. The option is effective only if a property is set: the sensor will ignore the objects that don't have the property. 2008-08-28 19:37:49 +00:00
KX_SCA_AddObjectActuator.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
KX_SCA_AddObjectActuator.h get/set Angular velocity for KX_GameObjects python api and for the AddObject actuator. 2008-08-27 03:34:53 +00:00
KX_SCA_DynamicActuator.cpp BGE patch 15044 approved: Edit Object Dynamics Actuator. 2008-06-25 14:09:15 +00:00
KX_SCA_DynamicActuator.h BGE patch 15044 approved: Edit Object Dynamics Actuator. 2008-06-25 14:09:15 +00:00
KX_SCA_EndObjectActuator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_SCA_EndObjectActuator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_SCA_ReplaceMeshActuator.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
KX_SCA_ReplaceMeshActuator.h BGE Py API 2008-09-05 02:53:12 +00:00
KX_ScalarInterpolator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ScalarInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ScalingInterpolator.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_ScalingInterpolator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_Scene.cpp BGE showstopper bug fix: 2008-10-16 23:33:40 +00:00
KX_Scene.h Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_SceneActuator.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
KX_SceneActuator.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
KX_SG_BoneParentNodeRelationship.cpp Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_SG_BoneParentNodeRelationship.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_SG_NodeRelationships.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_SG_NodeRelationships.h Added access for adjusting timeOffset value at runtime, used for apricot (Franky climbing walls) 2008-06-14 17:12:49 +00:00
KX_SoundActuator.cpp BGE bug fix: fix several bugs and inconsistencies in sound actuator: 2008-10-09 06:06:11 +00:00
KX_SoundActuator.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_StateActuator.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
KX_StateActuator.h BGE patch: add state engine support in the logic bricks. 2008-06-22 14:23:57 +00:00
KX_SumoPhysicsController.cpp BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_SumoPhysicsController.h BGE bug #17688 fixed: Near Sensor Reset not working (for Gamekit) 2008-10-01 07:55:02 +00:00
KX_TimeCategoryLogger.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_TimeCategoryLogger.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_TimeLogger.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_TimeLogger.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_TouchEventManager.cpp BGE fix bug #17430: BGE Collide/Touch Sensor interfearing with other unrelated sensor states. The bug was introduced in the recent logic optimization patch. It only affects collision and touch sensors. The bug is fixed by keeping track of registration count. 2008-08-05 16:23:33 +00:00
KX_TouchEventManager.h BGE patch: logic optimization part 2: remove inactive sensors from logic manager. 2008-07-30 17:41:47 +00:00
KX_TouchSensor.cpp BGE bug fix (continuation of previous bug fix): 2008-10-17 09:24:35 +00:00
KX_TouchSensor.h BGE showstopper bug fix: 2008-10-16 23:33:40 +00:00
KX_TrackToActuator.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
KX_TrackToActuator.h Python API get/setObject update for Actuators. (SetParent, AddObject, Camera and TrackTo) 2008-08-14 08:58:25 +00:00
KX_VehicleWrapper.cpp BGE showstopper bug fix: 2008-10-16 23:33:40 +00:00
KX_VehicleWrapper.h exposed a few more tuning paramters 2006-02-21 07:08:23 +00:00
KX_VertexProxy.cpp Merge of first part of changes from the apricot branch, especially 2008-09-04 20:51:28 +00:00
KX_VertexProxy.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_VisibilityActuator.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
KX_VisibilityActuator.h BGE set visible actuator, option to set visibility recursively to make managing visibility for collections of objects a lot easier. 2008-09-05 16:22:14 +00:00
KX_WorldInfo.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_WorldInfo.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_WorldIpoController.cpp Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
KX_WorldIpoController.h Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
Makefile Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00
SConscript Merge of trunk into blender 2.5: 2008-11-12 21:16:53 +00:00