Changeset 2530 for code/branches/bugger/src/orxonox/OrxonoxPrereqs.h

Timestamp:

Dec 23, 2008, 10:40:38 PM (17 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)

code/branches/bugger/src/orxonox/OrxonoxPrereqs.h

@@ -100 +100 @@
     class QuestDescription;
     class QuestEffect;
+    class QuestEffectBeacon;
     class QuestHint;
     class QuestItem;
@@ -138 +139 @@
     class DistanceTrigger;
     class EventTrigger;
+    class PlayerTrigger;
 
     class WeaponSystem;