Changeset 9061 in orxonox.OLD for trunk/src/world_entities/WorldEntities.am

Timestamp:

Jul 3, 2006, 6:39:10 PM (18 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

File:

• trunk/src/world_entities/WorldEntities.am (modified) (2 diffs)

trunk/src/world_entities/WorldEntities.am

@@ -44 +44 @@
                 world_entities/space_ships/hover.cc \
                 world_entities/space_ships/turbine_hover.cc \
+                world_entities/space_ships/spacecraft_2d.cc \
                 world_entities/space_ships/collision_probe.cc \
+                world_entities/space_ships/cruizer.cc \
                 world_entities/creatures/md2_creature.cc \
                 world_entities/creatures/fps_player.cc \
@@ -107 +109 @@
                 space_ships/hover.h \
                 space_ships/turbine_hover.h \
-                space_ships/collision_probe.cc \
+                space_ships/spacecraft_2d.h \
+                space_ships/collision_probe.h \
+                space_ships/cruizer.h \
                 creatures/md2_creature.h \
                 creatures/fps_player.h \