# # ChangeLog for code/branches/presentation2/src # # Generated by Trac 1.0.9 # Nov 25, 2024, 1:57:01 AM 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: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 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: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: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 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 ... Sun, 29 Nov 2009 20:27:22 GMT rgrieder [6179] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) Fixed Linux build and removed a warning Sun, 29 Nov 2009 20:25:11 GMT rgrieder [6178] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) IOConsole: Restructured some code and added more documentation. Sun, 29 Nov 2009 13:47:54 GMT rgrieder [6177] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) * code/branches/presentation2/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/presentation2/src/libraries/core/input/InputBuffer.h (modified) Performance and robustness improvements for the IOConsole under ... Sat, 28 Nov 2009 22:28:51 GMT rgrieder [6175] * code/branches/presentation2/src/libraries/core/Game.cc (modified) And I thought I really though this one through... The frame rate was ... Sat, 28 Nov 2009 17:06:57 GMT rgrieder [6174] * code/branches/presentation2/src/libraries/core/Game.cc (modified) Moved fps hack to the right position. I still have no idea why the ... Fri, 27 Nov 2009 12:11:53 GMT wirthmi [6173] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) Working permanent acceleration. Fri, 27 Nov 2009 11:42:38 GMT scheusso [6172] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) actually i think it's nicer this way ;) Fri, 27 Nov 2009 11:30:29 GMT scheusso [6171] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) fixed problem with ioconsole not restoring terminal settings when a ... Thu, 26 Nov 2009 22:29:20 GMT rgrieder [6170] * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.h (modified) Reduced camera lag induced by occasional high delta times. Thu, 26 Nov 2009 22:27:37 GMT rgrieder [6169] * code/branches/presentation2/src/libraries/core/Core.cc (modified) * code/branches/presentation2/src/libraries/core/Game.cc (modified) Fixed config value not setting problem in Core and Game. Thu, 26 Nov 2009 18:41:49 GMT landauf [6167] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) - you don't have to set the syncMode of the CameraPosition to 0x0, ... Thu, 26 Nov 2009 17:49:35 GMT rgrieder [6166] * code/branches/presentation2/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified) Fixed auto completion: - When completing for instance "KeyBin", it ... Thu, 26 Nov 2009 17:06:26 GMT landauf [6165] * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) "Fixed" 'Can't assign NULL identifier' error message and replaced it ... Thu, 26 Nov 2009 16:31:16 GMT landauf [6164] * code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified) bots now also hit their target Thu, 26 Nov 2009 15:36:32 GMT landauf [6162] * code/branches/presentation2/src/libraries/tools/CMakeLists.txt (modified) fixed build, we have to link network into tools since r6160 (maybe ... Thu, 26 Nov 2009 13:15:28 GMT rgrieder [6161] * code/branches/presentation2/src/libraries/core/Game.cc (modified) Fixed uninitialised value problem with the statistics (at least for ... Thu, 26 Nov 2009 13:11:48 GMT scheusso [6160] * code/branches/presentation2/src/libraries/network/NetworkFunction.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.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/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSRoot.h (modified) server may now pause/slow the game (also on clients) with commands ... Thu, 26 Nov 2009 13:09:40 GMT rgrieder [6159] * code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified) Fixed bug in HumanController introduced with the virtual functions. Thu, 26 Nov 2009 09:04:59 GMT rgrieder [6158] * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.h (modified) Fixed mouse look in slow motion. Thu, 26 Nov 2009 08:58:16 GMT scheusso [6157] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) fix in NewHumanController which caused the spaceship to shoot always ... Wed, 25 Nov 2009 21:59:42 GMT scheusso [6156] * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/GUIManager.h (modified) cleanup in GUIManager most functionality now in lua Wed, 25 Nov 2009 19:02:22 GMT rgrieder [6155] * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) Fixed mouse position problem: Internal value could still be larger ... Wed, 25 Nov 2009 18:51:42 GMT dafrick [6154] * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) Didn't compile because Pawn.h wasn't included in LightningGun.cc, ... 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 16:26:19 GMT dafrick [6152] * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) Apparently you can introduce a segfault just by setting some default ... Wed, 25 Nov 2009 16:09:46 GMT dafrick [6151] * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) Added default values in WeaponMode. 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 ... Wed, 25 Nov 2009 15:20:05 GMT wirthmi [6149] * code/branches/presentation2/data/defaultConfig/keybindings.ini (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) Introduced new feature: permanent speed Wed, 25 Nov 2009 12:52:15 GMT wirthmi [6144] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) New input mode Wed, 25 Nov 2009 12:42:38 GMT wirthmi [6143] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) updateTarget() fixed Wed, 25 Nov 2009 06:26:10 GMT rgrieder [6141] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) Better colour scheme for the IOConsole on Windows. Tue, 24 Nov 2009 23:09:02 GMT rgrieder [6140] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.h (modified) Extended IOConsole to a Windows implementation. It doesn't yet work ... Tue, 24 Nov 2009 23:06:15 GMT rgrieder [6139] * code/branches/presentation2/src/libraries/core/Shell.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) Fixed a bug in Shell and changed parental order in InGameConsole. Tue, 24 Nov 2009 02:16:12 GMT landauf [6138] * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) removed superfluous "it" from two for loops which caused two warnings Tue, 24 Nov 2009 02:11:31 GMT landauf [6137] * code/branches/presentation2/src/libraries/util/Math.cc (modified) * code/branches/presentation2/src/libraries/util/Math.h (modified) Ogre introduced overloadings of the << operator for Radian and Degree ... Tue, 24 Nov 2009 01:35:24 GMT landauf [6136] * code/branches/presentation2/src/orxonox/graphics/BlinkingBillboard.cc (modified) BlinkingBillboard now blinks properly also with ogre 1.6 (which ... Tue, 24 Nov 2009 01:17:38 GMT landauf [6135] * code/branches/presentation2/src/libraries/util/DisplayStringConversions.h (moved) * code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) replaced UTFStringConversions.h by DisplayStringConversions.h which ... Tue, 24 Nov 2009 00:06:50 GMT scheusso [6134] * code/branches/presentation2/src/libraries/network/Client.cc (modified) can't imagine why i never encountered any problems with that ^^ Mon, 23 Nov 2009 22:29:01 GMT rgrieder [6133] * code/branches/presentation2/src/libraries/util/Debug.h (modified) Removed annoying "statement has no effect" warning (gcc). Mon, 23 Nov 2009 21:31:12 GMT scheusso [6132] * code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) reverted r6130 Mon, 23 Nov 2009 21:25:07 GMT scheusso [6131] * code/branches/presentation2/src/libraries/network/synchronisable/Serialise.h (added) forgot a file Mon, 23 Nov 2009 21:20:01 GMT landauf [6130] * code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) fixed build Mon, 23 Nov 2009 20:49:40 GMT rgrieder [6129] * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) Hopefully fixed in game console text visibility issue (again). Mon, 23 Nov 2009 20:31:37 GMT rgrieder [6128] * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) Hopefully fixed in game console text visibility issue. Mon, 23 Nov 2009 20:25:34 GMT rgrieder [6127] * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Fixed sound problem (annoying cracking) and increased buffers for ... Mon, 23 Nov 2009 19:21:08 GMT scheusso [6124] * code/branches/presentation2/src/libraries/network/synchronisable/CMakeLists.txt (modified) forgot to revert that change Mon, 23 Nov 2009 19:19:58 GMT scheusso [6123] * code/branches/presentation2/src/libraries/network/synchronisable/CMakeLists.txt (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/util/Serialise.h (modified) * code/branches/presentation2/src/orxonox/Test.cc (modified) * code/branches/presentation2/src/orxonox/Test.h (modified) synchronisation of pointers to classes that inherit from ... Mon, 23 Nov 2009 19:10:03 GMT rgrieder [6122] * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) Fixed dedicated problem in NHC and a memory leak on windows in the ... Mon, 23 Nov 2009 17:19:58 GMT rgrieder [6121] * code/branches/presentation2/src/libraries/core/Core.cc (modified) * code/branches/presentation2/src/libraries/core/Core.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/Language.cc (modified) * code/branches/presentation2/src/libraries/core/Language.h (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.h (modified) Removed CoreConfiguration and GameConfiguration workaround. I have ... Sun, 22 Nov 2009 15:25:02 GMT rgrieder [6120] * code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/presentation2/cmake/SourceFileUtilities.cmake (modified) * code/branches/presentation2/data/overlays/stats.oxo (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) Found some tabs Sun, 22 Nov 2009 15:10:06 GMT rgrieder [6119] * code/branches/presentation2/bin/dedicatedClient.bat.in (modified) * code/branches/presentation2/bin/dedicatedClient.in (modified) * code/branches/presentation2/data/levels/events.oxw (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/particle/bigexplosion.particle (modified) * code/branches/presentation2/data/particle/explosion4.particle (modified) * code/branches/presentation2/data/particle/laser.particle (modified) * code/branches/presentation2/data/particle/load.particle (modified) * code/branches/presentation2/data/particle/particlecanon.particle (modified) * code/branches/presentation2/data/particle/rocketfire.particle (modified) * code/branches/presentation2/data/particle/smoke.particle (modified) * code/branches/presentation2/data/particle/tes3.particle (modified) * code/branches/presentation2/doc/api/main.dox (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/MoodManager.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) svn:eol-style "native" should be set for all text files. Sun, 22 Nov 2009 15:08:32 GMT rgrieder [6118] * code/branches/presentation2/src/orxonox/gamestates/GSDedicated.cc (deleted) * code/branches/presentation2/src/orxonox/gamestates/GSDedicatedClient.cc (deleted) Removed two files that the console branch merge didn't remove. Sun, 22 Nov 2009 15:01:16 GMT rgrieder [6117] * code/branches/presentation2 (modified) * code/branches/presentation2/data/levels/sound.oxw (copied) * code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/presentation2/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (copied) * code/branches/presentation2/src/orxonox/MoodManager.h (copied) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.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) Merged sound3 branch to presentation2. Sat, 21 Nov 2009 12:16:16 GMT scheusso [6116] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) this should prevent unneccessary network traffic Sat, 21 Nov 2009 11:11:25 GMT scheusso [6115] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) mouselook now also working when steering a rocket Sat, 21 Nov 2009 00:29:48 GMT scheusso [6114] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) NHC goes now through all parents of raytraced objects in order to ... Sat, 21 Nov 2009 00:16:35 GMT scheusso [6113] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) NHC creator hack is now not so hacky anymore ;) Fri, 20 Nov 2009 23:57:06 GMT scheusso [6112] * code/branches/presentation2/src/orxonox/controllers/NewHumanController.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/pawns/Pawn.cc (modified) first attempts to have synchronised fire direction and target ... Fri, 20 Nov 2009 23:33:37 GMT scheusso [6111] * code/branches/presentation2 (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/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) made some changes in NewHumanController, Pawn, CE, Controller and ... Fri, 20 Nov 2009 19:15:25 GMT scheusso [6108] * code/branches/presentation2 (modified) * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.cc (modified) * 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 (copied) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (copied) * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (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/WorldEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/WorldEntity.h (modified) merged steering branch to presentation2 branch Fri, 20 Nov 2009 16:20:11 GMT rgrieder [6107] * code/branches/presentation2 (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/presentation2/data/particle/explosion4.particle (copied) * code/branches/presentation2/data/particle/laser.particle (copied) * code/branches/presentation2/data/particle/load.particle (copied) * code/branches/presentation2/data/particle/particlecanon.particle (copied) * code/branches/presentation2/data/particle/rocketfire.particle (copied) * code/branches/presentation2/data/particle/smoke.particle (copied) * code/branches/presentation2/data/particle/tes3.particle (copied) * code/branches/presentation2/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (copied) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (copied) * code/branches/presentation2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (copied) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (copied) * code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2/src/orxonox/Scene.cc (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.h (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/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged particles2 branch to presentation2. Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106] * code/branches/presentation2 (copied) Created merger branch for the HS09 presentation. Fri, 20 Nov 2009 15:55:40 GMT rgrieder [6105] * code/trunk (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/IOConsole.cc (copied) * code/trunk/src/libraries/core/IOConsole.h (copied) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/Shell.cc (modified) * code/trunk/src/libraries/core/Shell.h (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/OrxAssert.h (modified) * code/trunk/src/libraries/util/OutputBuffer.cc (deleted) * code/trunk/src/libraries/util/OutputBuffer.h (deleted) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/OutputHandler.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.h (deleted) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.h (deleted) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (deleted) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (deleted) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) Merged console branch back to trunk.