# # ChangeLog for code/branches/presentation2 # # Generated by Trac 1.0.9 # Nov 25, 2024, 6:19:38 PM Wed, 09 Dec 2009 19:39:42 GMT decapitb [6300] * code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi (added) weaponsettings for HXY Wed, 09 Dec 2009 19:15:34 GMT decapitb [6299] * code/branches/presentation2/data/levels/templates/spaceship_HXY.oxt (added) added basic weapon and control to HXY Wed, 09 Dec 2009 18:31:33 GMT scheusso [6298] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) hackfix with config values/sound device Wed, 09 Dec 2009 15:54:20 GMT wirthmi [6295] * code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation2/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) Changed a function call when hit from damage() to hit(). Pass through ... Wed, 09 Dec 2009 15:32:41 GMT rgrieder [6293] * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc (modified) Fixed HUDNavigation: Aim position is not available anymore ... 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 14:55:50 GMT decapitb [6291] * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) -d Wed, 09 Dec 2009 14:10:23 GMT decapitb [6290] * code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified) fixed a bug Wed, 09 Dec 2009 13:43:47 GMT wirthmi [6289] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) Fixed bug: overlays hide when ingame menu is brought up Wed, 09 Dec 2009 13:33:23 GMT decapitb [6287] * code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi (modified) ghost has second weapon Wed, 09 Dec 2009 13:32:58 GMT decapitb [6286] * code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified) ghost has backlights Wed, 09 Dec 2009 13:31:54 GMT youngk [6285] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Launching sound of the Rocket plays normally now. Changed ... 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 12:39:39 GMT decapitb [6282] * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) removed some useless lines 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 ... Wed, 09 Dec 2009 10:06:48 GMT rgrieder [6280] * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) Changes did not work at all in Release mode (strange). Wed, 09 Dec 2009 09:43:17 GMT scheusso [6279] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) overlay fix in NHC Wed, 09 Dec 2009 08:34:47 GMT rgrieder [6278] * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/presentation2/src/orxonox/MoodManager.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Use base class method for getInstance (for tolua interface). Wed, 09 Dec 2009 08:23:28 GMT rgrieder [6277] * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/presentation2/src/libraries/util/OutputHandler.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified) Small changes, optimisations and typos. Tue, 08 Dec 2009 23:21:40 GMT youngk [6276] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) Adjusted two calls for differently named sound files. Tue, 08 Dec 2009 10:48:52 GMT scheusso [6273] * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/orxonox/Radar.cc (modified) radar working again (also focus incl. cycleNavigationFocus) Tue, 08 Dec 2009 09:51:08 GMT scheusso [6272] * code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc (modified) radar works again now Tue, 08 Dec 2009 09:15:04 GMT rgrieder [6271] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) - alProcessContext isn't necessary after all: the operation is even ... Tue, 08 Dec 2009 09:09:39 GMT rgrieder [6270] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Switched from ResourceInfo to std::string for the buffer ... Tue, 08 Dec 2009 09:07:04 GMT rgrieder [6269] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) At last, found the sound bug: A long time ago somebody wrote ... 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 ... Mon, 07 Dec 2009 13:23:46 GMT scheusso [6265] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) fixed weapon sound source problem 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 20:47:42 GMT rgrieder [6261] * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/GameMode.h (modified) Tolua interface for GameMode that has functions like playsSound, ... Sun, 06 Dec 2009 20:46:04 GMT rgrieder [6260] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) Audio sources seem to be very limited resources. If we create more ... 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 ... Sun, 06 Dec 2009 17:15:28 GMT decapitb [6257] * code/branches/presentation2/data/levels/presentationHS09b.oxw (added) * code/branches/presentation2/data/particle/Steam.particle (modified) new level presentationHS09b with asteroid field fog and most ... Sun, 06 Dec 2009 16:07:22 GMT rgrieder [6256] * code/branches/presentation2/src/orxonox/LevelManager.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Removed debug output. Sun, 06 Dec 2009 16:02:56 GMT rgrieder [6255] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) Temporarily resolved problem of sounds only playing once. Sun, 06 Dec 2009 16:02:11 GMT rgrieder [6254] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.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) Added sound effects pooling. This should avoid long respawns (due to ... Sun, 06 Dec 2009 14:21:13 GMT decapitb [6252] * code/branches/presentation2/data/levels/presentationHS09.oxw (added) * code/branches/presentation2/data/particle/Steam.particle (added) Fog and asteroid Tests in Level presentationHS09 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. Sat, 05 Dec 2009 13:23:21 GMT rgrieder [6250] * code/branches/presentation2/src/libraries/util/OutputHandler.cc (modified) Fixed a pseudo memory leak. Fri, 04 Dec 2009 18:10:30 GMT youngk [6248] * code/branches/presentation2/data/levels/sound.oxw (modified) Adjusted Sound level to play with Cross-Fading Fri, 04 Dec 2009 17:05:39 GMT youngk [6247] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) Implemented exhaust sound for rocket. Explosion sounds of any sort ... Fri, 04 Dec 2009 14:52:28 GMT youngk [6245] * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) Implemented Firing sounds in Weapons HsW01, LightningGun and ... Fri, 04 Dec 2009 14:26:08 GMT rgrieder [6244] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Enhanced startup and shutdown sequence of the SoundManager in respect ... Fri, 04 Dec 2009 14:12:10 GMT rgrieder [6243] * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/presentation2/src/libraries/core/Core.cc (modified) * code/branches/presentation2/src/libraries/core/Shell.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/presentation2/src/orxonox/infos/Bot.cc (modified) Modified config value macros so you can use them as one-liner. And ... Fri, 04 Dec 2009 12:54:00 GMT youngk [6241] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Changed COUT level from three to four, because showing volume change ... 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 21:23:32 GMT rgrieder [6237] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Removed (commented) everything related to ALC (OpenAL library part). ... Thu, 03 Dec 2009 20:36:22 GMT scheusso [6236] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) showing and hiding of overlays should now work correct with ... 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:22:49 GMT rgrieder [6234] * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Fixed the sound bug where it didn't play when setting the source too ... 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 18:48:42 GMT rgrieder [6232] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Fixed two problems in the sound system: Buffers did not get removed ... Thu, 03 Dec 2009 18:33:14 GMT dafrick [6231] * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) Removed a warning in BaseSound. Thu, 03 Dec 2009 17:10:03 GMT cdaniel [6230] * code/branches/presentation2/data/particle/rocketfire.particle (modified) modified rocketfire.particle Thu, 03 Dec 2009 16:45:08 GMT cdaniel [6228] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) Camera position is now closer to the Rocket (which is now a bit ... Thu, 03 Dec 2009 16:14:49 GMT youngk [6227] * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h (modified) Inserted a firing sound into HsW01. BUG: Sound plays only once on ... Thu, 03 Dec 2009 15:31:06 GMT youngk [6226] * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) At least managed to fix the "not-playing-sound-on-first-load" bug: ... 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 Thu, 03 Dec 2009 10:23:06 GMT scheusso [6223] * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) fixed some uninitialised variables Wed, 02 Dec 2009 23:27:20 GMT youngk [6222] * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Cleaned up the code a little Wed, 02 Dec 2009 22:29:35 GMT rgrieder [6219] * code/branches/presentation2/src/libraries/core/ConfigValueContainer.h (modified) Don't really know, but the last revision could in same cases lead to ... Wed, 02 Dec 2009 21:20:37 GMT rgrieder [6218] * code/branches/presentation2/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/presentation2/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentation2/src/libraries/tools/Shader.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation2/src/orxonox/overlays/Map.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) Fixed at least 8 unitialised value problems though not all of them ... 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 21:08:08 GMT scheusso [6216] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) fixed a bug in NewHumanControlled which caused the controller to show ... 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 19:00:19 GMT rgrieder [6213] * code/branches/presentation2/src/libraries/tools/ParticleInterface.cc (modified) Fixed particle system bug: effects were not shown because the level ... Wed, 02 Dec 2009 18:24:59 GMT scheusso [6212] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) changed arrows because michi didn't upload the arrow pictures Wed, 02 Dec 2009 17:46:20 GMT wirthmi [6210] * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) Buggy version! 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:43:53 GMT dafrick [6208] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Small error in SoundManager. Compiles now. Wed, 02 Dec 2009 16:40:13 GMT youngk [6207] * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified) Speed dependent pitching of the sounds works now for engine states: ... 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 16:12:06 GMT youngk [6205] * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Resolved Conflicts, edited a few COUTs and commented out a semi- ... Wed, 02 Dec 2009 16:06:57 GMT rgrieder [6204] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) Better error handling for sound. Wed, 02 Dec 2009 15:57:24 GMT rgrieder [6203] * code/branches/presentation2/src/libraries/core/Resource.h (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/BaseSound.h (modified) * code/branches/presentation2/src/orxonox/sound/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (added) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.h (added) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Added buffer buffering: Sounds are only loaded into one buffer and ... Wed, 02 Dec 2009 15:52:42 GMT youngk [6202] * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) Implemented speed dependent audio pitch. BUG: pitching doesn't ... Wed, 02 Dec 2009 15:39:26 GMT cdaniel [6201] * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) default Key for launching the Rocket is now "T". 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 Wed, 02 Dec 2009 13:58:20 GMT dafrick [6197] * code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Small adjustments, better code re-use, added getConfig() function to ... Wed, 02 Dec 2009 13:42:56 GMT landauf [6196] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) fixed some warnings in IOConsole Wed, 02 Dec 2009 13:40:22 GMT wirthmi [6195] * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.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/controllers/NewHumanController.h (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) More camera easing, new center overlay and pauseControl/resumeControl Wed, 02 Dec 2009 12:34:55 GMT dafrick [6194] * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Some adjustments regarding tolua export and sound menu. Wed, 02 Dec 2009 12:09:14 GMT scheusso [6193] * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) forgot to readd Wed, 02 Dec 2009 10:35:24 GMT scheusso [6192] * code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.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/SynchronisableSpecialisations.cc (deleted) * code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/presentation2/src/libraries/util/Serialise.h (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) some cleaning up and improvements in synchronisation of vector2,3,4 ... Wed, 02 Dec 2009 08:06:19 GMT rgrieder [6191] * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) Moved sound listener to the active camera and fixed the ambient ... Wed, 02 Dec 2009 08:02:49 GMT rgrieder [6190] * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.cc (modified) * code/branches/presentation2/src/libraries/core/Shell.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Small style changes (no code changes). Tue, 01 Dec 2009 19:09:52 GMT rgrieder [6189] * code/branches/presentation2/src/orxonox/worldentities/EffectContainer.cc (modified) Didn't see that the compiler threw some errors after all. Fixed. Tue, 01 Dec 2009 17:49:48 GMT rgrieder [6188] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) Fixed a bug in BaseSound that caused every sound to play immediately ... Tue, 01 Dec 2009 17:48:51 GMT rgrieder [6187] * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/presentation2/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/worldentities/EffectContainer.cc (added) * code/branches/presentation2/src/orxonox/worldentities/EffectContainer.h (added) Added better engine effects: you can still add any WorldEntity to the ... 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 ... Mon, 30 Nov 2009 22:32:53 GMT rgrieder [6185] * code/branches/presentation2/src/libraries/core/ConsoleCommandCompilation.cc (modified) * code/branches/presentation2/src/libraries/util/ExprParser.cc (modified) * code/branches/presentation2/src/libraries/util/ExprParser.h (modified) Extended ExprParser to support arbitrary variables. You can set them ... Mon, 30 Nov 2009 19:50:44 GMT dafrick [6184] * code/branches/presentation2/src/orxonox/CMakeLists.txt (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) Created capability in SoundManager to set an overall volume, and to ... Mon, 30 Nov 2009 10:07:06 GMT rgrieder [6183] * code/branches/presentation2/src/libraries/core/Core.cc (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/GraphicsManager.cc (modified) * code/branches/presentation2/src/libraries/core/GraphicsManager.h (modified) * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) * code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h (modified) * code/branches/presentation2/src/libraries/core/TclThreadManager.cc (modified) * code/branches/presentation2/src/libraries/core/TclThreadManager.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/libraries/util/Singleton.h (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Added preUpdate and postUpdate methods for all classes inheriting ... Mon, 30 Nov 2009 09:44:06 GMT rgrieder [6182] * code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation2/src/orxonox/CameraManager.cc (modified) * code/branches/presentation2/src/orxonox/LevelManager.cc (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/PlayerManager.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Singleton pointer initialisation should be part of the ... Sun, 29 Nov 2009 21:48:25 GMT rgrieder [6181] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) Fixed Linux IOConsole Sun, 29 Nov 2009 21:43:43 GMT rgrieder [6180] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) * code/branches/presentation2/src/libraries/core/Shell.cc (modified) * code/branches/presentation2/src/libraries/core/Shell.h (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.h (modified) Extended Shell line colouring in order to distinguish output from ...