Changeset 10366 in orxonox.OLD for branches/playability.merge/src/world_entities/WorldEntities.am

Timestamp:

Jan 25, 2007, 12:48:13 PM (17 years ago)

Author:

patrick

Message:

merged the playability branche. working

Location:

branches/playability.merge

Files:

• . (modified) (1 prop)
• src/world_entities/WorldEntities.am (modified) (9 diffs)

branches/playability.merge

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

branches/playability.merge/src/world_entities/WorldEntities.am

@@ -23 +23 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
+                world_entities/test_entity2.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -39 +40 @@
                 world_entities/weapons/fps_sniper_rifle.cc \
                 world_entities/weapons/boomerang_gun.cc \
-                \
+                world_entities/weapons/light_blaster.cc \
+                world_entities/weapons/medium_blaster.cc \
+                world_entities/weapons/heavy_blaster.cc \
+                world_entities/weapons/swarm_launcher.cc \
+                world_entities/weapons/spike_launcher.cc \
+                world_entities/weapons/spike_thrower.cc \
+                world_entities/weapons/acid_launcher.cc \
+                \
+                world_entities/projectiles/lbolt.cc \
+                world_entities/projectiles/mbolt.cc \
+                world_entities/projectiles/hbolt.cc \
+                world_entities/projectiles/swarm_projectile.cc \
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \
@@ -48 +60 @@
                 world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
+                world_entities/projectiles/spike.cc \
+                world_entities/projectiles/acid_splash.cc \
+                \
+                world_entities/projectiles/projectile_weapon.cc \
+                world_entities/projectiles/spike_ball.cc \
                 \
                 world_entities/power_ups/turret_power_up.cc \
@@ -83 +100 @@
                 world_entities/particles/box_emitter.cc \
                 world_entities/particles/plane_emitter.cc \
+        world_entities/particles/emitter_node.cc \
                 \
                 world_entities/particles/particle_system.cc \
@@ -129 +147 @@
                 character_attributes.h \
                 test_entity.h \
+                test_entity2.h \
                 planet.h \
                 bsp_entity.h \
@@ -145 +164 @@
                 weapons/aiming_system.h \
                 weapons/fps_sniper_rifle.h \
-                \
+                weapons/light_blaster.h \
+                weapons/medium_blaster.h \
+                weapons/heavy_blaster.h \
+                weapons/swarm_launcher.h \
+                weapons/spike_launcher.h \
+                weapons/spike_thrower.h \
+                weapons/acid_launcher.h \
+                \
+                projectiles/lbolt.h \
+                projectiles/mbolt.h \
+                projectiles/hbolt.h \
+                projectiles/swarm_projectile.h \
                 projectiles/bomb.h \
                 projectiles/laser.h \
@@ -154 +184 @@
                 projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
+                projectiles/spike.h \
+                projectiles/spike_ball.h \
+                projectiles/acid_splash.h \
+                \
+                projectiles/projectile_weapon.h \
+                projectiles/spike_ball.h \
                 \
                 power_ups/turret_power_up.h \
@@ -172 +208 @@
                 environments/model_entity.h \
                 environments/building.h \
-                environments/rotor.h \
                 environments/mapped_water.h \
+                environments/rotor.h \
                 \
                 elements/image_entity.h \
@@ -188 +224 @@
                 particles/box_emitter.h \
                 particles/plane_emitter.h \
+        particles/emitter_node.h \
                 \
                 particles/particle_system.h \

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs