#
# ChangeLog for code
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 9:15:24 PM

Tue, 29 Dec 2009 21:30:19 GMT rgrieder [6432]
	* code/branches/gamestate/data/lua/LuaStateInit.lua (modified)
	* code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/gamestate/src/libraries/core/ArgumentCompletionFunctions.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/gamestate/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueContainer.h (modified)
	* code/branches/gamestate/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/gamestate/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/gamestate/src/libraries/core/Identifier.cc (modified)
	* code/branches/gamestate/src/libraries/core/Identifier.h (modified)
	* code/branches/gamestate/src/libraries/core/Shell.cc (modified)
	* code/branches/gamestate/src/libraries/core/Shell.h (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/Button.h (modified)
	* code/branches/gamestate/src/libraries/core/input/JoyStick.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/gamestate/src/libraries/core/input/KeyBinder.h (modified)

	Changed the way config values associated with general settings ...


Tue, 29 Dec 2009 18:16:36 GMT rgrieder [6431]
	* code/branches/gamestate/src/libraries/util/Singleton.h (modified)

	Extended Singleton<T> with a exists() method.


Tue, 29 Dec 2009 09:40:29 GMT rgrieder [6430]
	* code/branches/gamestate (copied)

	Created branch to ditch the GameStates.


Mon, 28 Dec 2009 22:17:18 GMT rgrieder [6429]
	* code/trunk/cmake/CompilerConfigMSVC.cmake (modified)

	No STL iterator bounds checking for MSVC release versions.


Mon, 28 Dec 2009 22:10:37 GMT rgrieder [6428]
	* code/trunk/src/libraries/core/input/Button.cc (modified)
	* code/trunk/src/libraries/core/input/Button.h (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.h (modified)
	* code/trunk/src/libraries/core/input/KeyDetector.cc (modified)

	Changed config value handling in the KeyBinder. Doesn't change the ...


Mon, 28 Dec 2009 19:35:54 GMT rgrieder [6427]
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)

	Fixed (whyever it works now) bug in KeyBind menu that caused an error ...


Mon, 28 Dec 2009 09:08:12 GMT rgrieder [6426]
	* code/trunk/src/orxonox/gamestates/GSClient.cc (modified)

	Fixed bug that caused Host to fail an assert when the client failed ...


Sun, 27 Dec 2009 01:30:06 GMT rgrieder [6425]
	* code/trunk/src/libraries/core/ConfigFileManager.cc (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)

	Replaced "=" with " = " in our ini files for the config value.
	Also ...


Sun, 27 Dec 2009 01:28:28 GMT rgrieder [6424]
	* code/trunk/src/libraries/util/StringUtils.cc (modified)

	Fixed a bug in removeSlashes: An escape sequence at the third and ...


Sat, 26 Dec 2009 23:09:08 GMT rgrieder [6423]
	* code/trunk/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)

	Fixed bug that caused derived classes to list the base class's config ...


Sat, 26 Dec 2009 10:18:13 GMT rgrieder [6422]
	* code/trunk/src/libraries/core/ConfigFileManager.cc (modified)
	* code/trunk/src/libraries/core/DynLibManager.cc (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/IOConsole.cc (modified)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/Keyboard.cc (modified)

	Uniform code-styling per file. As if I didn't know what to do ^^


Sat, 26 Dec 2009 09:06:54 GMT dafrick [6421]
	* code/branches/pickup3/src/modules/pickup/DroppedItem.cc (modified)
	* code/branches/pickup3/src/modules/pickup/DroppedItem.h (modified)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified)
	* code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/pickup3/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/pickup3/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (modified)

	Some Documenting and bug fixes.


Fri, 25 Dec 2009 22:08:24 GMT rgrieder [6420]
	* code/branches/pickup3/src/modules/pickup/CMakeLists.txt (modified)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.h (modified)
	* code/branches/pickup3/src/modules/pickup/PickupPrecompiledHeaders.h (modified)
	* code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (modified)

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


Fri, 25 Dec 2009 22:07:09 GMT rgrieder [6419]
	* code/branches/pickup3 (modified)
	* code/branches/pickup3/src/libraries/core/Super.h (modified)
	* code/branches/pickup3/src/modules/CMakeLists.txt (modified)
	* code/branches/pickup3/src/modules/pickup (copied)
	* code/branches/pickup3/src/modules/pickup/CMakeLists.txt (copied)
	* code/branches/pickup3/src/modules/pickup/DroppedItem.cc (copied)
	* code/branches/pickup3/src/modules/pickup/DroppedItem.h (copied)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.cc (copied)
	* code/branches/pickup3/src/modules/pickup/PickupCollection.h (copied)
	* code/branches/pickup3/src/modules/pickup/PickupPrecompiledHeaders.h (copied)
	* code/branches/pickup3/src/modules/pickup/PickupPrereqs.h (copied)
	* code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (copied)
	* code/branches/pickup3/src/modules/pickup/PickupSpawner.h (copied)
	* code/branches/pickup3/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/pickup3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/pickup3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/pickup3/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h (copied)
	* code/branches/pickup3/src/orxonox/interfaces/Pickupable.h (copied)
	* code/branches/pickup3/src/orxonox/items/Engine.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/BaseItem.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/BaseItem.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/CMakeLists.txt (modified)
	* code/branches/pickup3/src/orxonox/pickup/DroppedItem.h (deleted)
	* code/branches/pickup3/src/orxonox/pickup/EquipmentItem.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/EquipmentItem.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/ModifierPickup.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/ModifierType.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/PassiveItem.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/PassiveItem.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupCollection.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupCollection.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupInventory.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupSpawner.h (deleted)
	* code/branches/pickup3/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/UsableItem.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/items/HealthImmediate.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/items/HealthImmediate.h (modified)
	* code/branches/pickup3/src/orxonox/pickup/items/HealthUsable.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/items/Jump.h (modified)
	* code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Merged pickup2 into pickup3.


Fri, 25 Dec 2009 21:48:10 GMT rgrieder [6418]
	* code/branches/pickup3 (copied)

	New branch to make pickup2 work easier.


