Changeset 10622 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Apr 6, 2007, 6:54:15 PM (18 years ago)

Author:

snellen

Message:

merged scriptimprovements back to trunk

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• WorldEntities.am (modified) (2 diffs)
• script_triggers (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers)
• script_triggers/script_trigger.cc (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.cc)
• script_triggers/script_trigger.h (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h)
• script_triggers/space_trigger.cc (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/space_trigger.cc)
• script_triggers/space_trigger.h (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/space_trigger.h)
• script_triggers/tick_trigger.cc (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/tick_trigger.cc)
• script_triggers/tick_trigger.h (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/tick_trigger.h)
• script_triggers/time_trigger.cc (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/time_trigger.cc)
• script_triggers/time_trigger.h (copied) (copied from branches/scriptimprovements/src/world_entities/script_triggers/time_trigger.h)
• tools/script_trigger.cc (deleted)
• tools/script_trigger.h (deleted)

trunk/src/world_entities/Makefile.am

@@ -27 +27 @@
                      effects/trail.cc\
                      elements/glgui_energywidget.cc\
-                     elements/glgui_energywidgetvertical.cc
+                     elements/glgui_energywidgetvertical.cc\
+                     script_triggers/script_trigger.cc
 
 
@@ -51 +52 @@
                  effects/wobblegrid.h\
                  elements/glgui_energywidget.h\
-                 elements/glgui_energywidgetvertical.h
+                 elements/glgui_energywidgetvertical.h\
+                 script_triggers/script_trigger.h
 
 

trunk/src/world_entities/WorldEntities.am

@@ -106 +106 @@
                 world_entities/tools/sound_entity.cc \
                 world_entities/tools/camera.cc \
-                world_entities/tools/script_trigger.cc \
+                \
+                world_entities/script_triggers/script_trigger.cc \
+                world_entities/script_triggers/space_trigger.cc \
+                world_entities/script_triggers/tick_trigger.cc \
+                world_entities/script_triggers/time_trigger.cc \
                 \
                 \
@@ -227 +231 @@
                 effects/blink.h \
                 \
-                script_trigger.h \
+                script_triggers/space_trigger.h \
+                script_triggers/tick_trigger.h \
+                script_triggers/time_trigger.h \
                 \
                 \