Changeset 6150 for code/branches/presentation2/data/gui/scripts/InGameMenu.lua

Timestamp:

Nov 25, 2009, 4:52:37 PM (15 years ago)

Author:

scheusso

Message:

merged menu branch to presentation2 branch with some additional fixes and features

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• data/gui/scripts/InGameMenu.lua (copied) (copied from code/branches/menu/data/gui/scripts/InGameMenu.lua) (1 diff)

code/branches/presentation2/data/gui/scripts/InGameMenu.lua

@@ -25 +25 @@
     orxonox.Game:getInstance():popState()
     orxonox.Game:getInstance():requestState("mainmenu")
-    orxonox.CommandExecutor:execute("showGUI MainMenu")
     orxonox.CommandExecutor:execute("hideGUI InGameMenu")
 end