[tuhopuu-cvs] CVS commit: tuhopuu2 SConstruct tuhopuu2/extern/solid/examples/dynamics RigidBody.cpp tuhopuu2/extern/solid/include MT_Scalar.h tuhopuu2/intern/SoundSystem Makefile tuhopuu2/intern/SoundSystem/openal Makefile SND_OpenALDevice.cpp SND_OpenALDevice.h ...

Chris Want cwant at ualberta.ca
Sat Apr 3 23:44:49 CEST 2004


hos (Chris Want) 2004/04/03 23:44:49 CEST

  Modified files:
    .                    SConstruct 
    tuhopuu2/extern/solid/examples/dynamics RigidBody.cpp 
    tuhopuu2/extern/solid/include MT_Scalar.h 
    tuhopuu2/intern/SoundSystem Makefile 
    tuhopuu2/intern/SoundSystem/openal Makefile 
                                       SND_OpenALDevice.cpp 
                                       SND_OpenALDevice.h 
    tuhopuu2/intern/guardedalloc/intern mallocn.c 
    tuhopuu2/source      Makefile nan_compile.mk 
                         nan_definitions.mk 
    tuhopuu2/source/blender/blenkernel BKE_exotic.h BKE_global.h 
    tuhopuu2/source/blender/blenkernel/intern armature.c blender.c 
                                              displist.c effect.c 
                                              exotic.c mball.c 
                                              object.c scene.c 
                                              subsurf.c texture.c 
    tuhopuu2/source/blender/blenlib BLI_editVert.h 
    tuhopuu2/source/blender/blenlib/intern arithb.c 
    tuhopuu2/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu2/source/blender/include BDR_editface.h 
                                    BDR_editobject.h BIF_cursors.h 
                                    BIF_editmesh.h BIF_editsima.h 
                                    BSE_headerbuttons.h butspace.h 
                                    mydevice.h 
    tuhopuu2/source/blender/makesdna DNA_constraint_types.h 
                                     DNA_mesh_types.h 
                                     DNA_meta_types.h 
                                     DNA_object_types.h 
                                     DNA_space_types.h 
                                     DNA_texture_types.h 
                                     DNA_world_types.h 
    tuhopuu2/source/blender/makesdna/intern SConscript makesdna.c 
    tuhopuu2/source/blender/python SConscript 
    tuhopuu2/source/blender/readstreamglue/intern 
                                                  BLO_readStreamGlue.c 
    tuhopuu2/source/blender/render/intern/source rendercore.c 
                                                 texture.c 
    tuhopuu2/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu2/source/blender/src buttons_editing.c buttons_object.c 
                                buttons_shading.c cursors.c 
                                drawimage.c drawmesh.c 
                                drawobject.c drawview.c edit.c 
                                editarmature.c editface.c 
                                editmesh.c editobject.c editsima.c 
                                editview.c ghostwinlay.c 
                                header_action.c header_image.c 
                                header_info.c header_view3d.c 
                                headerbuttons.c interface.c 
                                resources.c sector.c space.c 
                                toolbox.c usiblender.c vpaint.c 
    tuhopuu2/source/blender/yafray/intern export_File.cpp 
    tuhopuu2/source/gameengine Makefile 
    tuhopuu2/source/gameengine/BlenderRoutines 
                                               BL_KetsjiEmbedStart.cpp 
                                               KX_BlenderPolyMaterial.cpp 
                                               KX_BlenderRenderTools.cpp 
                                               Makefile SConscript 
    tuhopuu2/source/gameengine/Converter BL_ActionActuator.cpp 
                                         BL_ActionActuator.h 
                                         BL_ArmatureObject.h 
                                         BL_BlenderDataConversion.cpp 
                                         BL_DeformableGameObject.cpp 
                                         BL_MeshDeformer.cpp 
                                         BL_MeshDeformer.h 
                                         BL_SkinDeformer.cpp 
                                         BL_SkinDeformer.h 
                                         BL_SkinMeshObject.cpp 
                                         BL_SkinMeshObject.h 
                                         KX_BlenderSceneConverter.cpp 
                                         KX_ConvertActuators.cpp 
                                         KX_ConvertSensors.cpp 
                                         Makefile SConscript 
    tuhopuu2/source/gameengine/Expressions SConscript Value.h 
    tuhopuu2/source/gameengine/GameLogic 
                                         SCA_AlwaysEventManager.cpp 
                                         SCA_ISensor.cpp 
                                         SCA_KeyboardManager.cpp 
                                         SCA_LogicManager.cpp 
                                         SCA_MouseManager.cpp 
                                         SCA_PropertyActuator.cpp 
                                         SCA_PropertySensor.cpp 
                                         SCA_PythonController.cpp 
                                         SCA_RandomActuator.cpp 
                                         SCA_RandomEventManager.cpp 
                                         SConscript 
    tuhopuu2/source/gameengine/GamePlayer/common GPC_Engine.cpp 
                                                 GPC_PolygonMaterial.cpp 
                                                 GPC_RenderTools.cpp 
                                                 Makefile 
    tuhopuu2/source/gameengine/GamePlayer/ghost 
                                                GPG_Application.cpp 
                                                GPG_ghost.cpp 
    tuhopuu2/source/gameengine/Ketsji KX_Camera.cpp 
                                      KX_CameraActuator.cpp 
                                      KX_CameraIpoSGController.h 
                                      KX_ClientObjectInfo.h 
                                      KX_ConstraintWrapper.cpp 
                                      KX_ConvertPhysicsObject.h 
                                      KX_ConvertPhysicsObjects.cpp 
                                      KX_GameActuator.cpp 
                                      KX_GameActuator.h 
                                      KX_GameObject.cpp 
                                      KX_GameObject.h 
                                      KX_IPO_SGController.cpp 
                                      KX_IPhysicsController.cpp 
                                      KX_IpoActuator.cpp 
                                      KX_KetsjiEngine.cpp 
                                      KX_LightIpoSGController.h 
                                      KX_MouseFocusSensor.cpp 
                                      KX_NearSensor.cpp 
                                      KX_NearSensor.h 
                                      KX_ObColorIpoSGController.h 
                                      KX_ObjectActuator.cpp 
                                      KX_PhysicsEngineEnums.h 
                                      KX_PhysicsObjectWrapper.cpp 
                                      KX_RadarSensor.cpp 
                                      KX_RadarSensor.h 
                                      KX_RayEventManager.h 
                                      KX_RaySensor.cpp 
                                      KX_RaySensor.h 
                                      KX_SCA_ReplaceMeshActuator.cpp 
                                      KX_Scene.cpp KX_Scene.h 
                                      KX_SceneActuator.cpp 
                                      KX_SumoPhysicsController.h 
                                      KX_TimeLogger.cpp 
                                      KX_TouchEventManager.cpp 
                                      KX_TouchEventManager.h 
                                      KX_TouchSensor.cpp 
                                      KX_TouchSensor.h Makefile 
                                      SConscript 
    tuhopuu2/source/gameengine/Ketsji/KXNetwork SConscript 
    tuhopuu2/source/gameengine/Network SConscript 
    tuhopuu2/source/gameengine/Network/LoopBackNetwork SConscript 
    tuhopuu2/source/gameengine/Physics/Dummy SConscript 
    tuhopuu2/source/gameengine/Physics/Sumo Makefile SConscript 
                                            SumoPhysicsController.cpp 
                                            SumoPhysicsController.h 
                                            SumoPhysicsEnvironment.cpp 
                                            SumoPhysicsEnvironment.h 
    tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include 
                                                            SM_FhObject.h 
                                                            SM_Object.h 
                                                            SM_Scene.h 
    tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src Makefile 
                                                        SM_FhObject.cpp 
                                                        SM_Object.cpp 
    tuhopuu2/source/gameengine/Physics/common SConscript 
    tuhopuu2/source/gameengine/Rasterizer RAS_BucketManager.cpp 
                                          RAS_BucketManager.h 
                                          RAS_IPolygonMaterial.cpp 
                                          RAS_IPolygonMaterial.h 
                                          RAS_IRasterizer.h 
                                          RAS_IRenderTools.h 
                                          RAS_MaterialBucket.cpp 
                                          RAS_MaterialBucket.h 
                                          RAS_MeshObject.cpp 
                                          RAS_MeshObject.h 
                                          RAS_TexVert.cpp 
                                          RAS_TexVert.h SConscript 
    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                               Makefile 
                                                               RAS_OpenGLRasterizer.cpp 
                                                               RAS_OpenGLRasterizer.h 
                                                               RAS_VAOpenGLRasterizer.cpp 
                                                               SConscript 
    tuhopuu2/source/gameengine/SceneGraph SConscript SG_Node.cpp 
  
  Log:
  Post merge conflict resolution
  
  Revision  Changes    Path
  1.6       +70 -55    tuhopuu2/SConstruct
  1.2       +133 -128  tuhopuu2/extern/solid/examples/dynamics/RigidBody.cpp
  1.2       +153 -134  tuhopuu2/extern/solid/include/MT_Scalar.h
  1.3       +1 -1      tuhopuu2/intern/SoundSystem/Makefile
  1.3       +1 -1      tuhopuu2/intern/SoundSystem/openal/Makefile
  1.6       +1 -1      tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.cpp
  1.3       +1 -1      tuhopuu2/intern/SoundSystem/openal/SND_OpenALDevice.h
  1.4       +2 -2      tuhopuu2/intern/guardedalloc/intern/mallocn.c
  1.8       +5 -2      tuhopuu2/source/Makefile
  1.8       +9 -8      tuhopuu2/source/nan_compile.mk
  1.8       +9 -1      tuhopuu2/source/nan_definitions.mk
  1.3       +1 -1      tuhopuu2/source/blender/blenkernel/BKE_exotic.h
  1.5       +3 -4      tuhopuu2/source/blender/blenkernel/BKE_global.h
  1.6       +2 -1      tuhopuu2/source/blender/blenkernel/intern/armature.c
  1.6       +8 -1      tuhopuu2/source/blender/blenkernel/intern/blender.c
  1.6       +22 -21    tuhopuu2/source/blender/blenkernel/intern/displist.c
  1.13      +2 -1      tuhopuu2/source/blender/blenkernel/intern/effect.c
  1.10      +20 -16    tuhopuu2/source/blender/blenkernel/intern/exotic.c
  1.6       +2 -3      tuhopuu2/source/blender/blenkernel/intern/mball.c
  1.7       +12 -8     tuhopuu2/source/blender/blenkernel/intern/object.c
  1.4       +1 -2      tuhopuu2/source/blender/blenkernel/intern/scene.c
  1.4       +11 -11    tuhopuu2/source/blender/blenkernel/intern/subsurf.c
  1.4       +39 -22    tuhopuu2/source/blender/blenkernel/intern/texture.c
  1.5       +6 -1      tuhopuu2/source/blender/blenlib/BLI_editVert.h
  1.6       +2 -2      tuhopuu2/source/blender/blenlib/intern/arithb.c
  1.12      +26 -1     tuhopuu2/source/blender/blenloader/intern/readfile.c
  1.7       +2 -1      tuhopuu2/source/blender/blenloader/intern/writefile.c
  1.5       +1 -1      tuhopuu2/source/blender/include/BDR_editface.h
  1.6       +1 -3      tuhopuu2/source/blender/include/BDR_editobject.h
  1.3       +1 -2      tuhopuu2/source/blender/include/BIF_cursors.h
  1.22      +4 -1      tuhopuu2/source/blender/include/BIF_editmesh.h
  1.8       +1 -3      tuhopuu2/source/blender/include/BIF_editsima.h
  1.5       +1 -1      tuhopuu2/source/blender/include/BSE_headerbuttons.h
  1.10      +1 -1      tuhopuu2/source/blender/include/butspace.h
  1.5       +1 -1      tuhopuu2/source/blender/include/mydevice.h
  1.6       +1 -1      tuhopuu2/source/blender/makesdna/DNA_constraint_types.h
  1.11      +4 -53     tuhopuu2/source/blender/makesdna/DNA_mesh_types.h
  1.4       +4 -1      tuhopuu2/source/blender/makesdna/DNA_meta_types.h
  1.6       +1 -1      tuhopuu2/source/blender/makesdna/DNA_object_types.h
  1.8       +6 -1      tuhopuu2/source/blender/makesdna/DNA_space_types.h
  1.5       +46 -1     tuhopuu2/source/blender/makesdna/DNA_texture_types.h
  1.4       +8 -1      tuhopuu2/source/blender/makesdna/DNA_world_types.h
  1.4       +1 -18     tuhopuu2/source/blender/makesdna/intern/SConscript
  1.4       +4 -2      tuhopuu2/source/blender/makesdna/intern/makesdna.c
  1.4       +5 -1      tuhopuu2/source/blender/python/SConscript
  1.3       +1 -1      tuhopuu2/source/blender/readstreamglue/intern/BLO_readStreamGlue.c
  1.7       +4 -3      tuhopuu2/source/blender/render/intern/source/rendercore.c
  1.4       +239 -41   tuhopuu2/source/blender/render/intern/source/texture.c
  1.20      +30 -27    tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
  1.21      +5 -5      tuhopuu2/source/blender/src/buttons_editing.c
  1.11      +11 -28    tuhopuu2/source/blender/src/buttons_object.c
  1.12      +161 -26   tuhopuu2/source/blender/src/buttons_shading.c
  1.4       +6 -13     tuhopuu2/source/blender/src/cursors.c
  1.14      +3 -3      tuhopuu2/source/blender/src/drawimage.c
  1.12      +12 -23    tuhopuu2/source/blender/src/drawmesh.c
  1.29      +39 -85    tuhopuu2/source/blender/src/drawobject.c
  1.12      +6 -4      tuhopuu2/source/blender/src/drawview.c
  1.21      +4 -3      tuhopuu2/source/blender/src/edit.c
  1.20      +6 -3      tuhopuu2/source/blender/src/editarmature.c
  1.10      +24 -16    tuhopuu2/source/blender/src/editface.c
  1.86      +2755 -2639tuhopuu2/source/blender/src/editmesh.c
  1.55      +17 -51    tuhopuu2/source/blender/src/editobject.c
  1.22      +2 -1      tuhopuu2/source/blender/src/editsima.c
  1.10      +7 -4      tuhopuu2/source/blender/src/editview.c
  1.7       +12 -11    tuhopuu2/source/blender/src/ghostwinlay.c
  1.4       +2 -1      tuhopuu2/source/blender/src/header_action.c
  1.17      +7 -6      tuhopuu2/source/blender/src/header_image.c
  1.5       +3 -2      tuhopuu2/source/blender/src/header_info.c
  1.14      +3 -3      tuhopuu2/source/blender/src/header_view3d.c
  1.22      +2 -2      tuhopuu2/source/blender/src/headerbuttons.c
  1.15      +6 -5      tuhopuu2/source/blender/src/interface.c
  1.10      +2 -2      tuhopuu2/source/blender/src/resources.c
  1.5       +3 -2      tuhopuu2/source/blender/src/sector.c
  1.53      +9 -1      tuhopuu2/source/blender/src/space.c
  1.12      +4 -2      tuhopuu2/source/blender/src/toolbox.c
  1.14      +1 -2      tuhopuu2/source/blender/src/usiblender.c
  1.9       +3 -2      tuhopuu2/source/blender/src/vpaint.c
  1.3       +3 -2      tuhopuu2/source/blender/yafray/intern/export_File.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Makefile
  1.4       +1 -1      tuhopuu2/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/BlenderRoutines/Makefile
  1.6       +48 -48    tuhopuu2/source/gameengine/BlenderRoutines/SConscript
  1.3       +1 -1      tuhopuu2/source/gameengine/Converter/BL_ActionActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Converter/BL_ActionActuator.h
  1.5       +1 -1      tuhopuu2/source/gameengine/Converter/BL_ArmatureObject.h
  1.9       +2 -1      tuhopuu2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Converter/BL_DeformableGameObject.cpp
  1.3       +2 -1      tuhopuu2/source/gameengine/Converter/BL_MeshDeformer.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Converter/BL_MeshDeformer.h
  1.3       +2 -1      tuhopuu2/source/gameengine/Converter/BL_SkinDeformer.cpp
  1.3       +2 -1      tuhopuu2/source/gameengine/Converter/BL_SkinDeformer.h
  1.3       +2 -1      tuhopuu2/source/gameengine/Converter/BL_SkinMeshObject.cpp
  1.3       +2 -1      tuhopuu2/source/gameengine/Converter/BL_SkinMeshObject.h
  1.7       +20 -21    tuhopuu2/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Converter/KX_ConvertActuators.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Converter/KX_ConvertSensors.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Converter/Makefile
  1.6       +63 -63    tuhopuu2/source/gameengine/Converter/SConscript
  1.5       +32 -32    tuhopuu2/source/gameengine/Expressions/SConscript
  1.3       +1 -1      tuhopuu2/source/gameengine/Expressions/Value.h
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_ISensor.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_LogicManager.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_MouseManager.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_PropertySensor.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_PythonController.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_RandomActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
  1.4       +42 -42    tuhopuu2/source/gameengine/GameLogic/SConscript
  1.3       +1 -1      tuhopuu2/source/gameengine/GamePlayer/common/GPC_Engine.cpp
  1.4       +2 -1      tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
  1.5       +2 -1      tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/GamePlayer/common/Makefile
  1.3       +1 -1      tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_Camera.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_CameraActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_CameraIpoSGController.h
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ClientObjectInfo.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
  1.19      +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_GameActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_GameActuator.h
  1.9       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_GameObject.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_GameObject.h
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_IPO_SGController.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_IPhysicsController.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_IpoActuator.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_LightIpoSGController.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
  1.7       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_NearSensor.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_NearSensor.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_ObjectActuator.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_RadarSensor.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_RadarSensor.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_RayEventManager.h
  1.9       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_RaySensor.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_RaySensor.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_Scene.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_Scene.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_SceneActuator.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_SumoPhysicsController.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_TimeLogger.cpp
  1.9       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_TouchEventManager.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_TouchEventManager.h
  1.5       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_TouchSensor.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Ketsji/KX_TouchSensor.h
  1.4       +2 -2      tuhopuu2/source/gameengine/Ketsji/Makefile
  1.6       +6 -0      tuhopuu2/source/gameengine/Ketsji/SConscript
  1.5       +24 -24    tuhopuu2/source/gameengine/Ketsji/KXNetwork/SConscript
  1.5       +15 -15    tuhopuu2/source/gameengine/Network/SConscript
  1.4       +14 -14    tuhopuu2/source/gameengine/Network/LoopBackNetwork/SConscript
  1.4       +12 -12    tuhopuu2/source/gameengine/Physics/Dummy/SConscript
  1.4       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/Makefile
  1.5       +20 -20    tuhopuu2/source/gameengine/Physics/Sumo/SConscript
  1.10      +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.h
  1.6       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
  1.5       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
  1.6       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include/SM_FhObject.h
  1.10      +4 -4      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
  1.7       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Scene.h
  1.4       +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src/Makefile
  1.10      +1 -1      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src/SM_FhObject.cpp
  1.17      +123 -125  tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
  1.4       +14 -14    tuhopuu2/source/gameengine/Physics/common/SConscript
  1.5       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_BucketManager.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_BucketManager.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
  1.5       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_IRasterizer.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_IRenderTools.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_MaterialBucket.h
  1.4       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_MeshObject.cpp
  1.4       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_MeshObject.h
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_TexVert.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_TexVert.h
  1.5       +22 -22    tuhopuu2/source/gameengine/Rasterizer/SConscript
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
  1.6       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
  1.3       +1 -1      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
  1.5       +3 -3      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
  1.6       +17 -17    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
  1.4       +15 -15    tuhopuu2/source/gameengine/SceneGraph/SConscript
  1.3       +1 -1      tuhopuu2/source/gameengine/SceneGraph/SG_Node.cpp



More information about the tuhopuu-cvs mailing list