[Orxonox-commit 7089] r11706 - in code/trunk/data: levels overlays
landauf at orxonox.net
landauf at orxonox.net
Sat Jan 6 15:27:49 CET 2018
Author: landauf
Date: 2018-01-06 15:27:49 +0100 (Sat, 06 Jan 2018)
New Revision: 11706
Removed:
code/trunk/data/overlays/HUDPickupTemplate.oxo
Modified:
code/trunk/data/levels/pickups.oxw
code/trunk/data/overlays/HUDTemplates3.oxo
Log:
[HUD_HS16] pickups are now always shown in hud, but much smaller. removed HUDPickupTemplate.oxo
Modified: code/trunk/data/levels/pickups.oxw
===================================================================
--- code/trunk/data/levels/pickups.oxw 2018-01-06 14:13:26 UTC (rev 11705)
+++ code/trunk/data/levels/pickups.oxw 2018-01-06 14:27:49 UTC (rev 11706)
@@ -8,7 +8,7 @@
<?lua
include("stats.oxo")
- include("HUDPickupTemplate.oxo")
+ include("HUDTemplates3.oxo")
?>
<?lua
Deleted: code/trunk/data/overlays/HUDPickupTemplate.oxo
===================================================================
--- code/trunk/data/overlays/HUDPickupTemplate.oxo 2018-01-06 14:13:26 UTC (rev 11705)
+++ code/trunk/data/overlays/HUDPickupTemplate.oxo 2018-01-06 14:27:49 UTC (rev 11706)
@@ -1,219 +0,0 @@
-<!--
-<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"
- background = "PickupBar"
- correctaspect = true
- size = "0.70, 0.15"
- 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/trunk/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/trunk/data/overlays/HUDTemplates3.oxo 2018-01-06 14:13:26 UTC (rev 11705)
+++ code/trunk/data/overlays/HUDTemplates3.oxo 2018-01-06 14:27:49 UTC (rev 11706)
@@ -188,10 +188,10 @@
name = "PickupSystem"
background = "PickupBar"
correctaspect = true
- size = "0.70, 0.15"
- position = "0.32, 0.81"
+ size = "0.20, 0.08"
+ position = "0.01, 0.15"
pickpoint = "0.0, 0.0"
- visible = "false"
+ visible = "true"
/>
<HUDTimer
More information about the Orxonox-commit
mailing list