Changeset 9918 for code/branches/presentationHS13/data

Timestamp:

Dec 16, 2013, 3:43:45 PM (11 years ago)

Author:

smerkli

Message:

Merged sfxThilo branch, things seem to be working fine

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• data/defaultConfig/keybindings.ini (modified) (1 diff)
• data/levels/Spacerace2.oxw (modified) (2 diffs)
• data/levels/asteroidField.oxw (modified) (1 diff)
• data/levels/asteroids.oxw (modified) (1 diff)
• data/levels/dynamicMatch.oxw (modified) (1 diff)
• data/levels/lastManStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStandingII.oxw (modified) (1 diff)
• data/levels/maxim.oxw (modified) (1 diff)
• data/levels/pirateAttack.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/spaceRace.oxw (modified) (2 diffs)
• data/levels/surfaceRace.oxw (modified) (2 diffs)
• data/levels/teamBaseMatch.oxw (modified) (1 diff)
• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• data/levels/templates/spaceshipAssff.oxt (modified) (2 diffs)
• data/levels/underAttack.oxw (modified) (1 diff)

code/branches/presentationHS13/data/defaultConfig/keybindings.ini

@@ -58 +58 @@
 KeyLeftWindows=
 KeyLessThan=
-KeyM=
+KeyM="WorldAmbientSound nextsong"
 KeyMail=
 KeyMediaSelect=

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

@@ -14 +14 @@
 
 ?>
+
 
 <?lua
@@ -107 +108 @@
 
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
+        
+        <!-- SOUNDS & MUSIC -->
+    <WorldSound name="scoreSound" position="-200,0,0" source="sounds/ReadyGo.ogg" >
+      <events>
+        <play>
+          <EventListener event="start" />
+        </play>
+      </events>
+    </WorldSound>
+    <DistanceTrigger name="start" position="-200,0,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+    
+    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
 
     <!-- ------------------Planet----------------- -->

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

@@ -11 +11 @@
   include("templates/lodInformation.oxt")
 ?>
+<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -5 +5 @@
  screenshot = "asteroids.png"
 />
+<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -5 +5 @@
  screenshot = "dynamicMatch.png"
 />
+<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
 
 <?lua

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

@@ -32 +32 @@
       include("includes/pickups.oxi")
     ?>
+    
+    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
 <!----- Spawnpoints

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

@@ -33 +33 @@
       include("includes/pickups.oxi")
     ?>
+    
+    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
 <Bot />

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

@@ -27 +27 @@
     skybox       = "Orxonox/skyBoxBasic"
   >
+  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
+  
 <!-- TODO:
 1. make collisionshapes bulletproof: -> attach movable entity with dynamic collisionshape within a static collisionshape 

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

@@ -25 +25 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  
+  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
 
   <NotificationQueueCEGUI

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

@@ -25 +25 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
+
+<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
     
 <Level

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

@@ -34 +34 @@
 
 <Template name=pongball>
-  <PongBall>
+  <PongBall 
+   defScoreSound = "sounds/PlayerWinScore_cut.ogg"
+   defBatSound = "sounds/Button.ogg"
+   defBoundarySound = "sounds/Button.ogg">
     <attached>
       <Model mesh="sphere.mesh" scale=2 />

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

@@ -29 +29 @@
     skybox       = "Orxonox/skyBoxMoreNebula"
   >
+  
+  <!-- SOUNDS & MUSIC -->
+    <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
+      <events>
+        <play>
+          <EventListener event="start" />
+        </play>
+      </events>
+    </WorldSound>
+    <DistanceTrigger name="start" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+  
+    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
+  
 
     <?lua math.randomseed(98) ?>
@@ -463 +476 @@
       </controller>
     </SpaceShip>
+    
+    
 
   </Scene>

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

@@ -10 +10 @@
  tags = "gametype"
 />
+
 
 <?lua
@@ -445 +446 @@
     ?>
     <?lua end ?>
+    
+    <!-- SOUNDS & MUSIC -->
+    <WorldSound name="scoreSound" position="0,8050,0" source="sounds/ReadyGo.ogg" >
+      <events>
+        <play>
+          <EventListener event="start" />
+        </play>
+      </events>
+    </WorldSound>
+    <DistanceTrigger name="start" position="0,8050,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
 
   </Scene>

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

@@ -19 +19 @@
 >
 
+<WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
+
   <templates>
     <Template link=lodtemplate_default />

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

@@ -22 +22 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  
+  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
 
   <Scene

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

@@ -37 +37 @@
    linearDamping     = 0.7
    angularDamping    = 0.9999999
+
+   explosionSound = "sounds/Explosion2.ogg"
   >
     <engines>
@@ -82 +84 @@
    defEngineSndNormal = "sounds/Engine_low.ogg"
    defEngineSndBoost = "sounds/Engine_high.ogg"
-
+   
    accelerationfront     = 500
    accelerationbrake     = 500

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

@@ -20 +20 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
 
   <Scene