Changeset 7697

Timestamp:

Dec 2, 2010, 12:10:26 PM (13 years ago)

Author:

dafrick

Message:

Manually merging changes in lastmanstanding branch to lastmanstanding2 branch.
Please continue here, since the lastmanstanding branch has already been merged.

Location:

code/branches/lastmanstanding2

Files:

• data/levels/lastTeamStanding.oxw (added)
• data/overlays/lastTeamStandingHUD.oxo (added)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/LastTeamStandingInfos.cc (added)
• src/modules/overlays/hud/LastTeamStandingInfos.h (added)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/LastTeamStanding.cc (added)
• src/orxonox/gametypes/LastTeamStanding.h (added)

code/branches/lastmanstanding2/src/modules/overlays/hud/CMakeLists.txt

@@ -16 +16 @@
   GametypeFadingMessage.cc
   LastManStandingInfos.cc
+  LastTeamStandingInfos.cc 
 )

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

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

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

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