Changeset 2119 for code/branches/physics_new/src
- Timestamp:
- Nov 2, 2008, 1:34:58 PM (17 years ago)
- Location:
- code/branches/physics_new
- Files:
-
- 10 edited
- 439 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics_new
- Property svn:mergeinfo changed
/code/branches/physics (added) merged: 1913,1919-1920,1922-1925,1933,1963-1967,1971-1974,1983-1988,1995,2047
- Property svn:mergeinfo changed
-
code/branches/physics_new/src/CMakeLists.txt
r1854 r2119 2 2 INCLUDE_DIRECTORIES(..) 3 3 INCLUDE_DIRECTORIES(orxonox) 4 INCLUDE_DIRECTORIES(bullet) 5 INCLUDE_DIRECTORIES(ogrebullet/Dynamics) 6 INCLUDE_DIRECTORIES(ogrebullet/Collisions) 4 7 5 8 ADD_SUBDIRECTORY(cpptcl) 6 9 ADD_SUBDIRECTORY(ois) 7 10 ADD_SUBDIRECTORY(tinyxml) 11 ADD_SUBDIRECTORY(bullet) 12 ADD_SUBDIRECTORY(ogrebullet) 13 # ADD_SUBDIRECTORY(ogreode) 8 14 ADD_SUBDIRECTORY(lua) 9 15 ADD_SUBDIRECTORY(tolua) -
code/branches/physics_new/src/bullet/BulletCollision/GIMPACT
- Property svn:mergeinfo changed
/code/branches/physics/src/bullet/BulletCollision/GIMPACT (added) merged: 1983
- Property svn:mergeinfo changed
-
code/branches/physics_new/src/core/XMLIncludes.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/physics_new/src/orxonox/CMakeLists.txt
r2106 r2119 46 46 objects/EventDispatcher.cc 47 47 objects/EventTarget.cc 48 # objects/PhysicsTest.cc 49 objects/HelloBullet.cc 48 50 objects/Radar.cc 49 51 objects/RadarListener.cc … … 144 146 tinyxml_orxonox 145 147 tolualib_orxonox 148 LibLinearMath 149 LibBulletCollision 150 LibBulletDynamics 151 LibBulletSoftBody 152 ogrebullet_collisions_orxonox 153 ogrebullet_dynamics_orxonox 146 154 util 147 155 core -
code/branches/physics_new/src/orxonox/gamestates/GSLevel.cc
r2103 r2119 51 51 namespace orxonox 52 52 { 53 SetCommandLineArgument(level, " sample2.oxw").shortcut("l");53 SetCommandLineArgument(level, "physicstest2.oxw").shortcut("l"); 54 54 55 55 GSLevel::GSLevel() -
code/branches/physics_new/src/orxonox/objects/weaponSystem/WeaponSystem.h
- Property svn:mergeinfo changed
/code/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h (added) merged: 1912-2055
- Property svn:mergeinfo changed
-
code/branches/physics_new/src/tolua/tolua-5.1.pkg
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/physics_new/src/util
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/physics_new/src/util/Exception.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/physics_new/src/util/Exception.h
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.