Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 12, 2009, 8:20:07 PM (15 years ago)
Author:
rgrieder
Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder ;)

Location:
code/trunk
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt

    r5781 r5929  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletCollisionCompilation.cpp
     4
    25        BroadphaseCollision/btAxisSweep3.cpp
    36        BroadphaseCollision/btBroadphaseProxy.cpp
    … …  
    6871        Gimpact/btContactProcessing.cpp
    6972        Gimpact/btGImpactShape.cpp
    70         Gimpact/gim_contact.cpp
    7173        Gimpact/btGImpactBvh.cpp
    7274        Gimpact/btGenericPoolAllocator.cpp
    73         Gimpact/gim_memory.cpp
    7475        Gimpact/btGImpactCollisionAlgorithm.cpp
    7576        Gimpact/btTriangleShapeEx.cpp
    76         Gimpact/gim_tri_collision.cpp
    7777        Gimpact/btGImpactQuantizedBvh.cpp
    78         Gimpact/gim_box_set.cpp
    7978
    8079        NarrowPhaseCollision/btContinuousConvexCollision.cpp
    … …  
    8988        NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    9089        NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
     90
     91COMPILATION_END
     92
     93COMPILATION_BEGIN BulletGImpactCompilation.cpp
     94        Gimpact/gim_contact.cpp
     95        Gimpact/gim_memory.cpp
     96        Gimpact/gim_tri_collision.cpp
     97        Gimpact/gim_box_set.cpp
     98COMPILATION_END
    9199
    92100        # Headers

  • code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt

    r5781 r5929  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletDynamicsCompilation.cpp
     4
    25        ConstraintSolver/btContactConstraint.cpp
    36        ConstraintSolver/btConeTwistConstraint.cpp
    … …  
    1922
    2023        Character/btKinematicCharacterController.cpp
     24
     25COMPILATION_END
    2126
    2227        # Headers

  • code/trunk/src/external/bullet/CMakeLists.txt

    r5781 r5929  
    2727ADD_SUBDIRECTORY(LinearMath)
    2828
    29 # No warnings needed from third party libraries
    30 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    31 ADD_COMPILER_FLAGS("-w")
    32 
    3329ORXONOX_ADD_LIBRARY(bullet_orxonox
    3430  ORXONOX_EXTERNAL
    3531  NO_DLL_INTERFACE
    36   PCH_FILE
    37     BulletPrecompiledHeaders.h
    3832  VERSION
    3933    2.74

  • code/trunk/src/external/bullet/LinearMath/CMakeLists.txt

    r5781 r5929  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletLinearMathCompilation.cpp
    24                btConvexHull.cpp
    35                btQuickprof.cpp
    46                btGeometryUtil.cpp
    57                btAlignedAllocator.cpp
     8COMPILATION_END
    69
    710                # Headers

  • code/trunk/src/external/ceguilua/CMakeLists.txt

    r5781 r5929  
    6767)
    6868
    69 # No warnings needed from third party libraries
    70 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    71 ADD_COMPILER_FLAGS("-w")
    72 
    7369SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES})
    7470

  • code/trunk/src/external/cpptcl/CMakeLists.txt

    r5781 r5929  
    3232)
    3333
    34 # No warnings needed from third party libraries
    35 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    36 ADD_COMPILER_FLAGS("-w")
    37 
    3834ORXONOX_ADD_LIBRARY(cpptcl_orxonox
    3935  ORXONOX_EXTERNAL

  • code/trunk/src/external/ogreceguirenderer/CMakeLists.txt

    r5781 r5929  
    1818 #
    1919
    20 SET(OCR_FILES
     20SET_SOURCE_FILES(OCR_FILES
    2121  OgreCEGUIRenderer.h
    2222  OgreCEGUIResourceProvider.h
    2323  OgreCEGUITexture.h
    2424
     25COMPILATION_BEGIN OgreCEGUIRendererCompilation.cpp
    2526  OgreCEGUIRenderer.cpp
    2627  OgreCEGUIResourceProvider.cpp
    2728  OgreCEGUITexture.cpp
     29COMPILATION_END
    2830)
    29 
    30 # No warnings needed from third party libraries
    31 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    32 ADD_COMPILER_FLAGS("-w")
    3331
    3432ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox

  • code/trunk/src/external/ois/CMakeLists.txt

    r5781 r5929  
    3434  OISPrereqs.h
    3535
     36COMPILATION_BEGIN OISCompilation.cpp
    3637  OISEffect.cpp
    3738  OISException.cpp
    … …  
    4142  OISKeyboard.cpp
    4243  OISObject.cpp
     44COMPILATION_END
    4345)
    4446IF(WIN32)
    … …  
    4951  ADD_SUBDIRECTORY(linux)
    5052ENDIF()
    51 
    52 # No warnings needed from third party libraries
    53 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    54 ADD_COMPILER_FLAGS("-w")
    5553
    5654INCLUDE_DIRECTORIES(.)

  • code/trunk/src/external/ois/changes_orxonox.diff

    r5781 r5929  
    2323 
    2424
     25--- win32/Win32ForceFeedback.cpp
     26+++ win32/Win32ForceFeedback.cpp
     27@@ -25,7 +25,7 @@
     28 #include <Math.h>
     29 
     30 // 0 = No trace; 1 = Important traces; 2 = Debug traces
     31-#define OIS_WIN32_JOYFF_DEBUG 1
     32+#define OIS_WIN32_JOYFF_DEBUG 0
     33 
     34 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
     35   #include <iostream>

  • code/trunk/src/external/ois/linux/CMakeLists.txt

    r5781 r5929  
    88  LinuxPrereqs.h
    99
     10COMPILATION_BEGIN OISLinuxCompilation.cpp
    1011  EventHelpers.cpp
    1112  LinuxForceFeedback.cpp
    … …  
    1415  LinuxKeyboard.cpp
    1516  LinuxMouse.cpp
     17COMPILATION_END
    1618)

  • code/trunk/src/external/ois/mac/CMakeLists.txt

    r5781 r5929  
    77  MacPrereqs.h
    88
     9COMPILATION_BEGIN OISMacCompilation.cpp
    910  MacHelpers.cpp
    1011  MacHIDManager.cpp
    … …  
    1213  MacKeyboard.cpp
    1314  MacMouse.cpp
     15COMPILATION_END
    1416)

  • code/trunk/src/external/ois/win32/CMakeLists.txt

    r5781 r5929  
    77  Win32Prereqs.h
    88
     9COMPILATION_BEGIN OISWin32Compilation.cpp
    910  Win32ForceFeedback.cpp
    1011  Win32InputManager.cpp
    … …  
    1213  Win32KeyBoard.cpp
    1314  Win32Mouse.cpp
     15COMPILATION_END
    1416)

  • code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp

    r5781 r5929  
    2626
    2727// 0 = No trace; 1 = Important traces; 2 = Debug traces
    28 #define OIS_WIN32_JOYFF_DEBUG 1
     28#define OIS_WIN32_JOYFF_DEBUG 0
    2929
    3030#if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))

  • code/trunk/src/external/tinyxml/CMakeLists.txt

    r5781 r5929  
    1818 #
    1919
    20 SET(TINYXML++_FILES
     20SET_SOURCE_FILES(TINYXML++_FILES
    2121  ticpp.h
    2222  ticpprc.h
    … …  
    2424  tinyxml.h
    2525
     26COMPILATION_BEGIN TicppCompilation.cpp
    2627  ticpp.cpp
    2728  tinystr.cpp
    … …  
    2930  tinyxmlerror.cpp
    3031  tinyxmlparser.cpp
     32COMPILATION_END
    3133)
    32 
    33 # No warnings needed from third party libraries
    34 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    35 ADD_COMPILER_FLAGS("-w")
    3634
    3735ORXONOX_ADD_LIBRARY(tinyxml++_orxonox

  • code/trunk/src/external/tolua/CMakeLists.txt

    r5738 r5929  
    2020################### Tolua++ library ###################
    2121
    22 SET(TOLUA++_FILES
     22SET_SOURCE_FILES(TOLUA++_FILES
    2323  tolua_event.h
    2424  tolua++.h
    25 
     25COMPILATION_BEGIN ToluaCompilation.c
    2626  tolua_event.c
    2727  tolua_is.c
    … …  
    2929  tolua_push.c
    3030  tolua_to.c
     31COMPILATION_END
    3132)
    32 GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
    33 
    34 # No warnings needed from third party libraries
    35 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    36 ADD_COMPILER_FLAGS("-w")
    3733
    3834ORXONOX_ADD_LIBRARY(tolua++_orxonox
Note: See TracChangeset for help on using the changeset viewer.