Fri, 25 Dec 2009 21:23:58 GMT rgrieder [6417]
	* code/trunk (modified)
	* code/trunk/README (modified)
	* code/trunk/bin/dedicatedClient.bat.in (modified)
	* code/trunk/bin/dedicatedClient.in (modified)
	* code/trunk/cmake/FindLua.cmake (modified)
	* code/trunk/cmake/FindPackageHandleAdvancedArgs.cmake (modified)
	* code/trunk/cmake/LibraryConfig.cmake (modified)
	* code/trunk/cmake/LibraryConfigApple.cmake (modified)
	* code/trunk/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/trunk/cmake/SourceFileUtilities.cmake (modified)
	* code/trunk/data/DataInstallScript.cmake (modified)
	* code/trunk/data/DefaultResources.oxr (copied)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/layouts/AudioMenu.layout (copied)
	* code/trunk/data/gui/layouts/ControlsMenu.layout (copied)
	* code/trunk/data/gui/layouts/CreditsMenu.layout (copied)
	* code/trunk/data/gui/layouts/DecisionPopup.layout (copied)
	* code/trunk/data/gui/layouts/GameplayMenu.layout (copied)
	* code/trunk/data/gui/layouts/GraphicsMenu.layout (copied)
	* code/trunk/data/gui/layouts/InGameMenu.layout (copied)
	* code/trunk/data/gui/layouts/InfoPopup.layout (copied)
	* code/trunk/data/gui/layouts/KeyBindMenu.layout (copied)
	* code/trunk/data/gui/layouts/MainMenu.layout (modified)
	* code/trunk/data/gui/layouts/MainMenuBackground.layout (copied)
	* code/trunk/data/gui/layouts/MouseControlsMenu.layout (copied)
	* code/trunk/data/gui/layouts/MultiplayerMenu.layout (copied)
	* code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (copied)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/layouts/QuestGUI.layout (modified)
	* code/trunk/data/gui/layouts/SettingsMenu.layout (copied)
	* code/trunk/data/gui/layouts/SingleplayerMenu.layout (copied)
	* code/trunk/data/gui/scripts/AudioMenu.lua (copied)
	* code/trunk/data/gui/scripts/ControlsMenu.lua (copied)
	* code/trunk/data/gui/scripts/CreditsMenu.lua (copied)
	* code/trunk/data/gui/scripts/DecisionPopup.lua (copied)
	* code/trunk/data/gui/scripts/GUITools.lua (copied)
	* code/trunk/data/gui/scripts/GameplayMenu.lua (copied)
	* code/trunk/data/gui/scripts/GraphicsMenu.lua (copied)
	* code/trunk/data/gui/scripts/InGameMenu.lua (copied)
	* code/trunk/data/gui/scripts/InfoPopup.lua (copied)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (copied)
	* code/trunk/data/gui/scripts/MainMenu.lua (modified)
	* code/trunk/data/gui/scripts/MouseControlsMenu.lua (copied)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (copied)
	* code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (copied)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/gui/scripts/SettingsMenu.lua (copied)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (copied)
	* code/trunk/data/levels/empty_level.oxw (modified)
	* code/trunk/data/levels/events.oxw (modified)
	* code/trunk/data/levels/gametype_asteroids.oxw (modified)
	* code/trunk/data/levels/includes/weaponsettings3.oxi (modified)
	* code/trunk/data/levels/includes/weaponsettings_HXY.oxi (copied)
	* code/trunk/data/levels/includes/weaponsettings_Transporter.oxi (copied)
	* code/trunk/data/levels/includes/weaponsettings_ghost.oxi (modified)
	* code/trunk/data/levels/old/physicstest.oxw (modified)
	* code/trunk/data/levels/old/physicstest2.oxw (modified)
	* code/trunk/data/levels/old/presentation_physics.oxw (modified)
	* code/trunk/data/levels/old/princessaeryn.oxw (modified)
	* code/trunk/data/levels/old/questsystem.oxw (modified)
	* code/trunk/data/levels/old/sample4.oxw (modified)
	* code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (modified)
	* code/trunk/data/levels/old/tutorial_hs08.oxw (modified)
	* code/trunk/data/levels/presentation.oxw (modified)
	* code/trunk/data/levels/presentation09.oxw (modified)
	* code/trunk/data/levels/presentation09b.oxw (modified)
	* code/trunk/data/levels/presentationHS09.oxw (copied)
	* code/trunk/data/levels/presentationHS09b.oxw (copied)
	* code/trunk/data/levels/presentation_dm.oxw (modified)
	* code/trunk/data/levels/princessaeryn.oxw (modified)
	* code/trunk/data/levels/questsystem2.oxw (modified)
	* code/trunk/data/levels/sound.oxw (copied)
	* code/trunk/data/levels/teambasematchlevel.oxw (modified)
	* code/trunk/data/levels/templates/spaceship_HXY.oxt (copied)
	* code/trunk/data/levels/templates/spaceship_HXY_SL.oxt (copied)
	* code/trunk/data/levels/templates/spaceship_Transporter.oxt (copied)
	* code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt (copied)
	* code/trunk/data/levels/templates/spaceship_assff.oxt (modified)
	* code/trunk/data/levels/templates/spaceship_ghost.oxt (modified)
	* code/trunk/data/levels/test_ghost.oxw (modified)
	* code/trunk/data/lua/LuaStateInit.lua (modified)
	* code/trunk/data/overlays/OrxonoxLoading.overlay (modified)
	* code/trunk/data/overlays/debug.oxo (modified)
	* code/trunk/data/overlays/stats.oxo (modified)
	* code/trunk/data/particle/Steam.particle (copied)
	* code/trunk/data/particle/bigexplosion.particle (copied)
	* code/trunk/data/particle/explosion4.particle (copied)
	* code/trunk/data/particle/laser.particle (copied)
	* code/trunk/data/particle/load.particle (copied)
	* code/trunk/data/particle/particlecanon.particle (copied)
	* code/trunk/data/particle/rocketfire.particle (copied)
	* code/trunk/data/particle/smoke.particle (copied)
	* code/trunk/data/particle/tes3.particle (copied)
	* code/trunk/data/resources.oxr (deleted)
	* code/trunk/doc/CMakeLists.txt (modified)
	* code/trunk/doc/api/CMakeLists.txt (modified)
	* code/trunk/doc/api/main.dox (modified)
	* code/trunk/src/Orxonox.cc (modified)
	* code/trunk/src/external/ceguilua/CMakeLists.txt (modified)
	* code/trunk/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.h (modified)
	* code/trunk/src/libraries/core/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/ClassTreeMask.cc (modified)
	* code/trunk/src/libraries/core/CommandEvaluation.cc (modified)
	* code/trunk/src/libraries/core/CommandEvaluation.h (modified)
	* code/trunk/src/libraries/core/CommandExecutor.cc (modified)
	* code/trunk/src/libraries/core/CommandExecutor.h (modified)
	* code/trunk/src/libraries/core/CommandLineParser.cc (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.cc (modified)
	* code/trunk/src/libraries/core/ConfigFileManager.h (modified)
	* code/trunk/src/libraries/core/ConfigValueContainer.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/DynLib.cc (modified)
	* code/trunk/src/libraries/core/Event.cc (modified)
	* code/trunk/src/libraries/core/Event.h (modified)
	* code/trunk/src/libraries/core/EventIncludes.h (modified)
	* code/trunk/src/libraries/core/Executor.cc (modified)
	* code/trunk/src/libraries/core/Executor.h (modified)
	* code/trunk/src/libraries/core/Functor.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/Game.cc (modified)
	* code/trunk/src/libraries/core/Game.h (modified)
	* code/trunk/src/libraries/core/GameMode.h (modified)
	* code/trunk/src/libraries/core/GameState.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 (modified)
	* code/trunk/src/libraries/core/IOConsole.h (modified)
	* code/trunk/src/libraries/core/IRC.cc (modified)
	* code/trunk/src/libraries/core/Identifier.cc (modified)
	* code/trunk/src/libraries/core/Identifier.h (modified)
	* code/trunk/src/libraries/core/Language.cc (modified)
	* code/trunk/src/libraries/core/Language.h (modified)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/core/LuaState.cc (modified)
	* code/trunk/src/libraries/core/LuaState.h (modified)
	* code/trunk/src/libraries/core/MemoryArchive.cc (modified)
	* code/trunk/src/libraries/core/MemoryArchive.h (modified)
	* code/trunk/src/libraries/core/Namespace.cc (modified)
	* code/trunk/src/libraries/core/NamespaceNode.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/PathConfig.h (modified)
	* code/trunk/src/libraries/core/Resource.cc (modified)
	* code/trunk/src/libraries/core/Resource.h (modified)
	* code/trunk/src/libraries/core/ScopedSingletonManager.h (modified)
	* code/trunk/src/libraries/core/Shell.cc (modified)
	* code/trunk/src/libraries/core/Shell.h (modified)
	* code/trunk/src/libraries/core/SmartPtr.h (modified)
	* code/trunk/src/libraries/core/SubclassIdentifier.h (modified)
	* code/trunk/src/libraries/core/TclBind.cc (modified)
	* code/trunk/src/libraries/core/TclBind.h (modified)
	* code/trunk/src/libraries/core/TclThreadManager.cc (modified)
	* code/trunk/src/libraries/core/TclThreadManager.h (modified)
	* code/trunk/src/libraries/core/Template.cc (modified)
	* code/trunk/src/libraries/core/Template.h (modified)
	* code/trunk/src/libraries/core/Thread.cc (modified)
	* code/trunk/src/libraries/core/Thread.h (modified)
	* code/trunk/src/libraries/core/ThreadPool.cc (modified)
	* code/trunk/src/libraries/core/ThreadPool.h (modified)
	* code/trunk/src/libraries/core/WeakPtr.h (modified)
	* code/trunk/src/libraries/core/XMLFile.h (modified)
	* code/trunk/src/libraries/core/XMLPort.h (modified)
	* code/trunk/src/libraries/core/input/Button.cc (modified)
	* code/trunk/src/libraries/core/input/Button.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/InputCommands.h (modified)
	* code/trunk/src/libraries/core/input/InputDevice.h (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.h (modified)
	* code/trunk/src/libraries/core/input/InputPrereqs.h (modified)
	* code/trunk/src/libraries/core/input/InputState.cc (modified)
	* code/trunk/src/libraries/core/input/JoyStick.cc (modified)
	* code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinder.h (modified)
	* code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/trunk/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/trunk/src/libraries/core/input/KeyDetector.cc (modified)
	* code/trunk/src/libraries/core/input/KeyDetector.h (modified)
	* code/trunk/src/libraries/core/input/Keyboard.cc (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/network/ClientConnection.cc (modified)
	* code/trunk/src/libraries/network/ClientConnection.h (modified)
	* code/trunk/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/trunk/src/libraries/network/ClientConnectionListener.h (modified)
	* code/trunk/src/libraries/network/ClientInformation.cc (modified)
	* code/trunk/src/libraries/network/Connection.cc (modified)
	* code/trunk/src/libraries/network/Connection.h (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.cc (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.h (modified)
	* code/trunk/src/libraries/network/GamestateClient.cc (modified)
	* code/trunk/src/libraries/network/GamestateHandler.cc (modified)
	* code/trunk/src/libraries/network/GamestateManager.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunction.cc (modified)
	* code/trunk/src/libraries/network/NetworkFunction.h (modified)
	* code/trunk/src/libraries/network/NetworkPrereqs.h (modified)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/Server.h (modified)
	* code/trunk/src/libraries/network/ServerConnection.cc (modified)
	* code/trunk/src/libraries/network/ServerConnection.h (modified)
	* code/trunk/src/libraries/network/TrafficControl.cc (modified)
	* code/trunk/src/libraries/network/TrafficControl.h (modified)
	* code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/trunk/src/libraries/network/packet/Chat.cc (modified)
	* code/trunk/src/libraries/network/packet/ClassID.cc (modified)
	* code/trunk/src/libraries/network/packet/ClassID.h (modified)
	* code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/trunk/src/libraries/network/packet/Gamestate.cc (modified)
	* code/trunk/src/libraries/network/packet/Packet.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified)
	* code/trunk/src/libraries/network/synchronisable/NetworkCallback.h (modified)
	* code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified)
	* code/trunk/src/libraries/network/synchronisable/Serialise.h (copied)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (deleted)
	* code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/trunk/src/libraries/tools/BillboardSet.cc (modified)
	* code/trunk/src/libraries/tools/CMakeLists.txt (modified)
	* code/trunk/src/libraries/tools/Mesh.cc (modified)
	* code/trunk/src/libraries/tools/ParticleInterface.cc (modified)
	* code/trunk/src/libraries/tools/ResourceLocation.cc (modified)
	* code/trunk/src/libraries/tools/Shader.cc (modified)
	* code/trunk/src/libraries/tools/TextureGenerator.cc (modified)
	* code/trunk/src/libraries/tools/Timer.cc (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)
	* code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified)
	* code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/trunk/src/libraries/util/Clipboard.cc (modified)
	* code/trunk/src/libraries/util/Clock.cc (modified)
	* code/trunk/src/libraries/util/Clock.h (modified)
	* code/trunk/src/libraries/util/Convert.h (modified)
	* code/trunk/src/libraries/util/Debug.h (modified)
	* code/trunk/src/libraries/util/DisplayStringConversions.h (copied)
	* code/trunk/src/libraries/util/Exception.cc (modified)
	* code/trunk/src/libraries/util/Exception.h (modified)
	* code/trunk/src/libraries/util/ExprParser.cc (modified)
	* code/trunk/src/libraries/util/ExprParser.h (modified)
	* code/trunk/src/libraries/util/Math.cc (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/libraries/util/MathConvert.h (modified)
	* code/trunk/src/libraries/util/MultiType.h (modified)
	* code/trunk/src/libraries/util/MultiTypeValue.h (modified)
	* code/trunk/src/libraries/util/OutputHandler.cc (modified)
	* code/trunk/src/libraries/util/Serialise.h (modified)
	* code/trunk/src/libraries/util/Singleton.h (modified)
	* code/trunk/src/libraries/util/StringUtils.cc (modified)
	* code/trunk/src/libraries/util/SubString.cc (modified)
	* code/trunk/src/libraries/util/UTFStringConversions.h (deleted)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/libraries/util/mbool.h (modified)
	* code/trunk/src/modules/objects/Attacher.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/Trigger.cc (modified)
	* code/trunk/src/modules/overlays/GUIOverlay.cc (modified)
	* code/trunk/src/modules/overlays/OverlayText.cc (modified)
	* code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/trunk/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/trunk/src/modules/pong/Pong.cc (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/pong/PongBall.cc (modified)
	* code/trunk/src/modules/pong/PongScore.cc (modified)
	* code/trunk/src/modules/questsystem/AddQuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/AddReward.cc (modified)
	* code/trunk/src/modules/questsystem/ChangeQuestStatus.cc (modified)
	* code/trunk/src/modules/questsystem/CompleteQuest.cc (modified)
	* code/trunk/src/modules/questsystem/FailQuest.cc (modified)
	* code/trunk/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/LocalQuest.cc (modified)
	* code/trunk/src/modules/questsystem/Quest.cc (modified)
	* code/trunk/src/modules/questsystem/QuestDescription.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffect.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUI.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUI.h (modified)
	* code/trunk/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUINode.h (modified)
	* code/trunk/src/modules/questsystem/QuestHint.cc (modified)
	* code/trunk/src/modules/questsystem/QuestItem.cc (modified)
	* code/trunk/src/modules/questsystem/QuestListener.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.h (modified)
	* code/trunk/src/modules/questsystem/QuestNotification.cc (modified)
	* code/trunk/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified)
	* code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (copied)
	* code/trunk/src/modules/weapons/projectiles/Rocket.h (copied)
	* code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (copied)
	* code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (copied)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/CameraManager.cc (modified)
	* code/trunk/src/orxonox/Level.cc (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/LevelManager.h (modified)
	* code/trunk/src/orxonox/MoodManager.cc (copied)
	* code/trunk/src/orxonox/MoodManager.h (copied)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/Radar.cc (modified)
	* code/trunk/src/orxonox/Radar.h (modified)
	* code/trunk/src/orxonox/Scene.cc (modified)
	* code/trunk/src/orxonox/Scene.h (modified)
	* code/trunk/src/orxonox/Test.cc (modified)
	* code/trunk/src/orxonox/Test.h (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.h (modified)
	* code/trunk/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/Controller.cc (modified)
	* code/trunk/src/orxonox/controllers/Controller.h (modified)
	* code/trunk/src/orxonox/controllers/HumanController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (copied)
	* code/trunk/src/orxonox/controllers/NewHumanController.h (copied)
	* code/trunk/src/orxonox/gamestates/GSDedicated.cc (deleted)
	* code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (deleted)
	* code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSRoot.h (modified)
	* code/trunk/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/trunk/src/orxonox/graphics/Billboard.cc (modified)
	* code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified)
	* code/trunk/src/orxonox/graphics/Camera.cc (modified)
	* code/trunk/src/orxonox/graphics/Camera.h (modified)
	* code/trunk/src/orxonox/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/trunk/src/orxonox/infos/PlayerInfo.h (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/trunk/src/orxonox/interfaces/Rewardable.h (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.h (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.h (modified)
	* code/trunk/src/orxonox/overlays/Map.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/trunk/src/orxonox/pickup/DroppedItem.cc (modified)
	* code/trunk/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/trunk/src/orxonox/pickup/ModifierPickup.h (modified)
	* code/trunk/src/orxonox/pickup/PickupCollection.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/pickup/UsableItem.cc (modified)
	* code/trunk/src/orxonox/sound/AmbientSound.cc (modified)
	* code/trunk/src/orxonox/sound/AmbientSound.h (modified)
	* code/trunk/src/orxonox/sound/BaseSound.cc (modified)
	* code/trunk/src/orxonox/sound/BaseSound.h (modified)
	* code/trunk/src/orxonox/sound/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/sound/SoundBuffer.cc (copied)
	* code/trunk/src/orxonox/sound/SoundBuffer.h (copied)
	* code/trunk/src/orxonox/sound/SoundManager.cc (modified)
	* code/trunk/src/orxonox/sound/SoundManager.h (modified)
	* code/trunk/src/orxonox/sound/SoundStreamer.cc (copied)
	* code/trunk/src/orxonox/sound/SoundStreamer.h (copied)
	* code/trunk/src/orxonox/sound/WorldSound.cc (modified)
	* code/trunk/src/orxonox/sound/WorldSound.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/EffectContainer.cc (copied)
	* code/trunk/src/orxonox/worldentities/EffectContainer.h (copied)
	* code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified)

	Merged presentation2 branch back to trunk.
	Major new features:
	- ...


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:07:44 GMT dafrick [6414]
	* code/branches/pickup2/src/libraries/core/DynLib.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.cc (modified)

	Added changes to presentation2 here as well.


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


Fri, 25 Dec 2009 12:18:03 GMT dafrick [6412]
	* code/branches/pickup2 (modified)
	* code/branches/pickup2/README (modified)
	* code/branches/pickup2/bin/dedicatedClient.bat.in (modified)
	* code/branches/pickup2/bin/dedicatedClient.in (modified)
	* code/branches/pickup2/cmake/CompilerConfigMSVC.cmake (modified)
	* code/branches/pickup2/cmake/FindLua.cmake (modified)
	* code/branches/pickup2/cmake/FindPackageHandleAdvancedArgs.cmake (modified)
	* code/branches/pickup2/cmake/LibraryConfig.cmake (modified)
	* code/branches/pickup2/cmake/LibraryConfigApple.cmake (modified)
	* code/branches/pickup2/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/branches/pickup2/cmake/SourceFileUtilities.cmake (modified)
	* code/branches/pickup2/cmake/TargetUtilities.cmake (modified)
	* code/branches/pickup2/data/DataInstallScript.cmake (modified)
	* code/branches/pickup2/data/DefaultResources.oxr (copied)
	* code/branches/pickup2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/pickup2/data/gui/layouts/AudioMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/ControlsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/CreditsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/DecisionPopup.layout (copied)
	* code/branches/pickup2/data/gui/layouts/GameplayMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/GraphicsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/InGameMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/InfoPopup.layout (copied)
	* code/branches/pickup2/data/gui/layouts/KeyBindMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/pickup2/data/gui/layouts/MainMenuBackground.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MouseControlsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MultiplayerMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/MultiplayerOptionsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/PickupInventory.layout (modified)
	* code/branches/pickup2/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/pickup2/data/gui/layouts/SettingsMenu.layout (copied)
	* code/branches/pickup2/data/gui/layouts/SingleplayerMenu.layout (copied)
	* code/branches/pickup2/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/pickup2/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified)
	* code/branches/pickup2/data/gui/scripts/AudioMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/ControlsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/CreditsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/DecisionPopup.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GUITools.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GameplayMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/GraphicsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InGameMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InfoPopup.lua (copied)
	* code/branches/pickup2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/pickup2/data/gui/scripts/KeyBindMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/pickup2/data/gui/scripts/MouseControlsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MultiplayerMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/MultiplayerOptionsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/pickup2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/pickup2/data/gui/scripts/SettingsMenu.lua (copied)
	* code/branches/pickup2/data/gui/scripts/SingleplayerMenu.lua (copied)
	* code/branches/pickup2/data/levels/empty_level.oxw (modified)
	* code/branches/pickup2/data/levels/events.oxw (modified)
	* code/branches/pickup2/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/pickup2/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/pickup2/data/levels/includes/weaponsettings_HXY.oxi (copied)
	* code/branches/pickup2/data/levels/includes/weaponsettings_Transporter.oxi (copied)
	* code/branches/pickup2/data/levels/includes/weaponsettings_ghost.oxi (copied)
	* code/branches/pickup2/data/levels/old/physicstest.oxw (modified)
	* code/branches/pickup2/data/levels/old/physicstest2.oxw (modified)
	* code/branches/pickup2/data/levels/old/presentation_physics.oxw (modified)
	* code/branches/pickup2/data/levels/old/princessaeryn.oxw (modified)
	* code/branches/pickup2/data/levels/old/questsystem.oxw (modified)
	* code/branches/pickup2/data/levels/old/sample4.oxw (modified)
	* code/branches/pickup2/data/levels/old/spaceshiptemplates_physics.oxw (modified)
	* code/branches/pickup2/data/levels/old/tutorial_hs08.oxw (modified)
	* code/branches/pickup2/data/levels/presentation.oxw (modified)
	* code/branches/pickup2/data/levels/presentation09.oxw (modified)
	* code/branches/pickup2/data/levels/presentation09b.oxw (modified)
	* code/branches/pickup2/data/levels/presentationHS09.oxw (copied)
	* code/branches/pickup2/data/levels/presentationHS09b.oxw (copied)
	* code/branches/pickup2/data/levels/presentation_dm.oxw (modified)
	* code/branches/pickup2/data/levels/princessaeryn.oxw (modified)
	* code/branches/pickup2/data/levels/questsystem2.oxw (copied)
	* code/branches/pickup2/data/levels/sound.oxw (copied)
	* code/branches/pickup2/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/pickup2/data/levels/templates/spaceship_HXY.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_HXY_SL.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_Transporter.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_Transporter_SL.oxt (copied)
	* code/branches/pickup2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/pickup2/data/levels/templates/spaceship_ghost.oxt (copied)
	* code/branches/pickup2/data/levels/test_ghost.oxw (copied)
	* code/branches/pickup2/data/lua/LuaStateInit.lua (modified)
	* code/branches/pickup2/data/overlays/OrxonoxLoading.overlay (modified)
	* code/branches/pickup2/data/overlays/debug.oxo (modified)
	* code/branches/pickup2/data/overlays/hudtemplates3.oxo (modified)
	* code/branches/pickup2/data/overlays/stats.oxo (modified)
	* code/branches/pickup2/data/particle/Steam.particle (copied)
	* code/branches/pickup2/data/particle/bigexplosion.particle (copied)
	* code/branches/pickup2/data/particle/explosion4.particle (copied)
	* code/branches/pickup2/data/particle/laser.particle (copied)
	* code/branches/pickup2/data/particle/load.particle (copied)
	* code/branches/pickup2/data/particle/particlecanon.particle (copied)
	* code/branches/pickup2/data/particle/rocketfire.particle (copied)
	* code/branches/pickup2/data/particle/smoke.particle (copied)
	* code/branches/pickup2/data/particle/tes3.particle (copied)
	* code/branches/pickup2/data/resources.oxr (deleted)
	* code/branches/pickup2/doc/CMakeLists.txt (modified)
	* code/branches/pickup2/doc/api/CMakeLists.txt (modified)
	* code/branches/pickup2/doc/api/doxy.config.in (modified)
	* code/branches/pickup2/doc/api/main.dox (modified)
	* code/branches/pickup2/src/Orxonox.cc (modified)
	* code/branches/pickup2/src/external/ceguilua/CMakeLists.txt (modified)
	* code/branches/pickup2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/core/ArgumentCompletionFunctions.cc (modified)
	* code/branches/pickup2/src/libraries/core/BaseObject.cc (modified)
	* code/branches/pickup2/src/libraries/core/BaseObject.h (modified)
	* code/branches/pickup2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/core/ClassTreeMask.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandEvaluation.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandEvaluation.h (modified)
	* code/branches/pickup2/src/libraries/core/CommandExecutor.cc (modified)
	* code/branches/pickup2/src/libraries/core/CommandExecutor.h (modified)
	* code/branches/pickup2/src/libraries/core/CommandLine.cc (deleted)
	* code/branches/pickup2/src/libraries/core/CommandLine.h (deleted)
	* code/branches/pickup2/src/libraries/core/CommandLineParser.cc (copied)
	* code/branches/pickup2/src/libraries/core/CommandLineParser.h (copied)
	* code/branches/pickup2/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/ConfigFileManager.h (modified)
	* code/branches/pickup2/src/libraries/core/ConfigValueContainer.h (modified)
	* code/branches/pickup2/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/pickup2/src/libraries/core/ConsoleCommandCompilation.cc (modified)
	* code/branches/pickup2/src/libraries/core/Core.cc (modified)
	* code/branches/pickup2/src/libraries/core/Core.h (modified)
	* code/branches/pickup2/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/pickup2/src/libraries/core/DynLib.cc (modified)
	* code/branches/pickup2/src/libraries/core/DynLib.h (modified)
	* code/branches/pickup2/src/libraries/core/DynLibManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/Event.cc (modified)
	* code/branches/pickup2/src/libraries/core/Event.h (modified)
	* code/branches/pickup2/src/libraries/core/EventIncludes.h (modified)
	* code/branches/pickup2/src/libraries/core/Executor.cc (modified)
	* code/branches/pickup2/src/libraries/core/Executor.h (modified)
	* code/branches/pickup2/src/libraries/core/Functor.h (modified)
	* code/branches/pickup2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/GUIManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Game.cc (modified)
	* code/branches/pickup2/src/libraries/core/Game.h (modified)
	* code/branches/pickup2/src/libraries/core/GameMode.h (modified)
	* code/branches/pickup2/src/libraries/core/GameState.cc (modified)
	* code/branches/pickup2/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/pickup2/src/libraries/core/IOConsole.cc (copied)
	* code/branches/pickup2/src/libraries/core/IOConsole.h (copied)
	* code/branches/pickup2/src/libraries/core/IRC.cc (modified)
	* code/branches/pickup2/src/libraries/core/Identifier.cc (modified)
	* code/branches/pickup2/src/libraries/core/Identifier.h (modified)
	* code/branches/pickup2/src/libraries/core/Language.cc (modified)
	* code/branches/pickup2/src/libraries/core/Language.h (modified)
	* code/branches/pickup2/src/libraries/core/Loader.cc (modified)
	* code/branches/pickup2/src/libraries/core/LuaState.cc (modified)
	* code/branches/pickup2/src/libraries/core/LuaState.h (modified)
	* code/branches/pickup2/src/libraries/core/MemoryArchive.cc (modified)
	* code/branches/pickup2/src/libraries/core/MemoryArchive.h (modified)
	* code/branches/pickup2/src/libraries/core/Namespace.cc (modified)
	* code/branches/pickup2/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/pickup2/src/libraries/core/OrxonoxClass.cc (modified)
	* code/branches/pickup2/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/pickup2/src/libraries/core/PathConfig.cc (modified)
	* code/branches/pickup2/src/libraries/core/PathConfig.h (modified)
	* code/branches/pickup2/src/libraries/core/Resource.cc (modified)
	* code/branches/pickup2/src/libraries/core/Resource.h (modified)
	* code/branches/pickup2/src/libraries/core/ScopedSingletonManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/ScopedSingletonManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Shell.cc (modified)
	* code/branches/pickup2/src/libraries/core/Shell.h (modified)
	* code/branches/pickup2/src/libraries/core/SmartPtr.h (modified)
	* code/branches/pickup2/src/libraries/core/SubclassIdentifier.h (modified)
	* code/branches/pickup2/src/libraries/core/TclBind.cc (modified)
	* code/branches/pickup2/src/libraries/core/TclBind.h (modified)
	* code/branches/pickup2/src/libraries/core/TclThreadManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/TclThreadManager.h (modified)
	* code/branches/pickup2/src/libraries/core/Template.cc (modified)
	* code/branches/pickup2/src/libraries/core/Template.h (modified)
	* code/branches/pickup2/src/libraries/core/Thread.cc (modified)
	* code/branches/pickup2/src/libraries/core/Thread.h (modified)
	* code/branches/pickup2/src/libraries/core/ThreadPool.cc (modified)
	* code/branches/pickup2/src/libraries/core/ThreadPool.h (modified)
	* code/branches/pickup2/src/libraries/core/WeakPtr.h (modified)
	* code/branches/pickup2/src/libraries/core/XMLFile.h (modified)
	* code/branches/pickup2/src/libraries/core/XMLPort.h (modified)
	* code/branches/pickup2/src/libraries/core/input/Button.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/Button.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputBuffer.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/InputBuffer.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputCommands.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputDevice.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputHandler.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/InputManager.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/core/input/InputState.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/JoyStick.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinder.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyDetector.cc (modified)
	* code/branches/pickup2/src/libraries/core/input/KeyDetector.h (modified)
	* code/branches/pickup2/src/libraries/core/input/Keyboard.cc (modified)
	* code/branches/pickup2/src/libraries/network/Client.cc (modified)
	* code/branches/pickup2/src/libraries/network/Client.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnection.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/pickup2/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/pickup2/src/libraries/network/ClientInformation.cc (modified)
	* code/branches/pickup2/src/libraries/network/Connection.cc (modified)
	* code/branches/pickup2/src/libraries/network/Connection.h (modified)
	* code/branches/pickup2/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/pickup2/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/pickup2/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/pickup2/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/pickup2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/Host.cc (modified)
	* code/branches/pickup2/src/libraries/network/Host.h (modified)
	* code/branches/pickup2/src/libraries/network/NetworkFunction.cc (modified)
	* code/branches/pickup2/src/libraries/network/NetworkFunction.h (modified)
	* code/branches/pickup2/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/network/Server.cc (modified)
	* code/branches/pickup2/src/libraries/network/Server.h (modified)
	* code/branches/pickup2/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/pickup2/src/libraries/network/ServerConnection.h (modified)
	* code/branches/pickup2/src/libraries/network/TrafficControl.cc (modified)
	* code/branches/pickup2/src/libraries/network/TrafficControl.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Chat.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/ClassID.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/DeleteObjects.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/pickup2/src/libraries/network/packet/Packet.h (modified)
	* code/branches/pickup2/src/libraries/network/packet/Welcome.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallback.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/Serialise.h (copied)
	* code/branches/pickup2/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/pickup2/src/libraries/network/synchronisable/SynchronisableSpecialisations.cc (deleted)
	* code/branches/pickup2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/pickup2/src/libraries/tools/BillboardSet.cc (modified)
	* code/branches/pickup2/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/tools/Mesh.cc (modified)
	* code/branches/pickup2/src/libraries/tools/ParticleInterface.cc (modified)
	* code/branches/pickup2/src/libraries/tools/ResourceCollection.h (modified)
	* code/branches/pickup2/src/libraries/tools/ResourceLocation.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Shader.cc (modified)
	* code/branches/pickup2/src/libraries/tools/TextureGenerator.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Timer.cc (modified)
	* code/branches/pickup2/src/libraries/tools/Timer.h (modified)
	* code/branches/pickup2/src/libraries/tools/interfaces/TimeFactorListener.h (modified)
	* code/branches/pickup2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified)
	* code/branches/pickup2/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/pickup2/src/libraries/util/Clipboard.cc (modified)
	* code/branches/pickup2/src/libraries/util/Clock.cc (modified)
	* code/branches/pickup2/src/libraries/util/Clock.h (modified)
	* code/branches/pickup2/src/libraries/util/Convert.h (modified)
	* code/branches/pickup2/src/libraries/util/Debug.h (modified)
	* code/branches/pickup2/src/libraries/util/DisplayStringConversions.h (copied)
	* code/branches/pickup2/src/libraries/util/Exception.cc (modified)
	* code/branches/pickup2/src/libraries/util/Exception.h (modified)
	* code/branches/pickup2/src/libraries/util/ExprParser.cc (modified)
	* code/branches/pickup2/src/libraries/util/ExprParser.h (modified)
	* code/branches/pickup2/src/libraries/util/Math.cc (modified)
	* code/branches/pickup2/src/libraries/util/Math.h (modified)
	* code/branches/pickup2/src/libraries/util/MathConvert.h (modified)
	* code/branches/pickup2/src/libraries/util/MultiType.h (modified)
	* code/branches/pickup2/src/libraries/util/MultiTypeValue.h (modified)
	* code/branches/pickup2/src/libraries/util/OrxAssert.h (modified)
	* code/branches/pickup2/src/libraries/util/OutputBuffer.cc (deleted)
	* code/branches/pickup2/src/libraries/util/OutputBuffer.h (deleted)
	* code/branches/pickup2/src/libraries/util/OutputHandler.cc (modified)
	* code/branches/pickup2/src/libraries/util/OutputHandler.h (modified)
	* code/branches/pickup2/src/libraries/util/Serialise.h (modified)
	* code/branches/pickup2/src/libraries/util/Singleton.h (modified)
	* code/branches/pickup2/src/libraries/util/StringUtils.cc (modified)
	* code/branches/pickup2/src/libraries/util/SubString.cc (modified)
	* code/branches/pickup2/src/libraries/util/UTFStringConversions.h (deleted)
	* code/branches/pickup2/src/libraries/util/UtilPrereqs.h (modified)
	* code/branches/pickup2/src/libraries/util/mbool.h (modified)
	* code/branches/pickup2/src/modules/objects/Attacher.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/branches/pickup2/src/modules/objects/eventsystem/EventTarget.h (modified)
	* code/branches/pickup2/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/pickup2/src/modules/objects/triggers/Trigger.cc (modified)
	* code/branches/pickup2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/pickup2/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDHealthBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDHealthBar.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/pickup2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified)
	* code/branches/pickup2/src/modules/overlays/hud/UnderAttackHealthBar.h (modified)
	* code/branches/pickup2/src/modules/overlays/stats/CreateLines.cc (modified)
	* code/branches/pickup2/src/modules/overlays/stats/CreateLines.h (modified)
	* code/branches/pickup2/src/modules/overlays/stats/Scoreboard.cc (modified)
	* code/branches/pickup2/src/modules/pong/Pong.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongAI.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongBall.cc (modified)
	* code/branches/pickup2/src/modules/pong/PongScore.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/AddQuestHint.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/AddReward.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/ChangeQuestStatus.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/CompleteQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/FailQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/LocalQuest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/Quest.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestEffect.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUI.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUI.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestGUINode.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestHint.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestManager.h (modified)
	* code/branches/pickup2/src/modules/questsystem/QuestNotification.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/NotificationManager.cc (modified)
	* code/branches/pickup2/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/pickup2/src/modules/weapons/projectiles/Rocket.cc (copied)
	* code/branches/pickup2/src/modules/weapons/projectiles/Rocket.h (copied)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.h (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/LightningGun.h (modified)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/RocketFire.cc (copied)
	* code/branches/pickup2/src/modules/weapons/weaponmodes/RocketFire.h (copied)
	* code/branches/pickup2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/CameraManager.cc (modified)
	* code/branches/pickup2/src/orxonox/Level.cc (modified)
	* code/branches/pickup2/src/orxonox/LevelManager.cc (modified)
	* code/branches/pickup2/src/orxonox/LevelManager.h (modified)
	* code/branches/pickup2/src/orxonox/Main.cc (modified)
	* code/branches/pickup2/src/orxonox/MoodManager.cc (copied)
	* code/branches/pickup2/src/orxonox/MoodManager.h (copied)
	* code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/pickup2/src/orxonox/PlayerManager.cc (modified)
	* code/branches/pickup2/src/orxonox/PlayerManager.h (modified)
	* code/branches/pickup2/src/orxonox/Radar.cc (modified)
	* code/branches/pickup2/src/orxonox/Radar.h (modified)
	* code/branches/pickup2/src/orxonox/Scene.cc (modified)
	* code/branches/pickup2/src/orxonox/Scene.h (modified)
	* code/branches/pickup2/src/orxonox/Test.cc (modified)
	* code/branches/pickup2/src/orxonox/Test.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/pickup2/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/pickup2/src/orxonox/controllers/NewHumanController.cc (copied)
	* code/branches/pickup2/src/orxonox/controllers/NewHumanController.h (copied)
	* code/branches/pickup2/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicated.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicated.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicatedClient.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSDedicatedClient.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSIOConsole.cc (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSIOConsole.h (deleted)
	* code/branches/pickup2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSRoot.h (modified)
	* code/branches/pickup2/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/pickup2/src/orxonox/gametypes/TeamDeathmatch.cc (modified)
	* code/branches/pickup2/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/BlinkingBillboard.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/pickup2/src/orxonox/graphics/Camera.h (modified)
	* code/branches/pickup2/src/orxonox/infos/Bot.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/pickup2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/pickup2/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/pickup2/src/orxonox/interfaces/Rewardable.h (modified)
	* code/branches/pickup2/src/orxonox/items/Engine.h (modified)
	* code/branches/pickup2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/pickup2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/InGameConsole.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/Map.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/pickup2/src/orxonox/overlays/OverlayGroup.cc (modified)
	* code/branches/pickup2/src/orxonox/overlays/OverlayGroup.h (modified)
	* code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (added)
	* code/branches/pickup2/src/orxonox/pickup/ModifierPickup.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupCollection.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (added)
	* code/branches/pickup2/src/orxonox/pickup/UsableItem.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/pickup2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/pickup2/src/orxonox/sound/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundBuffer.cc (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundBuffer.h (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/pickup2/src/orxonox/sound/SoundStreamer.cc (copied)
	* code/branches/pickup2/src/orxonox/sound/SoundStreamer.h (copied)
	* code/branches/pickup2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/pickup2/src/orxonox/sound/WorldSound.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/pickup2/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/EffectContainer.cc (copied)
	* code/branches/pickup2/src/orxonox/worldentities/EffectContainer.h (copied)
	* code/branches/pickup2/src/orxonox/worldentities/MovableEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/MovableEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Spectator.h (modified)

	Merged presentation2 branch into pickup2 branch.


Thu, 24 Dec 2009 15:01:23 GMT rgrieder [6411]
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)

	BaseSound should release the buffer upon destruction and the ...


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

	Just a small mistake...


Thu, 24 Dec 2009 07:54:33 GMT rgrieder [6409]
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)

	Better sound source management: Sources are created on demand with a ...


Thu, 24 Dec 2009 07:49:57 GMT rgrieder [6408]
	* code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc (modified)

	Main loop optimisations.


Wed, 23 Dec 2009 21:03:08 GMT rgrieder [6407]
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc (modified)

	WeaponSlots should not be synchronised.


Wed, 23 Dec 2009 19:45:56 GMT rgrieder [6406]
	* code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified)

	Mood changes should now be working and with immediate (but delayed ...


Wed, 23 Dec 2009 19:27:17 GMT dafrick [6405]
	* code/branches/pickup2/src/libraries/core/Super.h (modified)
	* code/branches/pickup2/src/modules/CMakeLists.txt (modified)
	* code/branches/pickup2/src/modules/pickup (added)
	* code/branches/pickup2/src/modules/pickup/CMakeLists.txt (added)
	* code/branches/pickup2/src/modules/pickup/DroppedItem.cc (moved)
	* code/branches/pickup2/src/modules/pickup/DroppedItem.h (moved)
	* code/branches/pickup2/src/modules/pickup/PickupCollection.cc (added)
	* code/branches/pickup2/src/modules/pickup/PickupCollection.h (added)
	* code/branches/pickup2/src/modules/pickup/PickupPrecompiledHeaders.h (added)
	* code/branches/pickup2/src/modules/pickup/PickupPrereqs.h (added)
	* code/branches/pickup2/src/modules/pickup/PickupSpawner.cc (moved)
	* code/branches/pickup2/src/modules/pickup/PickupSpawner.h (moved)
	* code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/branches/pickup2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/pickup2/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/branches/pickup2/src/orxonox/interfaces/PickupCarrier.h (added)
	* code/branches/pickup2/src/orxonox/interfaces/Pickupable.h (added)
	* code/branches/pickup2/src/orxonox/items/Engine.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/CMakeLists.txt (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupCollection.cc (modified)
	* code/branches/pickup2/src/orxonox/pickup/PickupCollection.h (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Commit changes in pickup before merge.


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 22:20:19 GMT rgrieder [6403]
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2/data/lua/LuaStateInit.lua (modified)

	Added lua convenience function for console commmands: ...


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:38:34 GMT rgrieder [6401]
	* code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified)

	Removed useless damage_ config value from Projectile. Rather use the ...


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 19:44:50 GMT rgrieder [6398]
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSlot.cc (modified)

	Fixed weapon sound synchronisation.


Tue, 22 Dec 2009 19:44:07 GMT rgrieder [6397]
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)

	Fixed obviously pointless statement order in BaseSound.


Tue, 22 Dec 2009 19:35:05 GMT rgrieder [6396]
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)

	Fixed space ship boost sound synchronisation.


Tue, 22 Dec 2009 13:45:18 GMT rgrieder [6395]
	* code/branches/presentation2/src/Orxonox.cc (modified)

	Adding pointers here is pointless.


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 15:24:19 GMT rgrieder [6393]
	* code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)

	Removed two gcc warnings.


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 13:03:59 GMT rgrieder [6391]
	* code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)

	Moved forward declarations to the Prereqs files.


Mon, 21 Dec 2009 12:49:34 GMT rgrieder [6390]
	* code/branches/console (deleted)
	* code/branches/ggz (deleted)
	* code/branches/menu (deleted)
	* code/branches/particles2 (deleted)
	* code/branches/pickup (deleted)
	* code/branches/sound3 (deleted)
	* code/branches/steering (deleted)

	Deleting old branches.


Mon, 21 Dec 2009 12:45:56 GMT rgrieder [6389]
	* 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/includes/weaponsettings_ghost.oxi (modified)
	* code/branches/presentation2/data/levels/old/physicstest2.oxw (modified)
	* code/branches/presentation2/data/levels/old/presentation_physics.oxw (modified)
	* code/branches/presentation2/data/levels/old/princessaeryn.oxw (modified)
	* code/branches/presentation2/data/levels/old/questsystem.oxw (modified)
	* code/branches/presentation2/data/levels/old/sample4.oxw (modified)
	* code/branches/presentation2/data/levels/presentation.oxw (modified)
	* code/branches/presentation2/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation2/data/levels/princessaeryn.oxw (modified)
	* code/branches/presentation2/data/levels/sound.oxw (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)

	Found some inappropriate tabs.


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


Sat, 19 Dec 2009 21:14:08 GMT rgrieder [6383]
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.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)

	Fixed a major sound issue: The state gets reset to 'Stopped' when the ...


Fri, 18 Dec 2009 23:18:41 GMT rgrieder [6382]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation2/data/levels/sound.oxw (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_HXY.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter.oxt (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/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified)

	Several small changes in sound:
	- Fixed a bug that caused a sound ...


Fri, 18 Dec 2009 23:07:32 GMT rgrieder [6381]
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/orxonox/Scene.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)

	Copy&paste for dummies in Scene.cc (caused fire sound to be very ...


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


Fri, 18 Dec 2009 11:29:54 GMT rgrieder [6377]
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	Little code cleanup in NewHumanController.


Thu, 17 Dec 2009 23:17:28 GMT rgrieder [6376]
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)

	Removed some more debug output.


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:52:45 GMT rgrieder [6372]
	* code/branches/presentation2/src/orxonox/Scene.cc (modified)
	* code/branches/presentation2/src/orxonox/Scene.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)

	Added new XML parameter for the Scene: soundReferenceDistance.
	This ...


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 10:10:39 GMT rgrieder [6370]
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified)

	Little cleanup in sound stuff and MoodManager.
	Caution: Renamed ...


Thu, 17 Dec 2009 09:57:08 GMT rgrieder [6369]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Belongs to r6367, forgot to tick a file for the commit.


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:43:36 GMT rgrieder [6365]
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)

	Fixed segfault (when hitting tab in main menu) and second mode ...


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 11:35:48 GMT scheusso [6362]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	joystick names are pretty now


Wed, 16 Dec 2009 10:28:11 GMT rgrieder [6361]
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified)

	Temporary fix for the missing munition type.


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.


Tue, 15 Dec 2009 23:23:37 GMT decapitb [6359]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	some minor changes


Tue, 15 Dec 2009 22:59:42 GMT decapitb [6358]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	a rocket near the ghost ships triggers an attack (obviously they feel ...


Tue, 15 Dec 2009 22:58:25 GMT decapitb [6357]
	* code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified)

	adjusted speed of the ghost spaceship, the demo won't be so slow now


Tue, 15 Dec 2009 22:04:39 GMT scheusso [6356]
	* 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/worldentities/pawns/Pawn.cc (modified)

	god mode hack for presentation


Tue, 15 Dec 2009 16:02:22 GMT dafrick [6355]
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Made KeyBindMenu less Resolution dependent, because of this the ...


Mon, 14 Dec 2009 23:16:06 GMT erwin [6354]
	* code/branches/presentation2/src/orxonox/sound/CMakeLists.txt (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc (added)
	* code/branches/presentation2/src/orxonox/sound/SoundStreamer.h (added)

	Implemented streamer thread, TODO: patch SoundBuffer to use it


Mon, 14 Dec 2009 20:38:31 GMT dafrick [6353]
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)

	Adjusted scroll step size to allow for scrolling that is actually
	useful.


Mon, 14 Dec 2009 19:47:00 GMT dafrick [6352]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Adjusted commandButton size to fit the new commands.
	Expanded ...


Mon, 14 Dec 2009 19:20:08 GMT scheusso [6351]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	keybinding now possible without scrolling again and again


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:51:34 GMT rgrieder [6349]
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (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/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)

	Overriding preDestroy() in AmbientSound to make them fade out when ...


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


Sun, 13 Dec 2009 19:45:30 GMT decapitb [6347]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	added a second asteroid field with "ghost" and enemies


Sun, 13 Dec 2009 19:39:18 GMT scheusso [6346]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	added additional keybinds (which i find usefull)


Sun, 13 Dec 2009 19:37:31 GMT decapitb [6345]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	added some "ghost ships" and a destroyer


Sun, 13 Dec 2009 19:32:03 GMT decapitb [6344]
	* code/branches/presentation2/data/levels/templates/spaceship_ghost_SL.oxt (deleted)

	useless


Sun, 13 Dec 2009 19:30:31 GMT decapitb [6343]
	* code/branches/presentation2/data/levels/templates/spaceship_HXY.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_HXY_SL.oxt (added)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter.oxt (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter_SL.oxt (added)
	* code/branches/presentation2/data/levels/templates/spaceship_ghost_SL.oxt (added)

	added sounless (_SL) Templates for ghost, hxy and transporter to ...


Sun, 13 Dec 2009 18:00:33 GMT decapitb [6342]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	added Transporter to the level, not too happy with the result yet


Sun, 13 Dec 2009 17:56:56 GMT decapitb [6341]
	* code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi (added)
	* code/branches/presentation2/data/levels/templates/spaceship_Transporter.oxt (added)

	added weapons and effects to the Transporter


Sun, 13 Dec 2009 16:39:22 GMT rgrieder [6340]
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified)

	Fixed bug: Ambient sounds were sometimes not played at all (caused by ...


Sun, 13 Dec 2009 16:35:59 GMT dafrick [6339]
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Undid an error I mad while removing empty lines. Quitting from ...


Sun, 13 Dec 2009 16:02:08 GMT youngk [6338]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (modified)

	Added a little sound to the presentation level.


Sun, 13 Dec 2009 12:49:37 GMT dafrick [6336]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Forgot to remove debug output...


Sun, 13 Dec 2009 12:46:28 GMT dafrick [6335]
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Removed empty lines.
	Adjusted size of boxes in KeyBindMenu so that ...


Sun, 13 Dec 2009 12:12:13 GMT cmueri [6334]
	* code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InfoPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua (deleted)

	All the menus (inclusive InGameMenus) have an equal design, some ...


Sat, 12 Dec 2009 23:46:54 GMT landauf [6333]
	* code/branches/consolecommands (copied)

	~


Sat, 12 Dec 2009 23:11:40 GMT rgrieder [6332]
	* code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundBuffer.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)

	Improved SoundBuffer class design and removed its pooling property ...