Changeset 9229 for code/branches/presentation2012/data

Timestamp:

May 23, 2012, 1:07:29 PM (12 years ago)

Author:

decapitb

Message:

merged towerdefense

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/includes/towerWeaponSettings.oxi (copied) (copied from code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi)
• data/levels/portals.oxw (modified) (1 diff)
• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• data/levels/templates/spaceshipPirate.oxt (modified) (1 diff)
• data/levels/templates/tower.oxt (copied) (copied from code/branches/newlevel2012/data/levels/templates/tower.oxt)
• data/levels/theTimeMachine.oxw (modified) (1 diff)
• data/levels/towerDefense.oxw (copied) (copied from code/branches/newlevel2012/data/levels/towerDefense.oxw)
• data/overlays/towerdefenseHUD.oxo (copied) (copied from code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo)

code/branches/presentation2012/data/levels/emptyLevel.oxw

@@ -23 +23 @@
   <?lua include("includes/notifications.oxi") ?>
 
+
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
@@ -30 +31 @@
     <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"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
-    
+ 
+
   </Scene>
 </Level>

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

@@ -29 +29 @@
         <PortalEndPoint>
             <attached>
-                <Billboard material="Portals/Default" />
+                <Model mesh="Spacegate.mesh" yaw="90"/>
             </attached>
         </PortalEndPoint>

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

@@ -25 +25 @@
   <Scene
    ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/skypanoramagen1"
+   skybox       = "Orxonox/creeper1"
   >
     <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/presentation2012/data/levels/templates/spaceshipPirate.oxt

@@ -35 +35 @@
    angularDamping    = 0.9999999
   >
+
     <engines>
       <MultiStateEngine position=" 0, 0, 0" template=spaceshippirateengine />
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=20 mesh="pirate.mesh" />
       <BlinkingBillboard position=" 12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 />
       <BlinkingBillboard position="-12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="90"/>

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

@@ -57 +57 @@
 ?>
   </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   defEngineSndNormal = "sounds/Engine_low.ogg"
+   defEngineSndBoost = "sounds/Engine_high.ogg"
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+
+  </MultiStateEngine>
 </Template>