archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
c50ccc847613bbe02bea64cee3f744b449da170c
blender-archive/source/gameengine/Ketsji
History
Bastien Montagne 069569f820 Merge branch 'master' into blender2.8 
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/

Conflicts:
	intern/ghost/intern/GHOST_WindowWin32.cpp
	source/blender/blenkernel/BKE_effect.h
	source/blender/blenkernel/BKE_pointcache.h
	source/blender/blenkernel/intern/cloth.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/effect.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/blenkernel/intern/rigidbody.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/blenkernel/intern/softbody.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/gpu/intern/gpu_debug.c
	source/blender/makesdna/DNA_object_types.h
	source/blender/makesrna/intern/rna_particle.c
2016-08-21 13:18:26 +02:00
..
KXNetwork
Remove SCons building system
2016-01-04 14:20:48 +05:00
BL_Action.cpp
Cleanup/Refactor: pass Main pointer to all ID copy functions.
2016-07-10 14:52:00 +02:00
BL_Action.h
BGE: Fix T45945: Action bouncing.
2015-10-28 15:13:12 +01:00
BL_ActionManager.cpp
Split id->flag in two, persistent flags and runtime tags.
2015-12-27 12:00:33 +01:00
BL_ActionManager.h
BGE: Fix T46381 : last action frame not updated.
2015-10-19 16:03:40 +02:00
BL_BlenderShader.cpp
Fixed some minor errors in game engine and player.
2016-04-16 12:11:34 +02:00
BL_BlenderShader.h
Fix a few compiler warnings reported by clang.
2013-08-18 14:15:51 +00:00
BL_Material.cpp
Move from MTFace to MTexPoly w/ texture checks
2015-07-14 22:36:00 +10:00
BL_Material.h
Move from MTFace to MTexPoly w/ texture checks
2015-07-14 22:36:00 +10:00
BL_Shader.cpp
BL_Shader.setUniformEyef(name)
2016-06-11 22:24:18 +02:00
BL_Shader.h
BL_Shader.setUniformEyef(name)
2016-06-11 22:24:18 +02:00
BL_Texture.cpp
World textures displaying for viewport in BI.
2016-01-27 12:06:57 +03:00
BL_Texture.h
…
CMakeLists.txt
BGE: Remove KX_IPOActuator.
2015-11-03 10:31:08 +01:00
KX_ArmatureSensor.cpp
style cleanup
2013-03-18 11:44:56 +00:00
KX_ArmatureSensor.h
…
KX_BlenderMaterial.cpp
BGE: Allow access to original texture openGL Bind code/Id/Number
2016-02-18 12:05:53 +01:00
KX_BlenderMaterial.h
BGE: Allow access to original texture openGL Bind code/Id/Number
2016-02-18 12:05:53 +01:00
KX_Camera.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_Camera.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_CameraActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_CameraActuator.h
…
KX_CameraIpoSGController.cpp
…
KX_CameraIpoSGController.h
…
KX_CharacterWrapper.cpp
BGE: Adding a Max Jumps value to the character physic window
2015-10-11 18:28:43 +02:00
KX_CharacterWrapper.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_ClientObjectInfo.h
BGE: Fix T35288 Touch/Ray/Mouse sensor and Constraint actuator with material check doesn't work.
2015-07-25 09:43:06 +02:00
KX_ConstraintActuator.cpp
BGE clean up: use float version of trigonometric functions
2015-12-16 01:53:48 +01:00
KX_ConstraintActuator.h
BGE : Collision mask support in raycast + and raycast cleanup.
2015-10-07 22:14:43 +02:00
KX_ConstraintWrapper.cpp
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_ConstraintWrapper.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_Dome.cpp
BGE: Various render improvements.
2016-06-11 22:05:20 +02:00
KX_Dome.h
Ghost Context Refactor
2014-10-07 15:47:32 -05:00
KX_EmptyObject.cpp
…
KX_EmptyObject.h
…
KX_FontObject.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_FontObject.h
fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in Windows
2015-03-16 18:46:40 +01:00
KX_GameActuator.cpp
BGE: Adding a screenshot function to game actuator
2015-10-11 13:41:38 +02:00
KX_GameActuator.h
BGE: Adding a screenshot function to game actuator
2015-10-11 13:41:38 +02:00
KX_GameObject.cpp
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
KX_GameObject.h
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_IInterpolator.h
…
KX_IPO_SGController.cpp
BGE: Fix T38986: Start object position not initialized in IPO.
2015-10-29 18:44:09 +01:00
KX_IPO_SGController.h
BGE: Cleanup KX_IPO_SGCOntroller.
2015-10-29 17:24:35 +01:00
KX_IpoConvert.cpp
BGE: Adding material IPO support to GLSL materials
2015-05-11 23:05:04 -07:00
KX_IpoConvert.h
BGE: Fix T27322: World F-Curve
2015-03-23 21:43:42 +01:00
KX_IPOTransform.h
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_IScalarInterpolator.h
…
KX_ISceneConverter.h
BGE: Fix issues with async libload.
2015-10-25 19:22:29 +01:00
KX_ISystem.h
…
KX_KetsjiEngine.cpp
BGE: Various render improvements.
2016-06-11 22:05:20 +02:00
KX_KetsjiEngine.h
BGE: Various render improvements.
2016-06-11 22:05:20 +02:00
KX_Light.cpp
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
KX_Light.h
BGE: Allow access to light shadow settings with python
2016-01-17 18:47:14 +01:00
KX_LightIpoSGController.cpp
BGE code cleanup: Removing OpenGL and bf_gpu code from KX_LightObject
2014-03-27 22:32:06 -07:00
KX_LightIpoSGController.h
Code cleanup: RAS_ILightObject is class, not a struct.
2014-04-12 20:12:07 +02:00
KX_MaterialIpoController.cpp
BGE: Adding material IPO support to GLSL materials
2015-05-11 23:05:04 -07:00
KX_MaterialIpoController.h
…
KX_MeshProxy.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_MeshProxy.h
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_MotionState.cpp
BGE: Cleaning up the BGE's physics code and removing KX_IPhysicsController and KX_BulletPhysicsController. Instead, we just use PHY_IPhysicsController, which removes a lot of duplicate code.
2013-11-04 19:22:47 +00:00
KX_MotionState.h
BGE: Cleaning up the BGE's physics code and removing KX_IPhysicsController and KX_BulletPhysicsController. Instead, we just use PHY_IPhysicsController, which removes a lot of duplicate code.
2013-11-04 19:22:47 +00:00
KX_MouseActuator.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_MouseActuator.h
Fix for building without Python
2015-06-14 04:53:10 +10:00
KX_MouseFocusSensor.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_MouseFocusSensor.h
BGE : Collision mask support in raycast + and raycast cleanup.
2015-10-07 22:14:43 +02:00
KX_NavMeshObject.cpp
More fixes from coverity report.
2016-08-16 18:19:52 +02:00
KX_NavMeshObject.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_NearSensor.cpp
Fix T38539: Can't set near sensor distance above 100 via python
2014-02-22 13:57:12 +11:00
KX_NearSensor.h
…
KX_ObColorIpoSGController.cpp
BGE: Object color channels can now be animated separately without zeroing out the other channels. Problem reported by Dalai via IRC.
2013-02-23 01:17:01 +00:00
KX_ObColorIpoSGController.h
…
KX_ObjectActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_ObjectActuator.h
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_ObstacleSimulation.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_ObstacleSimulation.h
…
KX_OrientationInterpolator.cpp
BGE clean up: use float version of trigonometric functions
2015-12-16 01:53:48 +01:00
KX_OrientationInterpolator.h
…
KX_ParentActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_ParentActuator.h
…
KX_PhysicsEngineEnums.h
…
KX_PolyProxy.cpp
BGE: Fix T38030: wrong vertex index returned by KX_PolyProxy
2015-06-20 14:21:31 +02:00
KX_PolyProxy.h
code cleanup: remove unused define, correct header guard mismatch, add NULL check so DM_to_mesh() can have a NULL object passed (currently not used) and remove redundant NULL check.
2013-08-03 23:58:17 +00:00
KX_PositionInterpolator.cpp
…
KX_PositionInterpolator.h
…
KX_PyConstraintBinding.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_PyConstraintBinding.h
BGE: python API cleanup - bge submodules definitions
2015-02-03 15:32:54 +00:00
KX_PyMath.cpp
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_PyMath.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_PythonInit.cpp
BGE: Various render improvements.
2016-06-11 22:05:20 +02:00
KX_PythonInit.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_PythonInitTypes.cpp
BGE: Remove KX_IPOActuator.
2015-11-03 10:31:08 +01:00
KX_PythonInitTypes.h
Recreating bge python modules instead of using existing
2015-02-09 20:56:38 +00:00
KX_PythonMain.cpp
…
KX_PythonMain.h
Fix T37488: Crash with --debug reading userpref.blend
2013-11-18 18:13:23 +06:00
KX_RadarSensor.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_RadarSensor.h
…
KX_RayCast.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_RayCast.h
BGE : Collision mask support in raycast + and raycast cleanup.
2015-10-07 22:14:43 +02:00
KX_RayEventManager.cpp
…
KX_RayEventManager.h
…
KX_RaySensor.cpp
BGE : Collision mask support in raycast + and raycast cleanup.
2015-10-07 22:14:43 +02:00
KX_RaySensor.h
BGE : Collision mask support in raycast + and raycast cleanup.
2015-10-07 22:14:43 +02:00
KX_SCA_AddObjectActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_SCA_AddObjectActuator.h
…
KX_SCA_DynamicActuator.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_SCA_DynamicActuator.h
BGE: Cleaning up the BGE's physics code and removing KX_IPhysicsController and KX_BulletPhysicsController. Instead, we just use PHY_IPhysicsController, which removes a lot of duplicate code.
2013-11-04 19:22:47 +00:00
KX_SCA_EndObjectActuator.cpp
…
KX_SCA_EndObjectActuator.h
…
KX_SCA_ReplaceMeshActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_SCA_ReplaceMeshActuator.h
…
KX_ScalarInterpolator.cpp
…
KX_ScalarInterpolator.h
…
KX_ScalingInterpolator.cpp
…
KX_ScalingInterpolator.h
…
KX_Scene.cpp
simplify redundant conditionals
2016-07-31 01:22:36 -04:00
KX_Scene.h
BGE: Various render improvements.
2016-06-11 22:05:20 +02:00
KX_SceneActuator.cpp
style cleanup:
2013-03-26 07:29:01 +00:00
KX_SceneActuator.h
…
KX_SG_BoneParentNodeRelationship.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_SG_BoneParentNodeRelationship.h
…
KX_SG_NodeRelationships.cpp
…
KX_SG_NodeRelationships.h
…
KX_SoundActuator.cpp
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
KX_SoundActuator.h
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
2015-07-28 14:01:53 +02:00
KX_StateActuator.cpp
…
KX_StateActuator.h
…
KX_SteeringActuator.cpp
BGE: Fix T48071: Global logic manager
2016-04-10 23:57:43 +02:00
KX_SteeringActuator.h
BGE: Fix T41502 Path following jumping
2015-02-18 23:24:02 +01:00
KX_TimeCategoryLogger.cpp
…
KX_TimeCategoryLogger.h
…
KX_TimeLogger.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_TimeLogger.h
…
KX_TouchEventManager.cpp
BGE: Fix invalid operator< for microsoft compiler.
2015-12-30 13:47:43 +01:00
KX_TouchEventManager.h
BGE physics: When colliding, report first contact point to Python
2015-02-08 15:52:13 +01:00
KX_TouchSensor.cpp
BGE: Fix T35288 Touch/Ray/Mouse sensor and Constraint actuator with material check doesn't work.
2015-07-25 09:43:06 +02:00
KX_TouchSensor.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_TrackToActuator.cpp
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
KX_TrackToActuator.h
BGE: TrackTo actuator: increasing up & track axis options
2014-07-14 18:30:27 -07:00
KX_VehicleWrapper.cpp
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
KX_VehicleWrapper.h
BGE Clean-up: New EXP prefix for the BGE Expression module
2015-07-12 16:58:12 +02:00
KX_VertexProxy.cpp
BGE Ketsji clean-up: double-promotion warnings
2015-12-16 01:53:48 +01:00
KX_VertexProxy.h
Revert "BGE : KX_VertexProxy support for more than 2 UV channel."
2015-06-06 13:12:27 -07:00
KX_VisibilityActuator.cpp
…
KX_VisibilityActuator.h
…
KX_WorldInfo.cpp
BGE: Change KX_WolrdInfo mathutils vector to color
2015-10-11 18:43:05 +02:00
KX_WorldInfo.h
Fix for building with C++ guarded alloc
2015-09-08 19:42:58 +10:00
KX_WorldIpoController.cpp
BGE: Fix T27322: World F-Curve
2015-03-23 21:43:42 +01:00
KX_WorldIpoController.h
BGE: Fix T27322: World F-Curve
2015-03-23 21:43:42 +01:00