Changeset 11353 for code/trunk/data/gui

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/gui/scripts/KeyBindMenu.lua (modified) (2 diffs)

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")