Changeset 302

Timestamp:

Nov 28, 2007, 2:55:30 AM (16 years ago)

Author:

nicolasc

Message:

moved hud and weapon to orxonox

Location:

code/branches/merger/src

Files:

• CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/hud (moved) (moved from code/branches/merger/src/hud)
• orxonox/hud/hud_overlay.cc (copied) (copied from code/branches/merger/src/hud/hud_overlay.cc)
• orxonox/hud/hud_overlay.h (copied) (copied from code/branches/merger/src/hud/hud_overlay.h)
• orxonox/hud/test_overlay.cc (copied) (copied from code/branches/merger/src/hud/test_overlay.cc)
• orxonox/hud/test_overlay.h (copied) (copied from code/branches/merger/src/hud/test_overlay.h)
• orxonox/weapon (moved) (moved from code/branches/merger/src/weapon)
• orxonox/weapon/CMakeLists.txt (copied) (copied from code/branches/merger/src/weapon/CMakeLists.txt)
• orxonox/weapon/ammunition_dump.cc (copied) (copied from code/branches/merger/src/weapon/ammunition_dump.cc)
• orxonox/weapon/ammunition_dump.h (copied) (copied from code/branches/merger/src/weapon/ammunition_dump.h)
• orxonox/weapon/barrel_gun.cc (copied) (copied from code/branches/merger/src/weapon/barrel_gun.cc)
• orxonox/weapon/barrel_gun.h (copied) (copied from code/branches/merger/src/weapon/barrel_gun.h)
• orxonox/weapon/base_weapon.cc (copied) (copied from code/branches/merger/src/weapon/base_weapon.cc)
• orxonox/weapon/base_weapon.h (copied) (copied from code/branches/merger/src/weapon/base_weapon.h)
• orxonox/weapon/bullet.cc (copied) (copied from code/branches/merger/src/weapon/bullet.cc)
• orxonox/weapon/bullet.h (copied) (copied from code/branches/merger/src/weapon/bullet.h)
• orxonox/weapon/bullet_manager.cc (copied) (copied from code/branches/merger/src/weapon/bullet_manager.cc)
• orxonox/weapon/bullet_manager.h (copied) (copied from code/branches/merger/src/weapon/bullet_manager.h)
• orxonox/weapon/weapon_station.cc (copied) (copied from code/branches/merger/src/weapon/weapon_station.cc)
• orxonox/weapon/weapon_station.h (copied) (copied from code/branches/merger/src/weapon/weapon_station.h)

code/branches/merger/src/CMakeLists.txt

@@ -4 +4 @@
 ADD_SUBDIRECTORY(loader)
 ADD_SUBDIRECTORY(network)
-ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(weapon)
+# ADD_SUBDIRECTORY(hud)
+# ADD_SUBDIRECTORY(weapon)
 ADD_SUBDIRECTORY(class_hierarchy)
 

code/branches/merger/src/orxonox/CMakeLists.txt

@@ -13 +13 @@
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(hud)
+ADD_SUBDIRECTORY(weapon)