# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 10, 2024, 9:34:25 AM 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:44:51 GMT rgrieder [6104] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Smoother IOConsole exit function Fri, 20 Nov 2009 15:05:32 GMT rgrieder [6103] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Cleanup in IOConsole Fri, 20 Nov 2009 10:11:32 GMT rgrieder [6102] * code/branches/sound3/data/levels/sound.oxw (modified) * code/branches/sound3/src/libraries/core/XMLPort.h (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.cc (modified) Changed "source" parameter of AmbientSound to "ambientSource" to ... Fri, 20 Nov 2009 00:02:09 GMT scheusso [6101] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/particles2/src/orxonox/controllers/AIController.cc (modified) * code/branches/particles2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/particles2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/particles2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Spectator.h (modified) rocket now steerable also on client AIController shoots again now ;) ... Thu, 19 Nov 2009 20:01:16 GMT rgrieder [6100] * code/branches/sound3/data/levels/sound.oxw (modified) * code/branches/sound3/data/levels/templates/spaceship_assff.oxt (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.cc (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.h (modified) Added a sound for the engine (forward active mode) by overloading ... Wed, 18 Nov 2009 16:23:33 GMT cdaniel [6099] * code/branches/particles2/data/particle/explosion4.particle (added) New Explosion (explosion4.particle) for the Rocket. Wed, 18 Nov 2009 16:19:28 GMT cdaniel [6098] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) Fixed Rocket.cc (starts now in correct direction when played with ... Wed, 18 Nov 2009 16:13:26 GMT youngk [6097] * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc (modified) Changed default menu sound to mainmenu.ogg Wed, 18 Nov 2009 15:47:37 GMT youngk [6093] * code/branches/sound3/data/levels/sound.oxw (modified) Patched sound.oxw to adapt to new sounds. Wed, 18 Nov 2009 15:39:56 GMT wirthmi [6091] * code/branches/steering/data/defaultConfig/keybindings.ini (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) The weapon is firing where the mouse is pointing. Uncoupling of the ... Wed, 18 Nov 2009 14:26:22 GMT rgrieder [6089] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Fixed IOConsole on tardis (some ANSI escape sequences were not working) Wed, 18 Nov 2009 13:18:47 GMT youngk [6088] * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) More or less nicely working sound module. Cross-Fading works well ... Wed, 18 Nov 2009 12:34:14 GMT scheusso [6087] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/particles2/src/orxonox/Scene.cc (modified) * code/branches/particles2/src/orxonox/controllers/AIController.cc (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.h (modified) changes in PlayerInfo and Rocket (and scene) not yet working in ... Wed, 18 Nov 2009 12:32:42 GMT cdaniel [6086] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) Tue, 17 Nov 2009 21:57:44 GMT scheusso [6082] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/particles2/src/orxonox/infos/PlayerInfo.h (modified) some fixes in Rocket there are two new function ins PlayerInfo: ... Tue, 17 Nov 2009 10:58:38 GMT scheusso [6081] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) more improvements Tue, 17 Nov 2009 10:54:32 GMT scheusso [6080] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) some improvements in steering, but not yet good Tue, 17 Nov 2009 09:59:25 GMT scheusso [6079] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (modified) trying to make CE change possible Tue, 17 Nov 2009 00:36:21 GMT landauf [6078] * code/branches/particles2/src/orxonox/controllers/Controller.h (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.h (modified) delete weaponpacks which were defined in xml but don't fit onto the ... Mon, 16 Nov 2009 16:58:34 GMT scheusso [6076] * code/branches/particles2/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/particles2/src/orxonox/weaponsystem/WeaponSystem.h (modified) some fixes in the weaponsystem and weaponsettings3.oxi Mon, 16 Nov 2009 09:37:01 GMT rgrieder [6074] * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) Don't say a word.. Sun, 15 Nov 2009 21:40:53 GMT rgrieder [6072] * code/branches/sound3/src/orxonox/MoodManager.cc (modified) * code/branches/sound3/src/orxonox/MoodManager.h (modified) * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h (modified) Removed some tabs. Sun, 15 Nov 2009 21:36:45 GMT rgrieder [6071] * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.cc (modified) Improved synchronisability of the sound classes (not yet ... Sun, 15 Nov 2009 14:53:12 GMT rgrieder [6070] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) OpenAL sources should be linked to the lifetime of a BaseSound. Sun, 15 Nov 2009 14:43:06 GMT rgrieder [6069] * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.cc (modified) * code/branches/sound3/src/orxonox/sound/WorldSound.h (modified) Detail changes in the sound classes. Plus fixed the level sound ... Sun, 15 Nov 2009 12:47:05 GMT rgrieder [6068] * code/branches/particles2/data/tcl/plane.mesh_lod0_prepshadow.log (deleted) Deleted ogre log file. Sun, 15 Nov 2009 12:44:25 GMT rgrieder [6067] * code/branches/particles2 (modified) * code/branches/particles2/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/particles2/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/particles2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/branches/particles2/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/branches/particles2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/particles2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/particles2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/particles2/src/orxonox/overlays/OverlayGroup.h (modified) Merged revisions 6054, 6056 and 6057 to particles2 branch. Sun, 15 Nov 2009 12:37:45 GMT rgrieder [6066] * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h (modified) Fixed msvc build: file migration problem. Sun, 15 Nov 2009 12:15:42 GMT scheusso [6065] * code/branches/particles2/data/levels/empty_level.oxw (modified) * code/branches/particles2/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/particles2/data/particle/Ogre.log (deleted) * code/branches/particles2/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (moved) * code/branches/particles2/src/modules/weapons/projectiles/Rocket.h (moved) * code/branches/particles2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc (copied) * code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h (copied) * code/branches/particles2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/particles2/src/orxonox/controllers/RocketController.cc (deleted) * code/branches/particles2/src/orxonox/controllers/RocketController.h (deleted) * code/branches/particles2/src/orxonox/worldentities/CMakeLists.txt (modified) cleaned up Rocket mess a bit there is yet a bug if RocketFire is in ... Sat, 14 Nov 2009 22:18:49 GMT scheusso [6063] * code/branches/mainmenu (deleted) removed obsolete mainmenu branch Sat, 14 Nov 2009 22:14:40 GMT scheusso [6062] * code/branches/core5 (deleted) removing old core5 branch Sat, 14 Nov 2009 21:37:21 GMT landauf [6060] * code/branches/consolecommands (copied) created new branch to work on the console commands Fri, 13 Nov 2009 13:32:27 GMT cdaniel [6059] * code/branches/particles2/data/levels/empty_level.oxw (modified) * code/branches/particles2/data/particle/Ogre.log (added) * code/branches/particles2/data/particle/laser.particle (added) * code/branches/particles2/data/particle/load.particle (added) * code/branches/particles2/data/particle/particlecanon.particle (added) * code/branches/particles2/data/particle/rocketfire.particle (added) * code/branches/particles2/data/particle/smoke.particle (added) * code/branches/particles2/data/particle/tes3.particle (added) * code/branches/particles2/data/tcl/plane.mesh_lod0_prepshadow.log (added) * code/branches/particles2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/particles2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/particles2/src/orxonox/controllers/RocketController.cc (added) * code/branches/particles2/src/orxonox/controllers/RocketController.h (added) * code/branches/particles2/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/particles2/src/orxonox/worldentities/Rocket.cc (added) * code/branches/particles2/src/orxonox/worldentities/Rocket.h (added) Fri, 13 Nov 2009 11:06:22 GMT rgrieder [6058] * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/graphics/Camera.h (modified) * code/branches/steering/src/orxonox/weaponsystem/WeaponMode.cc (modified) Found the firing direction bug: "Fixed goes first" we were told a few ... Fri, 13 Nov 2009 10:21:40 GMT rgrieder [6055] * code/branches/steering/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/steering/src/orxonox/controllers/Controller.cc (modified) * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/steering/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/steering/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/steering/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/steering/src/orxonox/worldentities/WorldEntity.cc (modified) Resolved projectile targeting problem by introducing a ClassTreeMask. ... Fri, 13 Nov 2009 09:30:18 GMT scheusso [6053] * code/branches/menuanimations (copied) creating new menuanimations branch for beni to work on animated menus Thu, 12 Nov 2009 19:00:42 GMT rgrieder [6052] * code/branches/steering/src/orxonox/graphics/Camera.cc (modified) * code/branches/steering/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/steering/src/orxonox/worldentities/WorldEntity.h (modified) Making use of Ogre::UserDefinedObject by subclassing it in ... Thu, 12 Nov 2009 18:41:20 GMT rgrieder [6051] * code/branches/menu/src/libraries/core/GUIManager.cc (modified) * code/branches/menu/src/libraries/core/LuaState.cc (modified) * code/branches/menu/src/libraries/core/LuaState.h (modified) Fix for the resource group problem in the GUIManager. This should fix ... Thu, 12 Nov 2009 11:48:26 GMT scheusso [6050] * code/branches/particles2 (copied) creating new particles2 branch for rocket steering and other stuff Thu, 12 Nov 2009 10:33:58 GMT scheusso [6049] * code/branches/menu/data/defaultConfig/keybindings.ini (modified) some mistake delete your keybindings.ini in order to take advantage ... Thu, 12 Nov 2009 10:32:41 GMT scheusso [6048] * code/branches/menu/data/defaultConfig/keybindings.ini (modified) * code/branches/menu/data/gui/scripts/InGameMenu.lua (modified) * code/branches/menu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/menu/src/libraries/core/GUIManager.cc (modified) * code/branches/menu/src/libraries/core/GUIManager.h (modified) * code/branches/menu/src/libraries/core/Game.cc (modified) * code/branches/menu/src/libraries/core/Game.h (modified) * code/branches/menu/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/menu/src/orxonox/gamestates/GSLevel.h (modified) ESC handling in ingame menu: if theres already an opened GUI sheet ... Thu, 12 Nov 2009 10:23:33 GMT rgrieder [6047] * code/branches/menu/src/libraries/core/Game.cc (modified) * code/branches/menu/src/libraries/core/GameState.cc (modified) Forgot to set the internal activity properties of the GameStates. Wed, 11 Nov 2009 16:55:26 GMT youngk [6046] * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) Made a big change to the sound system: Implemented cross-fading for ... Wed, 11 Nov 2009 16:39:53 GMT wirthmi [6045] * code/branches/steering/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/steering/src/orxonox/controllers/Controller.cc (modified) * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/steering/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/steering/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/steering/src/orxonox/worldentities/ControllableEntity.h (modified) First implementation of direction shooting. Wed, 11 Nov 2009 11:33:54 GMT rgrieder [6044] * code/branches/console/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/console/src/libraries/core/ConfigFileManager.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) Small fixes in IOConsole, ConfigFileManager and msvc compile flags. Mon, 09 Nov 2009 14:52:26 GMT rgrieder [6043] * code/branches/console/src/orxonox/Main.cc (modified) * code/branches/console/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/console/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/console/src/orxonox/gamestates/GSDedicated.cc (deleted) * code/branches/console/src/orxonox/gamestates/GSDedicated.h (deleted) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.cc (deleted) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.h (deleted) * code/branches/console/src/orxonox/gamestates/GSIOConsole.cc (deleted) * code/branches/console/src/orxonox/gamestates/GSIOConsole.h (deleted) * code/branches/console/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/console/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/console/src/orxonox/gamestates/GSServer.cc (modified) Removed GameStates IOConsole, Dedicated and DedicatedClient because ... Thu, 05 Nov 2009 22:18:05 GMT rgrieder [6041] * code/branches/console/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) Fixed config value naming problem with the soft debug levels. Thu, 05 Nov 2009 12:31:31 GMT rgrieder [6037] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Redirected std::cout to a stringstream object in the IOConsole. --> ... Thu, 05 Nov 2009 08:46:27 GMT scheusso [6036] * code/branches/menu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/menu/src/libraries/core/GUIManager.cc (modified) some changes to make GUI showing/hiding with possible coverage of ... Thu, 05 Nov 2009 07:16:13 GMT rgrieder [6034] * code/branches/console/src/libraries/core/ScopedSingletonManager.cc (modified) * code/branches/console/src/libraries/core/ScopedSingletonManager.h (modified) Fixed program termination segfault Wed, 04 Nov 2009 16:47:31 GMT wirthmi [6033] * code/branches/steering/src/orxonox/controllers/HumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/HumanController.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/graphics/Camera.h (modified) Added the ability to raytrace on fire to find the object to user ... Wed, 04 Nov 2009 16:30:38 GMT scheusso [6032] * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/menu/src/libraries/core/GUIManager.cc (modified) * code/branches/menu/src/libraries/core/GUIManager.h (modified) * code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc (modified) partially working hiding Wed, 04 Nov 2009 15:03:03 GMT youngk [6031] * code/branches/sound3/data/levels/sound.oxw (modified) * code/branches/sound3/src/orxonox/MoodManager.cc (modified) * code/branches/sound3/src/orxonox/MoodManager.h (modified) * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) Implemented automatic ambient sound file path fetch according to ... Wed, 04 Nov 2009 13:15:24 GMT scheusso [6025] * code/branches/ingamemenu (deleted) deleting ingamemenu branch Wed, 04 Nov 2009 13:14:53 GMT scheusso [6024] * code/branches/menu (modified) * code/branches/menu/data/gui/layouts/InGameMenu.layout (copied) * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/layouts/QuestGUI.layout (modified) * code/branches/menu/data/gui/scripts/InGameMenu.lua (copied) * code/branches/menu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/src/libraries/core/CMakeLists.txt (modified) * code/branches/menu/src/libraries/core/GUIManager.cc (modified) * code/branches/menu/src/libraries/core/GUIManager.h (modified) * code/branches/menu/src/libraries/core/Game.h (modified) * code/branches/menu/src/libraries/core/LuaState.cc (modified) * code/branches/menu/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/menu/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/menu/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/menu/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/menu/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/menu/src/orxonox/pickup/PickupSpawner.cc (modified) merged ingamemenu branch to menu branch Wed, 04 Nov 2009 12:59:39 GMT scheusso [6023] * code/branches/ingamemenu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/libraries/core/LuaState.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) clean cursor handling in GUIManager/lua code change in output level ... Wed, 04 Nov 2009 11:51:05 GMT dafrick [6022] * code/branches/ingamemenu/data/gui/scripts/MainMenu.lua (modified) Adujusted MainMenu to properly work with the changed InitialiseGUI ... Tue, 03 Nov 2009 21:08:26 GMT scheusso [6020] * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) fixed an issue with the OS/CEGUI mouse pointer Tue, 03 Nov 2009 10:53:47 GMT scheusso [6019] * code/branches/ingamemenu/data/gui/layouts/InGameMenu.layout (modified) * code/branches/ingamemenu/data/gui/scripts/InGameMenu.lua (modified) * code/branches/ingamemenu/src/libraries/core/CMakeLists.txt (modified) * code/branches/ingamemenu/src/libraries/core/Game.h (modified) Added return to Game button to InGameMenu MainMenu button now ... Mon, 02 Nov 2009 22:46:58 GMT scheusso [6018] * code/branches/ingamemenu/data/gui/layouts/InGameMenu.layout (added) * code/branches/ingamemenu/data/gui/scripts/InGameMenu.lua (added) first version of the InGameMenu (return to main menu doesn't include ... Mon, 02 Nov 2009 22:42:16 GMT rgrieder [6017] * code/branches/console/src/libraries/core/Shell.cc (modified) Fix in Shell: No string in outputLines_ should contain '\n'. Mon, 02 Nov 2009 17:06:25 GMT rgrieder [6016] * code/branches/console/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/console/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.cc (modified) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.h (modified) Removed console from GSDedicated and GSDedicatedClient. Mon, 02 Nov 2009 16:54:13 GMT rgrieder [6015] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.h (modified) IOConsole cleanup and added ConsoleWriter to the OutputHandler so ... Mon, 02 Nov 2009 12:57:19 GMT rgrieder [6014] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) IOConsole: More line wrapping fixes Sun, 01 Nov 2009 14:57:56 GMT rgrieder [6013] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) IOConsole: Resolved flickering problem and moved status line below ... Sun, 01 Nov 2009 09:08:22 GMT scheusso [6012] * code/branches/console/src/libraries/core/IOConsole.cc (modified) small build fix Sat, 31 Oct 2009 22:28:16 GMT rgrieder [6011] * code/branches/console/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/console/src/libraries/core/ConsoleCommandCompilation.cc (modified) Fixed funny looking ini-files and an annoying cout. Sat, 31 Oct 2009 22:13:52 GMT rgrieder [6010] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) Sorted out some small stuff in the Shell and hopefully fixed ... Fri, 30 Oct 2009 22:25:26 GMT adrfried [6009] * code/branches/core5/src/libraries/util/SubString.cc (modified) fixed usage of size_t in printf Fri, 30 Oct 2009 22:14:33 GMT adrfried [6008] * code/branches/ggz2/src/orxonox/GGZClient.h (modified) include fixed Fri, 30 Oct 2009 16:26:28 GMT rgrieder [6007] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/PathConfig.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) Fixed IOConsole partly and fixed two problems in PathConfig and ... Fri, 30 Oct 2009 13:24:53 GMT scheusso [6006] * code/branches/console/src/libraries/core/IOConsole.cc (modified) that's probably more what you intended ... Fri, 30 Oct 2009 13:22:37 GMT scheusso [6005] * code/branches/console/src/libraries/core/IOConsole.cc (modified) gcc didn't like the old version ;) Fri, 30 Oct 2009 11:39:51 GMT rgrieder [6004] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.h (modified) De-singletonised Shell so that both consoles have their own Shell ... Wed, 28 Oct 2009 16:58:11 GMT dafrick [6003] * code/branches/ingamemenu/data/gui/layouts/MainMenu.layout (modified) * code/branches/ingamemenu/data/gui/layouts/QuestGUI.layout (modified) * code/branches/ingamemenu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/ingamemenu/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/ingamemenu/src/orxonox/pickup/PickupSpawner.cc (modified) Implemented support for multiple simultaniously showing GUIs. What ... Wed, 28 Oct 2009 13:38:10 GMT wirthmi [6001] * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/overlays/OrxonoxOverlay.h (modified) Added a crosshair overlay. Wed, 28 Oct 2009 10:18:20 GMT rgrieder [6000] * code/branches/console/src/libraries/util/OutputHandler.cc (modified) Resolved a bug causing the static initialisation of the OutputHandler ... Wed, 28 Oct 2009 10:06:14 GMT scheusso [5999] * code/branches/ingamemenu (copied) creating new ingamemenu branch Wed, 28 Oct 2009 10:03:30 GMT rgrieder [5998] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Build fixes for IOConsole (can't test that on Windows...) Wed, 28 Oct 2009 10:03:23 GMT scheusso [5997] * code/tags/tutorialHS09 (moved) moving recent tutorial branch to tags Wed, 28 Oct 2009 09:47:25 GMT rgrieder [5996] * code/branches/console/src/libraries/util/OutputHandler.h (modified) Changed order of declaration/definition in OutputHandler. Wed, 28 Oct 2009 09:44:26 GMT rgrieder [5995] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Committing some unstable changes to the IOConsole for testing purposes. Tue, 27 Oct 2009 13:47:14 GMT rgrieder [5994] * code/branches/console/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/GUIManager.cc (modified) * code/branches/console/src/libraries/core/GraphicsManager.cc (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/LuaState.cc (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/CMakeLists.txt (modified) * code/branches/console/src/libraries/util/Debug.h (modified) * code/branches/console/src/libraries/util/OrxAssert.h (modified) * code/branches/console/src/libraries/util/OutputBuffer.cc (deleted) * code/branches/console/src/libraries/util/OutputBuffer.h (deleted) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/libraries/util/UtilPrereqs.h (modified) Changed Output concept a little bit to allow for more general use. ... Mon, 26 Oct 2009 22:01:39 GMT scheusso [5993] * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/HumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/HumanController.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) Changed input of NewHumanController from InputListener to normal ... Mon, 26 Oct 2009 21:55:43 GMT rgrieder [5992] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/CorePrereqs.h (modified) * code/branches/console/src/libraries/core/GUIManager.cc (modified) * code/branches/console/src/libraries/core/GraphicsManager.h (modified) * code/branches/console/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/console/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/console/src/libraries/core/input/InputHandler.h (modified) * code/branches/console/src/libraries/network/packet/Packet.cc (modified) * code/branches/console/src/libraries/tools/ResourceCollection.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) Small stuff, mostly spelling mistakes. Sat, 24 Oct 2009 21:35:31 GMT rgrieder [5991] * code/branches/console/src/libraries/core/OrxonoxClass.h (modified) * code/branches/console/src/libraries/core/input/InputManager.cc (modified) * code/branches/console/src/libraries/util/Debug.h (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) Replaced the load of macros in Debug.h with just two, doing almost ... Thu, 22 Oct 2009 21:32:30 GMT scheusso [5986] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/core/input/InputPrereqs.h (modified) added a new feature to the IOConsole: you can now search the history ... Thu, 22 Oct 2009 11:36:48 GMT scheusso [5985] * code/branches/console/src/libraries/core/IOConsole.cc (modified) KEY HOME and END now also work on my laptop ;) Wed, 21 Oct 2009 22:51:54 GMT rgrieder [5984] * code/branches/steering/src/libraries/core/input/InputManager.cc (modified) Fixed bug in InputManager that occurred when entering and leaving (or ... Wed, 21 Oct 2009 20:25:59 GMT rgrieder [5983] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) IOConsole basically working though there are some unresolved issues ... Wed, 21 Oct 2009 15:28:13 GMT youngk [5982] * code/branches/sound3/data/levels/sound.oxw (added) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) Ambient Sounds are now locationally triggerable, i.e if the player ... Wed, 21 Oct 2009 15:17:05 GMT wirthmi [5981] * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) Made NewHumanController an InputHandler so we can control the crosshair. Wed, 21 Oct 2009 13:41:56 GMT wirthmi [5979] * code/branches/steering/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (added) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (added) * code/branches/steering/src/orxonox/infos/HumanPlayer.cc (modified) Added and activated new controller called NewHumanController. Wed, 21 Oct 2009 07:26:35 GMT rgrieder [5975] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Escape key should work as well now in the IOConsole input. And fixed ... Tue, 20 Oct 2009 20:49:22 GMT rgrieder [5974] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Fixed low fps problem when the console is running (removed timeout ... Tue, 20 Oct 2009 20:32:06 GMT rgrieder [5973] * code/branches/console/src/CMakeLists.txt (modified) * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/orxonox/gamestates/GSIOConsole.cc (modified) Input part of the IOConsole should be working (at least with SSH on ... Tue, 20 Oct 2009 17:08:05 GMT rgrieder [5972] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Trivial build fixes Tue, 20 Oct 2009 16:57:36 GMT rgrieder [5971] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Svn:eol-style "native" (Tortoise gone completely mad...) Tue, 20 Oct 2009 16:51:15 GMT rgrieder [5970] * code/branches/console/src/libraries/core/IOConsole.cc (added) And what the hell ever happened here. Adding missing file.