[Orxonox-commit 6393] r11050 - in code/branches/presentationHS15/data: gui/layouts levels levels/includes levels/templates
landauf at orxonox.net
landauf at orxonox.net
Sat Jan 9 16:37:30 CET 2016
Author: landauf
Date: 2016-01-09 16:37:30 +0100 (Sat, 09 Jan 2016)
New Revision: 11050
Modified:
code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout
code/branches/presentationHS15/data/levels/emptyLevel.oxw
code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi
code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi
code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt
code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt
Log:
some cleanup in data files
Modified: code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout 2016-01-09 15:37:30 UTC (rev 11050)
@@ -18,7 +18,7 @@
<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
<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" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
Modified: code/branches/presentationHS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/presentationHS15/data/levels/emptyLevel.oxw 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/emptyLevel.oxw 2016-01-09 15:37:30 UTC (rev 11050)
@@ -1,4 +1,4 @@
- <LevelInfo
+<LevelInfo
name = "Empty level"
description = "A level with absolutely nothing in it."
tags = "test"
@@ -28,8 +28,7 @@
<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>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -47,4 +47,4 @@
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=2 replenishinterval=7.5/>
<LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
<RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -49,4 +49,4 @@
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
<LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
<RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -27,4 +27,4 @@
</weaponpacks>
<munition>
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -31,4 +31,4 @@
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
<IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
<MineMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -52,4 +52,4 @@
<munition>
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
<LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -52,4 +52,4 @@
<munition>
<LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
<LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -27,4 +27,4 @@
<munition>
<LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
<LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
- </munition>
+ </munition>
Modified: code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi
===================================================================
--- code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi 2016-01-09 15:37:30 UTC (rev 11050)
@@ -1,5 +1,5 @@
<weaponslots>
- <WeaponSlot position="11,0,-7" />
+ <WeaponSlot position="11,0,-7" />
<WeaponSlot position="-11,0,-7" />
<WeaponSlot position="0,0,-7" />
</weaponslots>
Modified: code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt 2016-01-09 15:37:30 UTC (rev 11050)
@@ -104,11 +104,8 @@
<EffectContainer condition="idle">
<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">
<FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
@@ -117,12 +114,8 @@
<EffectContainer condition="normal or brake">
</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>
Modified: code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt
===================================================================
--- code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt 2016-01-09 15:29:12 UTC (rev 11049)
+++ code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt 2016-01-09 15:37:30 UTC (rev 11050)
@@ -104,11 +104,8 @@
<EffectContainer condition="idle">
<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">
<FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
@@ -117,15 +114,10 @@
<EffectContainer condition="normal or brake">
</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" />
<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" />
More information about the Orxonox-commit
mailing list