[tuhopuu-cvs] CVS commit: tuhopuu2/source/gameengine SConscript tuhopuu2/source/gameengine/BlenderRoutines KX_BlenderPolyMaterial.cpp tuhopuu2/source/gameengine/Converter BL_BlenderDataConversion.cpp BL_SkinMeshObject.cpp BL_SkinMeshObject.h BlenderWorldInfo.cpp BlenderWorldInfo.h KX_BlenderSceneConverter.cpp tuhopuu2/source/gameengine/Expressions ...

Kester Maddock Christopher.Maddock.1 at uni.massey.ac.nz
Sun Apr 4 09:48:24 CEST 2004


kester (Kester Maddock) 2004/04/04 09:48:24 CEST

  Modified files:
    tuhopuu2/source/gameengine SConscript 
    tuhopuu2/source/gameengine/BlenderRoutines 
                                               KX_BlenderPolyMaterial.cpp 
    tuhopuu2/source/gameengine/Converter 
                                         BL_BlenderDataConversion.cpp 
                                         BL_SkinMeshObject.cpp 
                                         BL_SkinMeshObject.h 
                                         BlenderWorldInfo.cpp 
                                         BlenderWorldInfo.h 
                                         KX_BlenderSceneConverter.cpp 
    tuhopuu2/source/gameengine/Expressions ListValue.cpp 
                                           Operator1Expr.h 
                                           Operator2Expr.cpp 
                                           Value.cpp VoidValue.h 
    tuhopuu2/source/gameengine/GamePlayer Makefile 
    tuhopuu2/source/gameengine/GamePlayer/common 
                                                 GPC_PolygonMaterial.cpp 
    tuhopuu2/source/gameengine/GamePlayer/ghost 
                                                GPG_Application.cpp 
    tuhopuu2/source/gameengine/Ketsji KX_KetsjiEngine.cpp 
                                      KX_PythonInit.cpp 
                                      KX_WorldInfo.cpp 
                                      KX_WorldInfo.h 
                                      KX_WorldIpoController.cpp 
                                      KX_WorldIpoController.h 
    tuhopuu2/source/gameengine/Physics/Sumo 
                                            SumoPhysicsController.cpp 
                                            SumoPhysicsController.h 
    tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include 
                                                            SM_Object.h 
    tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src 
                                                        SM_Object.cpp 
                                                        SM_Scene.cpp 
    tuhopuu2/source/gameengine/Physics/common 
                                              PHY_IPhysicsController.h 
                                              SConscript 
    tuhopuu2/source/gameengine/Rasterizer RAS_IPolygonMaterial.cpp 
                                          RAS_IPolygonMaterial.h 
                                          RAS_IRasterizer.h 
                                          RAS_MeshObject.cpp 
                                          RAS_MeshObject.h 
    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                               RAS_GLExtensionManager.cpp 
                                                               RAS_GLExtensionManager.h 
                                                               RAS_OpenGLRasterizer.cpp 
                                                               RAS_OpenGLRasterizer.h 
                                                               RAS_VAOpenGLRasterizer.cpp 
                                                               mkglext.py 
    tuhopuu2/source/gameengine/SceneGraph SG_Spatial.cpp 
  
  Log:
  Most merge cleanup.
  Fix a couple of compile warnings.
  
  Revision  Changes    Path
  1.3       +3 -0      tuhopuu2/source/gameengine/SConscript
  1.4       +3 -3      tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
  1.10      +4 -4      tuhopuu2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
  1.4       +4 -4      tuhopuu2/source/gameengine/Converter/BL_SkinMeshObject.cpp
  1.4       +2 -2      tuhopuu2/source/gameengine/Converter/BL_SkinMeshObject.h
  1.2       +22 -61    tuhopuu2/source/gameengine/Converter/BlenderWorldInfo.cpp
  1.2       +11 -28    tuhopuu2/source/gameengine/Converter/BlenderWorldInfo.h
  1.8       +51 -52    tuhopuu2/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
  1.2       +3 -3      tuhopuu2/source/gameengine/Expressions/ListValue.cpp
  1.2       +2 -2      tuhopuu2/source/gameengine/Expressions/Operator1Expr.h
  1.2       +5 -5      tuhopuu2/source/gameengine/Expressions/Operator2Expr.cpp
  1.3       +2 -2      tuhopuu2/source/gameengine/Expressions/Value.cpp
  1.2       +3 -3      tuhopuu2/source/gameengine/Expressions/VoidValue.h
  1.2       +4 -2      tuhopuu2/source/gameengine/GamePlayer/Makefile
  1.5       +34 -18    tuhopuu2/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
  1.4       +93 -67    tuhopuu2/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
  1.5       +3 -10     tuhopuu2/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
  1.2       +64 -23    tuhopuu2/source/gameengine/Ketsji/KX_PythonInit.cpp
  1.2       +3 -1      tuhopuu2/source/gameengine/Ketsji/KX_WorldInfo.cpp
  1.2       +5 -11     tuhopuu2/source/gameengine/Ketsji/KX_WorldInfo.h
  1.2       +2 -4      tuhopuu2/source/gameengine/Ketsji/KX_WorldIpoController.cpp
  1.3       +2 -2      tuhopuu2/source/gameengine/Ketsji/KX_WorldIpoController.h
  1.11      +11 -1     tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
  1.4       +2 -1      tuhopuu2/source/gameengine/Physics/Sumo/SumoPhysicsController.h
  1.11      +2 -2      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Object.h
  1.18      +2 -3      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Object.cpp
  1.16      +9 -4      tuhopuu2/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
  1.2       +5 -1      tuhopuu2/source/gameengine/Physics/common/PHY_IPhysicsController.h
  1.5       +2 -1      tuhopuu2/source/gameengine/Physics/common/SConscript
  1.4       +5 -6      tuhopuu2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
  1.4       +4 -4      tuhopuu2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
  1.6       +10 -20    tuhopuu2/source/gameengine/Rasterizer/RAS_IRasterizer.h
  1.5       +29 -63    tuhopuu2/source/gameengine/Rasterizer/RAS_MeshObject.cpp
  1.5       +3 -3      tuhopuu2/source/gameengine/Rasterizer/RAS_MeshObject.h
  1.9       +218 -4035 tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
  1.7       +37 -1298  tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
  1.7       +36 -37    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
  1.4       +18 -27    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
  1.6       +5 -5      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
  1.4       +9 -6      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
  1.2       +7 -7      tuhopuu2/source/gameengine/SceneGraph/SG_Spatial.cpp



More information about the tuhopuu-cvs mailing list