[Orxonox-commit 4672] r9343 - in code/branches/presentation2012merge/data: levels overlays

jo at orxonox.net jo at orxonox.net
Thu Aug 30 11:53:01 CEST 2012


Author: jo
Date: 2012-08-30 11:53:01 +0200 (Thu, 30 Aug 2012)
New Revision: 9343

Modified:
   code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw
   code/branches/presentation2012merge/data/levels/pong.oxw
   code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo
Log:
XML fixes: LastManStanding: wrong OverlayGroup name \n <br> LastTeamStanding: removing duplicate include

Modified: code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw	2012-08-30 09:15:33 UTC (rev 9342)
+++ code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw	2012-08-30 09:53:01 UTC (rev 9343)
@@ -28,7 +28,6 @@
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/skyBoxBasic"
   >
-  <?lua include("includes/notifications.oxi") ?>
 
     <?lua
       include("includes/pickups.oxi")

Modified: code/branches/presentation2012merge/data/levels/pong.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/pong.oxw	2012-08-30 09:15:33 UTC (rev 9342)
+++ code/branches/presentation2012merge/data/levels/pong.oxw	2012-08-30 09:53:01 UTC (rev 9343)
@@ -56,8 +56,8 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
 
-  <WorldAmbientSound source="Ganymede.ogg" playOnLoad=true looping=true />
-
+  <!--WorldAmbientSound source="Ganymede.ogg" playOnLoad=true looping=true /-->
+  <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
   <PongBot />
 
   <Scene

Modified: code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo
===================================================================
--- code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo	2012-08-30 09:15:33 UTC (rev 9342)
+++ code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo	2012-08-30 09:53:01 UTC (rev 9343)
@@ -1,5 +1,5 @@
 <Template name="LastmanstandingHUD">
-  <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
+  <OverlayGroup name="LastmanstandingHUD" scale = "1, 1">
     <OverlayText
      position  = "0.02, 0.02"
      pickpoint = "0.0, 0.0"




More information about the Orxonox-commit mailing list