# # ChangeLog for code/branches/presentation2/data/gui # # Generated by Trac 1.0.9 # Dec 1, 2024, 9:22:51 PM Wed, 23 Dec 2009 19:45:56 GMT rgrieder [6406] * code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/MoodManager.h (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified) Mood changes should now be working and with immediate (but delayed ... Tue, 22 Dec 2009 22:20:19 GMT rgrieder [6403] * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2/data/lua/LuaStateInit.lua (modified) Added lua convenience function for console commmands: ... Mon, 21 Dec 2009 12:28:10 GMT rgrieder [6388] * code/branches/presentation2/README (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation2/data/levels/old/physicstest.oxw (modified) * code/branches/presentation2/data/levels/old/tutorial_hs08.oxw (modified) * code/branches/presentation2/data/levels/presentation09.oxw (modified) * code/branches/presentation2/data/levels/presentation09b.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentation_dm.oxw (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/overlays/OrxonoxLoading.overlay (modified) * code/branches/presentation2/doc/CMakeLists.txt (modified) * code/branches/presentation2/doc/api/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/presentation2/src/libraries/core/EventIncludes.h (modified) * code/branches/presentation2/src/libraries/core/GUIManager.h (modified) * code/branches/presentation2/src/libraries/core/MemoryArchive.cc (modified) * code/branches/presentation2/src/libraries/core/MemoryArchive.h (modified) * code/branches/presentation2/src/libraries/core/Resource.h (modified) * code/branches/presentation2/src/libraries/core/input/InputCommands.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/util/Serialise.h (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestManager.h (modified) * code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h (modified) Found some end of line leftover spaces. Mon, 21 Dec 2009 12:18:36 GMT rgrieder [6387] * code/branches/presentation2/cmake/FindLua.cmake (modified) * code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake (modified) * code/branches/presentation2/cmake/LibraryConfig.cmake (modified) * code/branches/presentation2/cmake/LibraryConfigApple.cmake (modified) * code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/presentation2/data/gui/layouts/PickupInventory.layout (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/events.oxw (modified) * code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw (modified) * code/branches/presentation2/data/levels/presentation09.oxw (modified) * code/branches/presentation2/data/levels/presentation09b.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentation_dm.oxw (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/overlays/debug.oxo (modified) * code/branches/presentation2/data/overlays/stats.oxo (modified) * code/branches/presentation2/doc/api/CMakeLists.txt (modified) * code/branches/presentation2/src/external/ceguilua/CMakeLists.txt (modified) * code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation2/src/libraries/core/BaseObject.h (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/presentation2/src/libraries/core/Event.cc (modified) * code/branches/presentation2/src/libraries/core/Event.h (modified) * code/branches/presentation2/src/libraries/core/EventIncludes.h (modified) * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.h (modified) * code/branches/presentation2/src/libraries/core/SmartPtr.h (modified) * code/branches/presentation2/src/libraries/core/Thread.cc (modified) * code/branches/presentation2/src/libraries/core/Thread.h (modified) * code/branches/presentation2/src/libraries/core/ThreadPool.cc (modified) * code/branches/presentation2/src/libraries/core/ThreadPool.h (modified) * code/branches/presentation2/src/libraries/core/WeakPtr.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/presentation2/src/libraries/core/input/InputState.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/network/Client.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.h (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.h (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.h (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.h (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.cc (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.h (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.h (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/presentation2/src/libraries/tools/Timer.cc (modified) * code/branches/presentation2/src/libraries/tools/Timer.h (modified) * code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/branches/presentation2/src/libraries/util/Clock.cc (modified) * code/branches/presentation2/src/libraries/util/Math.cc (modified) * code/branches/presentation2/src/libraries/util/MultiType.h (modified) * code/branches/presentation2/src/libraries/util/MultiTypeValue.h (modified) * code/branches/presentation2/src/libraries/util/Serialise.h (modified) * code/branches/presentation2/src/libraries/util/mbool.h (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h (modified) * code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc (modified) * code/branches/presentation2/src/modules/pong/Pong.cc (modified) * code/branches/presentation2/src/modules/pong/PongAI.cc (modified) * code/branches/presentation2/src/modules/pong/PongBall.cc (modified) * code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation2/src/modules/questsystem/AddReward.cc (modified) * code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/FailQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestNotification.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/PlayerManager.cc (modified) * code/branches/presentation2/src/orxonox/Scene.h (modified) * code/branches/presentation2/src/orxonox/Test.h (modified) * code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/interfaces/Rewardable.h (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) Found some non empty new lines. Thu, 17 Dec 2009 10:10:39 GMT rgrieder [6370] * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/MoodManager.h (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified) Little cleanup in sound stuff and MoodManager. Caution: Renamed ... Thu, 17 Dec 2009 09:57:08 GMT rgrieder [6369] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Belongs to r6367, forgot to tick a file for the commit. Wed, 16 Dec 2009 20:41:33 GMT rgrieder [6363] * code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/SettingsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation2/data/levels/templates/spaceship_HXY.oxt (modified) * code/branches/presentation2/data/levels/templates/spaceship_HXY_SL.oxt (modified) * code/branches/presentation2/data/levels/templates/spaceship_Transporter.oxt (modified) * code/branches/presentation2/data/levels/templates/spaceship_Transporter_SL.oxt (modified) * code/branches/presentation2/data/particle/Steam.particle (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Serialise.h (modified) svn:eol-style "native" for all text files. Also removed two ... Wed, 16 Dec 2009 11:35:48 GMT scheusso [6362] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) joystick names are pretty now Tue, 15 Dec 2009 16:02:22 GMT dafrick [6355] * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Made KeyBindMenu less Resolution dependent, because of this the ... Mon, 14 Dec 2009 20:38:31 GMT dafrick [6353] * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) Adjusted scroll step size to allow for scrolling that is actually useful. Mon, 14 Dec 2009 19:47:00 GMT dafrick [6352] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Adjusted commandButton size to fit the new commands. Expanded ... Mon, 14 Dec 2009 19:20:08 GMT scheusso [6351] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) keybinding now possible without scrolling again and again Sun, 13 Dec 2009 19:39:18 GMT scheusso [6346] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) added additional keybinds (which i find usefull) Sun, 13 Dec 2009 16:35:59 GMT dafrick [6339] * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Undid an error I mad while removing empty lines. Quitting from ... Sun, 13 Dec 2009 12:49:37 GMT dafrick [6336] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Forgot to remove debug output... Sun, 13 Dec 2009 12:46:28 GMT dafrick [6335] * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Removed empty lines. Adjusted size of boxes in KeyBindMenu so that ... Sun, 13 Dec 2009 12:12:13 GMT cmueri [6334] * code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua (deleted) All the menus (inclusive InGameMenus) have an equal design, some ... Fri, 11 Dec 2009 16:24:32 GMT dafrick [6324] * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Improved KeyBindMenu further. This is the final version for the ... Wed, 09 Dec 2009 22:17:14 GMT dafrick [6311] * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) The KeyBindMenu now shows all Keybindings and allows for various ... Wed, 09 Dec 2009 14:56:03 GMT cmueri [6292] * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) New layout of the keybind menu. Wed, 09 Dec 2009 13:02:31 GMT dafrick [6284] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Bug fix. 0 != nil in lua... Wed, 09 Dec 2009 12:56:36 GMT dafrick [6283] * code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Some enhancements in KeyBindMenu.lua and InfoPopup, clear doesn't ... Wed, 09 Dec 2009 11:43:12 GMT rgrieder [6281] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/src/libraries/core/LuaState.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyDetector.h (modified) Added LuaFunctor that can execute arbitrary lua code. Also added ... Mon, 07 Dec 2009 21:06:30 GMT dafrick [6268] * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) Added more Keybindings to the KeyBinMenu and the displayed names of ... Mon, 07 Dec 2009 20:45:39 GMT dafrick [6266] * code/branches/presentation2/data/gui/layouts/InfoPopup.layout (added) * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/InfoPopup.lua (added) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) KeyBindMenu is working now. (Apart from some minor faults) Found ... Sun, 06 Dec 2009 21:48:39 GMT cmueri [6262] * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) Fullscreen and resolution changes are now available in the menu. Sun, 06 Dec 2009 19:16:04 GMT scheusso [6259] * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/PathConfig.h (modified) menu automatically reads ogre config path Sun, 06 Dec 2009 19:06:14 GMT cmueri [6258] * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) The fullscreen button is now available, but you have to change the ... Sat, 05 Dec 2009 20:33:56 GMT cmueri [6251] * code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified) The menu is now able to switch between normal and derive mouse input. Thu, 03 Dec 2009 23:44:31 GMT scheusso [6239] * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified) setting bDeriveMouseInput_ now possible from withing the mouse ... Thu, 03 Dec 2009 23:20:57 GMT cmueri [6238] * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified) The mouse controls menu has some new buttons and the sensitivity ... Thu, 03 Dec 2009 19:48:25 GMT cmueri [6235] * code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (modified) Small bug in audio menu fixed. Thu, 03 Dec 2009 19:10:07 GMT cmueri [6233] * code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) The audio menu and all its functions are now enabled. Thu, 03 Dec 2009 10:26:04 GMT scheusso [6224] * code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (added) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (added) adding keybind menu files Wed, 02 Dec 2009 21:13:13 GMT dafrick [6217] * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified) * code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified) Improved GUI. (Especially IngameMenu) Wed, 02 Dec 2009 20:59:27 GMT scheusso [6215] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) fix in GUI system Wed, 02 Dec 2009 19:41:44 GMT scheusso [6214] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/libraries/core/Game.h (modified) * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) a small fix in IOConsole some changes in GUI-system and preparation ... Wed, 02 Dec 2009 16:52:23 GMT cmueri [6209] * code/branches/presentation2/data/gui/layouts/NewAudioMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewControlsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewCreditsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewGameplayMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewGraphicsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewMainMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewMouseControlsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewMultiplayerMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewSettingsMenu.layout (deleted) * code/branches/presentation2/data/gui/layouts/NewSingleplayerMenu.layout (deleted) * code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewControlsMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewCreditsMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewGameplayMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewGraphicsMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewMainMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewMouseControlsMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewSettingsMenu.lua (deleted) * code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (deleted) Unused menu files have been deleted. Wed, 02 Dec 2009 16:25:42 GMT cmueri [6206] * code/branches/presentation2/data/gui/layouts/AudioMenu.layout (added) * code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (added) * code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (added) * code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (added) * code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (added) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (added) * code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/CreditsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (added) * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (added) * code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/SettingsMenu.lua (added) * code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (added) The new menus (but not all functions of the menu) are now available. Wed, 02 Dec 2009 14:12:29 GMT scheusso [6199] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified) hide controller overlay when in gui mode Mon, 30 Nov 2009 22:50:17 GMT dafrick [6186] * code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified) Some cleanup in SoundManager and related classes. Overrall volume ... Sun, 29 Nov 2009 12:36:12 GMT dafrick [6176] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (modified) Made NewMultiplayerMenu and NewSingleplayerMenu work. Also added ... Wed, 25 Nov 2009 17:04:10 GMT scheusso [6153] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) some fixes in weapon system / weapons fabian: projectiles also spawn ... Wed, 25 Nov 2009 15:52:37 GMT scheusso [6150] * code/branches/presentation2 (modified) * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (copied) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MainMenuBackground.layout (copied) * code/branches/presentation2/data/gui/layouts/NewAudioMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewControlsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewCreditsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewGameplayMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewGraphicsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMainMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMouseControlsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMultiplayerMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewSettingsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewSingleplayerMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/QuestGUI.layout (modified) * code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (copied) * code/branches/presentation2/data/gui/scripts/GUITools.lua (copied) * code/branches/presentation2/data/gui/scripts/InGameMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewControlsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewCreditsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewGameplayMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewGraphicsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMainMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMouseControlsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewSettingsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (copied) * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/GUIManager.h (modified) * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/libraries/core/Game.h (modified) * code/branches/presentation2/src/libraries/core/GameState.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) merged menu branch to presentation2 branch with some additional fixes ... Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106] * code/branches/presentation2 (copied) Created merger branch for the HS09 presentation. Wed, 14 Oct 2009 12:41:28 GMT cmueri [5951] * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) some adjustments in order to be able to use the CELayoutEditor