Changeset 9316

Timestamp:

Jul 9, 2012, 11:47:59 PM (12 years ago)

Author:

dafrick

Message:

Replacing unlicend skyboxes

Location:

code/branches/presentation2012merge/data

Files:

• levels/FPSTest.oxw (modified) (1 diff)
• levels/docking.oxw (modified) (1 diff)
• levels/events.oxw (modified) (1 diff)
• levels/fightInOurBack.oxw (modified) (1 diff)
• levels/lastTeamStanding.oxw (modified) (1 diff)
• levels/lastTeamStandingII.oxw (modified) (1 diff)
• levels/notifications.oxw (modified) (1 diff)
• levels/old/presentationPhysics.oxw (modified) (1 diff)
• levels/old/princessAeryn.oxw (modified) (1 diff)
• levels/pirateAttack.oxw (modified) (1 diff)
• levels/planets.oxw (modified) (1 diff)
• levels/pong.oxw (modified) (2 diffs)
• levels/portals.oxw (modified) (1 diff)
• levels/presentation09.oxw (modified) (1 diff)
• levels/presentation09b.oxw (modified) (1 diff)
• levels/presentationDM.oxw (modified) (1 diff)
• levels/presentationFS102.oxw (modified) (1 diff)
• levels/presentationFS10Ed.oxw (modified) (1 diff)
• levels/presentationHS09.oxw (modified) (1 diff)
• levels/princessAeryn.oxw (modified) (1 diff)
• levels/screenshot.oxw (modified) (1 diff)
• levels/teamBaseMatch.oxw (modified) (1 diff)
• levels/teamDeathMatch.oxw (modified) (1 diff)
• levels/testSwallow.oxw (modified) (1 diff)
• levels/tetris.oxw (modified) (1 diff)
• levels/theTimeMachine.oxw (modified) (1 diff)
• levels/tutorial.oxw (modified) (1 diff)
• levels/underAttack.oxw (modified) (1 diff)
• levels/waypoints.oxw (modified) (1 diff)
• particle/smoke1.particle (deleted)

code/branches/presentation2012merge/data/levels/FPSTest.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
    gravity      = "0,-1000,0"
    negativeWorldRange = "-100000, -100000, -100000"

code/branches/presentation2012merge/data/levels/docking.oxw

@@ -21 +21 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
 

code/branches/presentation2012merge/data/levels/events.oxw

@@ -22 +22 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/data/levels/fightInOurBack.oxw

@@ -121 +121 @@
     <Scene
      ambientlight="0.8,0.8,0.8"
-     skybox="Orxonox/skypanoramagen1"
+     skybox="Orxonox/skyBoxBasic"
     >
 

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

@@ -27 +27 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skypanoramagen1"
+    skybox       = "Orxonox/skyBoxBasic"
   >
   <?lua include("includes/notifications.oxi") ?>

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

@@ -25 +25 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skypanoramagen1"
+    skybox       = "Orxonox/skyBoxBasic"
   >
 <!-- TODO:

code/branches/presentation2012merge/data/levels/notifications.oxw

@@ -21 +21 @@
     <Scene
         ambientlight = "0.5, 0.5, 0.5"
-        skybox       = "Orxonox/skypanoramagen1"
+        skybox       = "Orxonox/skyBoxBasic"
     >
 

code/branches/presentation2012merge/data/levels/old/presentationPhysics.oxw

@@ -12 +12 @@
   <Scene
    ambientlight = "0.8, 0.8, 0.8"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
    gravity      = "0, -10, 0"
   >

code/branches/presentation2012merge/data/levels/old/princessAeryn.oxw

@@ -15 +15 @@
     <Scene
         ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skypanoramagen1"
+        skybox       = "Orxonox/skyBoxBasic"
     >
 

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

@@ -39 +39 @@
     <Scene
         ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skypanoramagen1"
+        skybox       = "Orxonox/skyBoxBasic"
     >
 

code/branches/presentation2012merge/data/levels/planets.oxw

@@ -21 +21 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skypanoramagen1"
+    skybox       = "Orxonox/skyBoxBasic"
   >
 

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

@@ -63 +63 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
@@ -92 +92 @@
             <ParticleSpawner name=scoreeffect_left position="-120,0,-45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
 
-            <WorldSound name="scoreSound" position="0,0,0" source="sounds/pong_score.wav" >
+            <WorldSound name="scoreSound" position="0,0,0" source="Earth.ogg" >
               <events>
                 <play>

code/branches/presentation2012merge/data/levels/portals.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
 

code/branches/presentation2012merge/data/levels/presentation09.oxw

@@ -22 +22 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
   

code/branches/presentation2012merge/data/levels/presentation09b.oxw

@@ -26 +26 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen2"
+   skybox       = "Orxonox/skyBoxSomeNebula"
   >
 

code/branches/presentation2012merge/data/levels/presentationDM.oxw

@@ -24 +24 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/data/levels/presentationFS102.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
    gravity      = "0,-1000,0"
    negativeWorldRange = "-100000, -100000, -100000"

code/branches/presentation2012merge/data/levels/presentationFS10Ed.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
    gravity      = "0,-1000,0"
    negativeWorldRange = "-100000, -100000, -100000"

code/branches/presentation2012merge/data/levels/presentationHS09.oxw

@@ -27 +27 @@
   <Scene
    ambientlight = "0.6, 0.4, 0.4"
-   skybox       = "Orxonox/skypanoramagen2"
+   skybox       = "Orxonox/skyBoxSomeNebula"
   >
 

code/branches/presentation2012merge/data/levels/princessAeryn.oxw

@@ -26 +26 @@
   <Scene
     ambientlight = "0.3, 0.3, 0.3"
-    skybox     = "Orxonox/skypanoramagen1"
+    skybox     = "Orxonox/skyBoxBasic"
   >
 

code/branches/presentation2012merge/data/levels/screenshot.oxw

@@ -25 +25 @@
   <Scene
    ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <!--Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" /-->

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

@@ -26 +26 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

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

@@ -25 +25 @@
   <Scene
    ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/data/levels/testSwallow.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/data/levels/tetris.oxw

@@ -63 +63 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
 <!--luke_grey_-_hypermode.ogg allgorythm-lift_up.ogg Fight1.ogg -->

code/branches/presentation2012merge/data/levels/theTimeMachine.oxw

@@ -75 +75 @@
     <Scene
         ambientlight="0.8,0.8,0.8"
-        skybox="Orxonox/skypanoramagen2"
+        skybox="Orxonox/skyBoxSomeNebula"
     >
 

code/branches/presentation2012merge/data/levels/tutorial.oxw

@@ -24 +24 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">

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

@@ -24 +24 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

code/branches/presentation2012merge/data/levels/waypoints.oxw

@@ -23 +23 @@
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/skyBoxBasic"
   >
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />