Changeset 5750 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/Makefile.am (modified) (4 diffs)

trunk/src/Makefile.am

@@ -48 +48 @@
                   world_entities/camera.cc \
                   world_entities/player.cc \
-                  world_entities/npc.cc \
-                  world_entities/npc2.cc \
+                  world_entities/npcs/npc.cc \
+                  world_entities/npcs/npc_test1.cc \
+                  world_entities/npcs/npc_test.cc \
                   world_entities/environment.cc \
                   world_entities/skysphere.cc \
@@ -62 +63 @@
                   world_entities/weapons/test_gun.cc \
                   world_entities/weapons/turret.cc \
+                  world_entities/weapons/ground_turret.cc \
+                  world_entities/weapons/aiming_turret.cc \
+                  world_entities/weapons/cannon.cc \
                   world_entities/weapons/test_bullet.cc \
                   world_entities/weapons/rocket.cc \
                   world_entities/weapons/laser.cc \
                   world_entities/weapons/aim.cc \
+                  world_entities/weapons/bomb.cc \
                   world_entities/weapons/crosshair.cc \
                   world_entities/power_ups/power_up.cc \
@@ -82 +87 @@
                  world_entities/camera.h \
                  world_entities/player.h \
-                 world_entities/npc.h \
-                 world_entities/npc2.h \
+                 world_entities/npcs/npc.h \
+                 world_entities/npcs/npc_test.h \
+                 world_entities/npcs/npc_test1.h \
                  world_entities/environment.h \
                  world_entities/skysphere.h \
@@ -95 +101 @@
                  world_entities/weapons/projectile.h \
                  world_entities/weapons/test_gun.h \
+                 world_entities/weapons/cannon.h \
                  world_entities/weapons/turret.h \
+                 world_entities/weapons/aiming_turret.h \
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/rocket.h \
                  world_entities/weapons/laser.h \
                  world_entities/weapons/aim.h \
+                 world_entities/weapons/bomb.h \
                  world_entities/weapons/crosshair.h \
                  world_entities/power_ups/power_up.h \