Changeset 8194 for code/branches/dockingsystem/src/orxonox

Timestamp:

Apr 6, 2011, 12:07:29 PM (14 years ago)

Author:

dafrick

Message:

Merging trunk into dockingsystem branch to be able to use the recent bugfix in MultiTrigger.

Location:

code/branches/dockingsystem

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)
• src/orxonox/gametypes/LastTeamStanding.cc (copied) (copied from code/trunk/src/orxonox/gametypes/LastTeamStanding.cc)
• src/orxonox/gametypes/LastTeamStanding.h (copied) (copied from code/trunk/src/orxonox/gametypes/LastTeamStanding.h)

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

@@ -96 +96 @@
     class Gametype;
     class LastManStanding;
+    class LastTeamStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/dockingsystem/src/orxonox/gametypes/CMakeLists.txt

@@ -8 +8 @@
   Dynamicmatch.cc
   LastManStanding.cc
+  LastTeamStanding.cc
 )

code/branches/dockingsystem/src/orxonox/gametypes/Gametype.h

@@ -150 +150 @@
               { this->timeLimit_ = t; }
 
+            //inline bool getForceSpawn()
+            //  { return this->bForceSpawn_; }       
+
             virtual void resetTimer();
             virtual void resetTimer(float t);