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

Timestamp:

Jun 29, 2006, 12:19:48 AM (18 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

File:

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

trunk/src/world_entities/WorldEntities.am

@@ -16 +16 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
+                world_entities/door.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -26 +27 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
+                world_entities/weapons/fps_sniper_rifle.cc \
                 \
                 world_entities/projectiles/bomb.cc \
@@ -74 +76 @@
                 character_attributes.h \
                 test_entity.h \
+                door.h \
                 planet.h \
                 bsp_entity.h \
@@ -84 +87 @@
                 weapons/targeting_turret.h \
                 weapons/aim.h \
+                weapons/fps_sniper_rifle.h \
                 \
                 projectiles/bomb.h \