Changeset 9922

Timestamp:

Dec 18, 2013, 11:43:30 AM (11 years ago)

Author:

jo

Message:

merged levelMichael

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• data/levels/Spacefight.oxw (copied) (copied from code/branches/levelMichael/data/levels/Spacefight.oxw)
• data/levels/missionOne.oxw (modified) (1 diff)
• data/levels/quests.oxw (modified) (1 diff)
• data/levels/templates/spaceshipHXYSL.oxt (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/CountDown.cc (copied) (copied from code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc)
• src/modules/overlays/hud/CountDown.h (copied) (copied from code/branches/levelMichael/src/modules/overlays/hud/CountDown.h)

code/branches/presentationHS13/data/levels/missionOne.oxw

@@ +1 @@
+<!---->
 <LevelInfo
  name = "Mission One"

code/branches/presentationHS13/data/levels/quests.oxw

@@ +1 @@
+<!-- -->
 <LevelInfo
  name = "Quests showcase"

code/branches/presentationHS13/data/levels/templates/spaceshipHXYSL.oxt

@@ -25 +25 @@
     <attached>
       <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
+      <DistanceTriggerBeacon name="player" />
     </attached>
     <collisionShapes>

code/branches/presentationHS13/src/modules/overlays/OverlaysPrereqs.h

@@ -80 +80 @@
     class BarColour;
     class ChatOverlay;
+    class CountDown;
     class DeathMessage;
     class GametypeFadingMessage;

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

@@ -18 +18 @@
   PauseNotice.cc
   LastTeamStandingInfos.cc
+  CountDown.cc
 )