[Orxonox-commit 6724] r11352 - in code/branches/HUD_HS16/data: levels overlays
patricwi at orxonox.net
patricwi at orxonox.net
Thu Mar 9 13:23:50 CET 2017
Author: patricwi
Date: 2017-03-09 13:23:50 +0100 (Thu, 09 Mar 2017)
New Revision: 11352
Added:
code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo
Modified:
code/branches/HUD_HS16/data/levels/pickups.oxw
code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo
Log:
most changes before the merge, added individual HUDPickupTemplate for PickupInventory, per default HUDTemplates3 is used which has the PickupSystem visibility set to false
Modified: code/branches/HUD_HS16/data/levels/pickups.oxw
===================================================================
--- code/branches/HUD_HS16/data/levels/pickups.oxw 2017-03-02 15:02:01 UTC (rev 11351)
+++ code/branches/HUD_HS16/data/levels/pickups.oxw 2017-03-09 12:23:50 UTC (rev 11352)
@@ -8,7 +8,7 @@
<?lua
include("stats.oxo")
- include("HUDTemplates3.oxo")
+ include("HUDPickupTemplate.oxo")
?>
<?lua
Added: code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo
===================================================================
--- code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo (rev 0)
+++ code/branches/HUD_HS16/data/overlays/HUDPickupTemplate.oxo 2017-03-09 12:23:50 UTC (rev 11352)
@@ -0,0 +1,217 @@
+<!--
+<Template name="defaultHUD">
+ <OverlayGroup name = "defaultHUD" scale = "1, 1">
+ <ChatOverlay
+ name = "chat"
+ position = "0.03, 0.5"
+ font = "VeraMono"
+ caption = ""
+ textsize = 0.025
+ />
+
+ <GametypeStatus
+ name = "state"
+ position = "0.5, 0.85"
+ font = "VeraMono"
+ textsize = 0.05
+ colour = "1.0, 1.0, 0.0, 0.8"
+ align = "center"
+ />
+ </OverlayGroup>
+</Template>
+-->
+
+<Template name="spectatorhud">
+ <OverlayGroup name = "spectatorhud" scale = "1, 1">
+ </OverlayGroup>
+</Template>
+
+<Template name="rockethud">
+ <OverlayGroup name = "rockethud" scale = "1, 1">
+ <HUDRocketFuelBar
+ name = "RocketFuelBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "0.0 , 1.0 "
+ pickpoint = "0, 1"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconFuel"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDRocketFuelBar>
+ </OverlayGroup>
+</Template>
+
+<Template name="spaceshiphud">
+ <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+ <Map />
+
+ <HUDHealthBar
+ name = "HealthBar1"
+ background = "Orxonox/HealthBarBackground"
+ size = "0.40, 0.08"
+ position = "0.0 , 0.85 "
+ pickpoint = "0, 1"
+ bartexture = "healthbar_bar.png"
+ textfont = "VeraMono"
+ textusebarcolour = true
+ textscale = 0.4
+ textoffset = "0.325, -0.825"
+ textpickpoint = "0, 0"
+ textalign = "right"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconHealth"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDHealthBar>
+
+ <HUDShieldBar
+ name = "ShieldBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "0.0 , 0.9 "
+ pickpoint = "0, 1"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconShield"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDShieldBar>
+
+ <HUDSpeedBar
+ name = "SpeedBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "0.0 , 0.95 "
+ pickpoint = "0, 1"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconSpeed"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+ <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+ </HUDSpeedBar>
+
+ <HUDBoostBar
+ name = "BoostBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "0.0 , 1.0 "
+ pickpoint = "0, 1"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconBoost"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDBoostBar>
+
+ <HUDEnemyHealthBar
+ name = "EnemyHealthBar"
+ background = "Orxonox/HealthBarBackground"
+ size = "0.4, 0.08"
+ position = "1 ,0"
+ pickpoint = "1, 0"
+ bartexture = "healthbar_bar.png"
+ textfont = "VeraMono"
+ textusebarcolour = true
+ textscale = 0.4
+ textoffset = "-0.675, 0.175"
+ textpickpoint = "0, 0"
+ textalign = "right"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconHealth"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDEnemyHealthBar>
+
+ <HUDEnemyShieldBar
+ name = "EnemyShieldBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "1.0 , 0.1 "
+ pickpoint = "1, 0"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconShield"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDEnemyShieldBar>
+
+ <HUDNavigation
+ name = "Navigation"
+ correctaspect = true
+ font = "Monofur"
+ textsize = 0.02
+ navMarkerSize = 0.03
+ aimMarkerSize = 0.02
+ />
+
+ <HUDRadar
+ name = "Radar"
+ background = "Orxonox/Radar3D"
+ material2D = "Orxonox/Radar"
+ material3DMiddle = "Orxonox/Radar3D"
+ material3DFront = "Orxonox/Radar3DFront"
+ material3DBack = "Orxonox/Radar3DBack"
+ correctaspect = true
+ size = "0.17, 0.17"
+ position = "1.0, 1.0"
+ pickpoint = "1.0, 1.0"
+ rotation = 0
+ sensitivity = 1.0
+ halfDotSizeDistance = 3000
+ detectionLimit = 10000.0
+ maximumDotSize = 0.1
+ maximumDotSize3D = 0.06
+ mapAngle3D = 0.6435011
+ />
+
+ <HUDWeaponSystem
+ name = "WeaponSystem"
+ correctaspect = true
+ position = "0.01, 0.01"
+ pickpoint = "0, 0"
+ visible = "true"
+ weaponModeHUDSize = "0.09, 0.03"
+ />
+
+ <HUDPickupSystem
+ name = "PickupSystem"
+ correctaspect = true
+ position = "0.32, 0.81"
+ pickpoint = "0.0, 0.0"
+ visible = "true"
+ />
+
+ <HUDTimer
+ name = "Timer"
+ position = "0.5, 0.25"
+ font = "VeraMono"
+ textsize = 0.1
+ colour = "1.0, 1.0, 0.0, 0.8"
+ align = "center"
+ />
+
+ <GUIOverlay
+ name = "QuestGUI"
+ guiname = "QuestGUI"
+ visible = "false"
+ />
+
+ <GUIOverlay
+ name = "PickupInventory"
+ guiname = "PickupInventory"
+ visible = "false"
+ />
+
+ </OverlayGroup>
+</Template>
Modified: code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo 2017-03-02 15:02:01 UTC (rev 11351)
+++ code/branches/HUD_HS16/data/overlays/HUDTemplates3.oxo 2017-03-09 12:23:50 UTC (rev 11352)
@@ -189,7 +189,7 @@
correctaspect = true
position = "0.32, 0.81"
pickpoint = "0.0, 0.0"
- visible = "true"
+ visible = "false"
/>
<HUDTimer
More information about the Orxonox-commit
mailing list