#
# ChangeLog for code/branches/presentation2/src/libraries
#
# Generated by Trac 1.0.9
# Nov 5, 2024, 5:29:54 AM

Fri, 25 Dec 2009 20:47:45 GMT rgrieder [6416]
	* code/branches/presentation2/src/libraries/core/Core.h (modified)
	* code/branches/presentation2/src/libraries/core/Resource.cc (modified)

	Added missing includes


Fri, 25 Dec 2009 16:18:02 GMT rgrieder [6415]
	* code/branches/presentation2/src/libraries/core/DynLib.cc (modified)

	const std::string& or std::string, but std::string& can yield ...


Fri, 25 Dec 2009 13:06:28 GMT dafrick [6413]
	* code/branches/presentation2/src/libraries/core/DynLib.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)

	Resolved some bugs that stood in the way of compiling.
	* In ...


Thu, 24 Dec 2009 14:56:22 GMT rgrieder [6410]
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)

	Just a small mistake...


Wed, 23 Dec 2009 18:44:49 GMT rgrieder [6404]
	* code/branches/presentation2/data/DataInstallScript.cmake (modified)
	* code/branches/presentation2/data/DefaultResources.oxr (moved)
	* code/branches/presentation2/data/lua/LuaStateInit.lua (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/Loader.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/Resource.cc (modified)
	* code/branches/presentation2/src/libraries/core/Resource.h (modified)
	* code/branches/presentation2/src/libraries/core/XMLFile.h (modified)
	* code/branches/presentation2/src/orxonox/LevelManager.cc (modified)

	Simplified our resource system a bit by working with a single ...


Tue, 22 Dec 2009 21:49:25 GMT rgrieder [6402]
	* code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified)

	Protected ClassTreeMask functions against NULL identifiers.

	That ...


Tue, 22 Dec 2009 21:05:38 GMT rgrieder [6400]
	* code/branches/presentation2/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/presentation2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified)
	* code/branches/presentation2/src/libraries/core/CommandEvaluation.cc (modified)
	* code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified)
	* code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/Language.cc (modified)
	* code/branches/presentation2/src/libraries/core/Loader.cc (modified)
	* code/branches/presentation2/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/TrafficControl.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/presentation2/src/libraries/tools/TextureGenerator.cc (modified)
	* code/branches/presentation2/src/libraries/util/StringUtils.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/presentation2/src/modules/pong/PongAI.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/PickupCollection.cc (modified)

	Replaced (*it). with it-> where I could find it. Should increased ...


Tue, 22 Dec 2009 20:21:28 GMT rgrieder [6399]
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)

	Increased default mouse sensitivity to a playable level.


