Changeset 11353 for code/trunk/data

Timestamp:

Mar 9, 2017, 2:46:20 PM (8 years ago)

Author:

patricwi

Message:

merged HUD branch to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/defaultConfig/keybindings.ini (modified) (2 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (2 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)

code/trunk/data/defaultConfig/keybindings.ini

@@ -70 +70 @@
 KeyNoConvert=
 KeyNumLock=
-KeyNumRow0=
-KeyNumRow1="toggleFormationFlight"
-KeyNumRow2="FFChangeMode"
-KeyNumRow3=
-KeyNumRow4=
-KeyNumRow5=
-KeyNumRow6=
-KeyNumRow7=
-KeyNumRow8=
-KeyNumRow9=
-KeyNumpad0=
-KeyNumpad1=
-KeyNumpad2=
-KeyNumpad3=
-KeyNumpad4=
-KeyNumpad5=
-KeyNumpad6=
-KeyNumpad7=
-KeyNumpad8=
-KeyNumpad9=
+KeyNumRow0="useUnusePickup 0"
+KeyNumRow1="useUnusePickup 1"
+KeyNumRow2="useUnusePickup 2"
+KeyNumRow3="useUnusePickup 3"
+KeyNumRow4="useUnusePickup 4"
+KeyNumRow5="useUnusePickup 5"
+KeyNumRow6="useUnusePickup 6"
+KeyNumRow7="useUnusePickup 7"
+KeyNumRow8="useUnusePickup 8"
+KeyNumRow9="useUnusePickup 9"
+KeyNumpad0="useUnusePickup 0"
+KeyNumpad1="useUnusePickup 1"
+KeyNumpad2="useUnusePickup 2"
+KeyNumpad3="useUnusePickup 3"
+KeyNumpad4="useUnusePickup 4"
+KeyNumpad5="useUnusePickup 5"
+KeyNumpad6="useUnusePickup 6"
+KeyNumpad7="useUnusePickup 7"
+KeyNumpad8="useUnusePickup 8"
+KeyNumpad9="useUnusePickup 9"
 KeyNumpadAdd=
 KeyNumpadComma=
@@ -96 +96 @@
 KeyNumpadPeriod=
 KeyNumpadSubtract=
-KeyO=
-KeyP=
+KeyO="toggleFormationFlight"
+KeyP="FFChangeMode"
 KeyPageDown="scale -1 rotateRoll"
 KeyPageUp=

code/trunk/data/gui/scripts/KeyBindMenu.lua

@@ -36 +36 @@
     table.insert(commandList, "pause")
     table.insert(commandList, "printScreen")
+    table.insert(commandList, "useUnusePickup")
     if orxonox.GUIManager:inDevMode() then
         table.insert(commandList, "printScreenHD")
@@ -71 +72 @@
     table.insert(nameList, "Pause")
     table.insert(nameList, "Screenshot")
+    table.insert(nameList, "Pickup 0")
     if orxonox.GUIManager:inDevMode() then
         table.insert(nameList, "HD screenshot")

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -185 +185 @@
     />
     
+    <HUDPickupSystem
+     name                   = "PickupSystem"
+     correctaspect          = true
+     position               = "0.32, 0.81"
+     pickpoint              = "0.0, 0.0"
+     visible                = "true"
+    />
+
     <HUDTimer
      name     = "Timer"
-     position = "0.5, 0.85"
+     position = "0.5, 0.25"
      font     = "VeraMono"
      textsize = 0.1

code/trunk/data/overlays/HUDTemplatesFPS.oxo

@@ -104 +104 @@
     />
 
+    <HUDPickupSystem
+     name                   = "PickupSystem"
+     correctaspect          = true
+     position               = "0.45, 0.95"
+     pickpoint              = "0.0, 0.0"
+     visible                = "true"
+    />
+
     <HUDTimer
      name     = "Timer"