Changeset 1755 for code/trunk/src/orxonox/gui

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gui (copied) (copied from code/branches/gui/src/orxonox/gui)
• src/orxonox/gui/GUIManager.cc (copied) (copied from code/branches/gui/src/orxonox/gui/GUIManager.cc) (1 diff)
• src/orxonox/gui/GUIManager.h (copied) (copied from code/branches/gui/src/orxonox/gui/GUIManager.h)
• src/orxonox/gui/OgreCEGUIRenderer.cpp (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUIRenderer.cpp)
• src/orxonox/gui/OgreCEGUIRenderer.h (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUIRenderer.h)
• src/orxonox/gui/OgreCEGUIResourceProvider.cpp (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUIResourceProvider.cpp)
• src/orxonox/gui/OgreCEGUIResourceProvider.h (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUIResourceProvider.h)
• src/orxonox/gui/OgreCEGUITexture.cpp (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUITexture.cpp)
• src/orxonox/gui/OgreCEGUITexture.h (copied) (copied from code/branches/gui/src/orxonox/gui/OgreCEGUITexture.h)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -57 +57 @@
 namespace orxonox
 {
-    SetConsoleCommandShortcut(GUIManager, showGUI_s).setKeybindMode(KeybindMode::OnPress);
+    SetConsoleCommandShortcut(GUIManager, showGUI_s).keybindMode(KeybindMode::OnPress);
 
     GUIManager* GUIManager::singletonRef_s = 0;