Tue, 22 Dec 2009 13:07:44 GMT rgrieder [6394]
	* code/branches/presentation2/src/Orxonox.cc (modified)
	* code/branches/presentation2/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/presentation2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified)
	* code/branches/presentation2/src/libraries/core/CommandEvaluation.cc (modified)
	* code/branches/presentation2/src/libraries/core/CommandEvaluation.h (modified)
	* code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified)
	* code/branches/presentation2/src/libraries/core/CommandExecutor.h (modified)
	* code/branches/presentation2/src/libraries/core/CommandLineParser.cc (modified)
	* code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/presentation2/src/libraries/core/ConsoleCommandCompilation.cc (modified)
	* code/branches/presentation2/src/libraries/core/DynLib.cc (modified)
	* code/branches/presentation2/src/libraries/core/Event.cc (modified)
	* code/branches/presentation2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/presentation2/src/libraries/core/Executor.cc (modified)
	* code/branches/presentation2/src/libraries/core/Executor.h (modified)
	* code/branches/presentation2/src/libraries/core/Functor.h (modified)
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (modified)
	* code/branches/presentation2/src/libraries/core/IRC.cc (modified)
	* code/branches/presentation2/src/libraries/core/Identifier.cc (modified)
	* code/branches/presentation2/src/libraries/core/Identifier.h (modified)
	* code/branches/presentation2/src/libraries/core/Language.cc (modified)
	* code/branches/presentation2/src/libraries/core/Loader.cc (modified)
	* code/branches/presentation2/src/libraries/core/Namespace.cc (modified)
	* code/branches/presentation2/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified)
	* code/branches/presentation2/src/libraries/core/PathConfig.cc (modified)
	* code/branches/presentation2/src/libraries/core/Shell.cc (modified)
	* code/branches/presentation2/src/libraries/core/Shell.h (modified)
	* code/branches/presentation2/src/libraries/core/SubclassIdentifier.h (modified)
	* code/branches/presentation2/src/libraries/core/TclBind.cc (modified)
	* code/branches/presentation2/src/libraries/core/TclBind.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/Template.cc (modified)
	* code/branches/presentation2/src/libraries/core/Template.h (modified)
	* code/branches/presentation2/src/libraries/core/XMLPort.h (modified)
	* code/branches/presentation2/src/libraries/core/input/Button.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/Button.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputBuffer.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/JoyStick.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/KeyDetector.cc (modified)
	* code/branches/presentation2/src/libraries/network/Client.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/presentation2/src/libraries/tools/BillboardSet.cc (modified)
	* code/branches/presentation2/src/libraries/tools/Mesh.cc (modified)
	* code/branches/presentation2/src/libraries/tools/ParticleInterface.cc (modified)
	* code/branches/presentation2/src/libraries/tools/ResourceLocation.cc (modified)
	* code/branches/presentation2/src/libraries/tools/Shader.cc (modified)
	* code/branches/presentation2/src/libraries/tools/TextureGenerator.cc (modified)
	* code/branches/presentation2/src/libraries/util/Clipboard.cc (modified)
	* code/branches/presentation2/src/libraries/util/Convert.h (modified)
	* code/branches/presentation2/src/libraries/util/Exception.cc (modified)
	* code/branches/presentation2/src/libraries/util/Math.h (modified)
	* code/branches/presentation2/src/libraries/util/MathConvert.h (modified)
	* code/branches/presentation2/src/libraries/util/OutputHandler.cc (modified)
	* code/branches/presentation2/src/libraries/util/StringUtils.cc (modified)
	* code/branches/presentation2/src/libraries/util/SubString.cc (modified)
	* code/branches/presentation2/src/libraries/util/UtilPrereqs.h (modified)
	* code/branches/presentation2/src/modules/objects/Attacher.cc (modified)
	* code/branches/presentation2/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/branches/presentation2/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/branches/presentation2/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/presentation2/src/modules/objects/triggers/Trigger.cc (modified)
	* code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/presentation2/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/presentation2/src/modules/pong/PongScore.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestNotification.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/notifications/NotificationManager.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/branches/presentation2/src/orxonox/Level.cc (modified)
	* code/branches/presentation2/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentation2/src/orxonox/LevelManager.h (modified)
	* code/branches/presentation2/src/orxonox/Radar.cc (modified)
	* code/branches/presentation2/src/orxonox/Radar.h (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/presentation2/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/presentation2/src/orxonox/items/Engine.h (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/Map.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/DroppedItem.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.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/WorldEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)

	std::string tweaks:
	- Declared BLANKSTRING in UtilPrereqs.h as well ...


Mon, 21 Dec 2009 13:28:46 GMT rgrieder [6392]
	* code/branches/presentation2/src/libraries/util/Debug.h (modified)

	Adjusted hard debug level for the debug build: now set to 6 (Ultra).


Mon, 21 Dec 2009 12:28:10 GMT rgrieder [6388]
	* code/branches/presentation2/README (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2/data/levels/empty_level.oxw (modified)
	* code/branches/presentation2/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation2/data/levels/old/physicstest.oxw (modified)
	* code/branches/presentation2/data/levels/old/tutorial_hs08.oxw (modified)
	* code/branches/presentation2/data/levels/presentation09.oxw (modified)
	* code/branches/presentation2/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation2/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2/data/levels/presentation_dm.oxw (modified)
	* code/branches/presentation2/data/levels/questsystem2.oxw (modified)
	* code/branches/presentation2/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/presentation2/data/levels/test_ghost.oxw (modified)
	* code/branches/presentation2/data/overlays/OrxonoxLoading.overlay (modified)
	* code/branches/presentation2/doc/CMakeLists.txt (modified)
	* code/branches/presentation2/doc/api/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/presentation2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation2/src/libraries/core/MemoryArchive.cc (modified)
	* code/branches/presentation2/src/libraries/core/MemoryArchive.h (modified)
	* code/branches/presentation2/src/libraries/core/Resource.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputCommands.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/presentation2/src/libraries/network/Server.cc (modified)
	* code/branches/presentation2/src/libraries/network/TrafficControl.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/presentation2/src/libraries/util/Serialise.h (modified)
	* code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestManager.h (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h (modified)

	Found some end of line leftover spaces.


Mon, 21 Dec 2009 12:18:36 GMT rgrieder [6387]
	* code/branches/presentation2/cmake/FindLua.cmake (modified)
	* code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake (modified)
	* code/branches/presentation2/cmake/LibraryConfig.cmake (modified)
	* code/branches/presentation2/cmake/LibraryConfigApple.cmake (modified)
	* code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/branches/presentation2/data/gui/layouts/PickupInventory.layout (modified)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/presentation2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/presentation2/data/levels/empty_level.oxw (modified)
	* code/branches/presentation2/data/levels/events.oxw (modified)
	* code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw (modified)
	* code/branches/presentation2/data/levels/presentation09.oxw (modified)
	* code/branches/presentation2/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation2/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2/data/levels/presentation_dm.oxw (modified)
	* code/branches/presentation2/data/levels/questsystem2.oxw (modified)
	* code/branches/presentation2/data/levels/sound.oxw (modified)
	* code/branches/presentation2/data/levels/test_ghost.oxw (modified)
	* code/branches/presentation2/data/overlays/debug.oxo (modified)
	* code/branches/presentation2/data/overlays/stats.oxo (modified)
	* code/branches/presentation2/doc/api/CMakeLists.txt (modified)
	* code/branches/presentation2/src/external/ceguilua/CMakeLists.txt (modified)
	* code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation2/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/Event.cc (modified)
	* code/branches/presentation2/src/libraries/core/Event.h (modified)
	* code/branches/presentation2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/presentation2/src/libraries/core/SmartPtr.h (modified)
	* code/branches/presentation2/src/libraries/core/Thread.cc (modified)
	* code/branches/presentation2/src/libraries/core/Thread.h (modified)
	* code/branches/presentation2/src/libraries/core/ThreadPool.cc (modified)
	* code/branches/presentation2/src/libraries/core/ThreadPool.h (modified)
	* code/branches/presentation2/src/libraries/core/WeakPtr.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputPrereqs.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputState.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/Client.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnection.h (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/presentation2/src/libraries/network/ClientInformation.cc (modified)
	* code/branches/presentation2/src/libraries/network/Connection.cc (modified)
	* code/branches/presentation2/src/libraries/network/Connection.h (modified)
	* code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/presentation2/src/libraries/network/Server.cc (modified)
	* code/branches/presentation2/src/libraries/network/Server.h (modified)
	* code/branches/presentation2/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/presentation2/src/libraries/network/ServerConnection.h (modified)
	* code/branches/presentation2/src/libraries/network/TrafficControl.cc (modified)
	* code/branches/presentation2/src/libraries/network/TrafficControl.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/ClassID.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/presentation2/src/libraries/tools/Timer.cc (modified)
	* code/branches/presentation2/src/libraries/tools/Timer.h (modified)
	* code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h (modified)
	* code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/branches/presentation2/src/libraries/util/Clock.cc (modified)
	* code/branches/presentation2/src/libraries/util/Math.cc (modified)
	* code/branches/presentation2/src/libraries/util/MultiType.h (modified)
	* code/branches/presentation2/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/presentation2/src/libraries/util/Serialise.h (modified)
	* code/branches/presentation2/src/libraries/util/mbool.h (modified)
	* code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/branches/presentation2/src/modules/pong/Pong.cc (modified)
	* code/branches/presentation2/src/modules/pong/PongAI.cc (modified)
	* code/branches/presentation2/src/modules/pong/PongBall.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/AddReward.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/FailQuest.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/LocalQuest.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/Quest.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestEffect.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUI.h (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestHint.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/QuestNotification.cc (modified)
	* code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation2/src/orxonox/PlayerManager.cc (modified)
	* code/branches/presentation2/src/orxonox/Scene.h (modified)
	* code/branches/presentation2/src/orxonox/Test.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation2/src/orxonox/interfaces/Rewardable.h (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h (modified)
	* code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Found some non empty new lines.


Mon, 21 Dec 2009 11:52:43 GMT rgrieder [6386]
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)

	Correction to r6385.


Mon, 21 Dec 2009 11:49:53 GMT rgrieder [6385]
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)

	The free PNG format is probably more suitable for screen shots than ...


Mon, 21 Dec 2009 11:30:02 GMT rgrieder [6384]
	* code/branches/presentation2/src/libraries/core/Core.cc (modified)

	Playing Orxonox on a specific core makes it faster on Windows.
	The ...


Fri, 18 Dec 2009 14:20:25 GMT erwin [6380]
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (modified)

	Fixed build complete


Fri, 18 Dec 2009 14:16:31 GMT rgrieder [6379]
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (modified)
	* code/branches/presentation2/src/libraries/core/Shell.cc (modified)

	Fixed linux build.


Fri, 18 Dec 2009 11:48:19 GMT rgrieder [6378]
	* code/branches/presentation2/src/libraries/core/Game.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSRoot.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/SoundStreamer.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundStreamer.h (modified)

	Added missing includes (revealed only with PCH and compilations).


Thu, 17 Dec 2009 23:11:16 GMT rgrieder [6375]
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (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)

	Fixed a problem with output being written directly to the Shell.
	Use ...


Thu, 17 Dec 2009 22:49:25 GMT rgrieder [6374]
	* code/branches/presentation2/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/presentation2/src/libraries/core/Shell.cc (modified)
	* code/branches/presentation2/src/libraries/core/Shell.h (modified)

	Fixed a problem in the Shell with the command history config file
	type.


Thu, 17 Dec 2009 22:27:00 GMT rgrieder [6373]
	* code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h (modified)
	* code/branches/presentation2/src/libraries/util/Exception.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)

	Added config value to disable sound entirely.
	Also added ...


Thu, 17 Dec 2009 15:39:34 GMT rgrieder [6371]
	* code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.h (modified)

	Added tolua interface to GUIManager again. Found out it didn't have ...


Thu, 17 Dec 2009 09:49:16 GMT rgrieder [6368]
	* code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h (modified)

	Added config value macro "SetConfigValueAlias" where you can specify ...


Wed, 16 Dec 2009 21:19:32 GMT rgrieder [6367]
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified)

	Moved CEGUI event hack from KeyBinderManager to GUIManager and made ...


Wed, 16 Dec 2009 20:44:22 GMT rgrieder [6366]
	* code/branches/presentation2/src/libraries/core/input/Keyboard.cc (modified)

	Fixed alt+tab problem: This key combination should be ignored on all ...


Wed, 16 Dec 2009 20:42:16 GMT rgrieder [6364]
	* code/branches/presentation2/src/libraries/core/Shell.cc (modified)

	Fixed output problem in Shell (non complete line output was not ...


Wed, 16 Dec 2009 20:41:33 GMT rgrieder [6363]
	* code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MainMenuBackground.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi (modified)
	* code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi (modified)
	* code/branches/presentation2/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_HXY.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_HXY_SL.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter_SL.oxt (modified)
	* code/branches/presentation2/data/particle/Steam.particle (modified)
	* code/branches/presentation2/src/libraries/network/synchronisable/Serialise.h (modified)

	svn:eol-style "native" for all text files.
	Also removed two ...


Wed, 16 Dec 2009 10:20:57 GMT rgrieder [6360]
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)

	Fixed cursor behaviour when steering with a gamepad.


Mon, 14 Dec 2009 00:03:27 GMT rgrieder [6350]
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (modified)

	IOConsole should not process input during destruction.


Sun, 13 Dec 2009 23:50:22 GMT rgrieder [6348]
	* code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified)
	* code/branches/presentation2/src/libraries/core/OrxonoxClass.h (modified)

	Adding OrxonoxClass::preDestroy(). This method gets called when an ...


Fri, 11 Dec 2009 01:05:00 GMT scheusso [6320]
	* code/branches/presentation2/src/libraries/util/Serialise.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)

	various fixes for client: NHC, sound, callback handling of Vector4 & ...


