Changeset 11050

Timestamp:

Jan 9, 2016, 4:37:30 PM (9 years ago)

Author:

landauf

Message:

some cleanup in data files

Location:

code/branches/presentationHS15/data

Files:

• gui/layouts/InGameMenu.layout (modified) (1 diff)
• levels/emptyLevel.oxw (modified) (2 diffs)
• levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• levels/includes/weaponSettingsCollateral.oxi (modified) (1 diff)
• levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• levels/includes/weaponSettingsEscortMine.oxi (modified) (1 diff)
• levels/includes/weaponSettingsFPS.oxi (modified) (1 diff)
• levels/includes/weaponSettingsFPS_HS14.oxi (modified) (1 diff)
• levels/includes/weaponSettingsHXY.oxi (modified) (1 diff)
• levels/includes/weaponSettingsRing.oxi (modified) (1 diff)
• levels/templates/spaceshipEscort.oxt (modified) (2 diffs)
• levels/templates/spaceshipEscortMine.oxt (modified) (2 diffs)

code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout

@@ -19 +19 @@
             <Property Name="Alpha" Value="0.9" />
             <Event Name="Clicked" Function="InGameMenu.button_reloadLevel_clicked"/>
-        </Window>        
+        </Window>
         <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
             <Property Name="Text" Value="Main Menu" />

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

@@ -1 @@
- <LevelInfo
+<LevelInfo
  name = "Empty level"
  description = "A level with absolutely nothing in it."
@@ -29 +29 @@
     <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=spaceshipescort />
-
-        
+    
   </Scene>
 </Level>

code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi

@@ -48 +48 @@
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
-    </munition>    
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi

@@ -50 +50 @@
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
-    </munition>    
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi

@@ -28 +28 @@
     <munition>
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
-    </munition>      
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi

@@ -32 +32 @@
       <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
       <MineMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
-    </munition>      
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi

@@ -53 +53 @@
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
-    </munition>    
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi

@@ -53 +53 @@
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
-    </munition>      
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi

@@ -28 +28 @@
       <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
-    </munition> 
+    </munition>

code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi

@@ -1 +1 @@
     <weaponslots>
-      <WeaponSlot position="11,0,-7" />      
+      <WeaponSlot position="11,0,-7" />
       <WeaponSlot position="-11,0,-7" />
       <WeaponSlot position="0,0,-7" />

code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt

@@ -105 +105 @@
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
        />
-
-           <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
-
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
-
     </EffectContainer>
     <EffectContainer condition="not idle">
@@ -118 +115 @@
 
     </EffectContainer>
-
     <EffectContainer condition="normal or boost">
-        
-        
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     </EffectContainer>

code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt

@@ -105 +105 @@
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
        />
-
-           <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
-
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
-
     </EffectContainer>
     <EffectContainer condition="not idle">
@@ -118 +115 @@
 
     </EffectContainer>
-
     <EffectContainer condition="normal or boost">
-        
-        
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     </EffectContainer>
-
     <EffectContainer condition="boost">
       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />