Changeset 6951 for code/branches/presentation3/src/orxonox/worldentities

Timestamp:

May 21, 2010, 10:25:27 AM (15 years ago)

Author:

scheusso

Message:

merged rocket branch into presentation3 and cleaned up some things (mostly debug output and intendation)

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/Drone.cc (copied) (copied from code/branches/rocket/src/orxonox/worldentities/Drone.cc)
• src/orxonox/worldentities/Drone.h (copied) (copied from code/branches/rocket/src/orxonox/worldentities/Drone.h)
• src/orxonox/worldentities/RocketDrone.cc (copied) (copied from code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc)
• src/orxonox/worldentities/RocketDrone.h (copied) (copied from code/branches/rocket/src/orxonox/worldentities/RocketDrone.h)

code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
+  Drone.cc
 )