Thu, 10 Dec 2009 23:04:21 GMT rgrieder [6319]
	* code/branches/presentation2/src/libraries/util/Clock.cc (modified)
	* code/branches/presentation2/src/libraries/util/Clock.h (modified)

	Simplified the Clock code a little (doesn't mean it got simpler ...


Thu, 10 Dec 2009 22:40:07 GMT rgrieder [6318]
	* code/branches/presentation2/src/libraries/core/Game.cc (modified)

	This should fix the fps limiter if you play longer than 2^32
	nanoseconds.


Thu, 10 Dec 2009 07:49:33 GMT scheusso [6313]
	* code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)

	further network fixes
	changed screenshot format from jpeg to tiff ...


Wed, 09 Dec 2009 22:17:14 GMT dafrick [6311]
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified)

	The KeyBindMenu now shows all Keybindings and allows for various ...


Wed, 09 Dec 2009 19:44:41 GMT rgrieder [6303]
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.h (modified)

	Removed deprecated method in GUIManager.


Wed, 09 Dec 2009 19:42:56 GMT rgrieder [6301]
	* code/branches/presentation2/src/libraries/core/input/InputDevice.h (modified)

	Changed an input strategy: When you press a key but don't release it ...


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 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.


Mon, 07 Dec 2009 20:45:39 GMT dafrick [6266]
	* code/branches/presentation2/data/gui/layouts/InfoPopup.layout (added)
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (added)
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified)

	KeyBindMenu is working now. (Apart from some minor faults)
	Found ...


Sun, 06 Dec 2009 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 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


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 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 ...


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 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 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 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 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: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).


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 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 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: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 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 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 ...


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 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 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: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: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 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: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.


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: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.