#
# ChangeLog for code/branches/output/src/libraries
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 5:48:13 PM

Sun, 31 Jul 2011 15:15:13 GMT landauf [8806]
	* code/branches/output/src/libraries/core/BaseObject.cc (modified)
	* code/branches/output/src/libraries/core/ClassFactory.h (modified)
	* code/branches/output/src/libraries/core/CommandLineParser.cc (modified)
	* code/branches/output/src/libraries/core/CommandLineParser.h (modified)
	* code/branches/output/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/output/src/libraries/core/ConfigValueContainer.cc (modified)
	* code/branches/output/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/branches/output/src/libraries/core/Core.cc (modified)
	* code/branches/output/src/libraries/core/DynLib.cc (modified)
	* code/branches/output/src/libraries/core/Event.cc (modified)
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/Game.cc (modified)
	* code/branches/output/src/libraries/core/Game.h (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/Identifier.cc (modified)
	* code/branches/output/src/libraries/core/Identifier.h (modified)
	* code/branches/output/src/libraries/core/Language.cc (modified)
	* code/branches/output/src/libraries/core/Language.h (modified)
	* code/branches/output/src/libraries/core/Loader.cc (modified)
	* code/branches/output/src/libraries/core/LuaState.cc (modified)
	* code/branches/output/src/libraries/core/MetaObjectList.cc (modified)
	* code/branches/output/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/output/src/libraries/core/OrxonoxClass.cc (modified)
	* code/branches/output/src/libraries/core/PathConfig.cc (modified)
	* code/branches/output/src/libraries/core/SubclassIdentifier.h (modified)
	* code/branches/output/src/libraries/core/Super.h (modified)
	* code/branches/output/src/libraries/core/Template.cc (modified)
	* code/branches/output/src/libraries/core/WeakPtr.h (modified)
	* code/branches/output/src/libraries/core/XMLPort.cc (modified)
	* code/branches/output/src/libraries/core/XMLPort.h (modified)
	* code/branches/output/src/libraries/core/command/CommandEvaluation.cc (modified)
	* code/branches/output/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/output/src/libraries/core/command/ConsoleCommand.cc (modified)
	* code/branches/output/src/libraries/core/command/ConsoleCommand.h (modified)
	* code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc (modified)
	* code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.h (modified)
	* code/branches/output/src/libraries/core/command/Executor.cc (modified)
	* code/branches/output/src/libraries/core/command/Executor.h (modified)
	* code/branches/output/src/libraries/core/command/Functor.h (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/IRC.cc (modified)
	* code/branches/output/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/output/src/libraries/core/command/TclThreadManager.cc (modified)
	* code/branches/output/src/libraries/core/input/Button.cc (modified)
	* code/branches/output/src/libraries/core/input/InputDevice.h (modified)
	* code/branches/output/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/output/src/libraries/core/input/JoyStick.cc (modified)
	* code/branches/output/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/output/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/output/src/libraries/util/Sleep.cc (modified)
	* code/branches/output/src/libraries/util/SubString.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	Replaced COUT with orxout in core. Tried to set levels and contexts ...


Sun, 31 Jul 2011 09:45:56 GMT landauf [8805]
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)

	added new output level "message" for output directed to the user


Sat, 30 Jul 2011 21:06:36 GMT landauf [8804]
	* code/branches/output/src/libraries/util/Clipboard.cc (modified)
	* code/branches/output/src/libraries/util/Convert.h (modified)
	* code/branches/output/src/libraries/util/Exception.cc (modified)
	* code/branches/output/src/libraries/util/Exception.h (modified)
	* code/branches/output/src/libraries/util/ExprParser.h (modified)
	* code/branches/output/src/libraries/util/MultiType.h (modified)
	* code/branches/output/src/libraries/util/OrxAssert.h (modified)
	* code/branches/output/src/libraries/util/Scope.h (modified)
	* code/branches/output/src/libraries/util/ScopedSingletonManager.h (modified)
	* code/branches/output/src/libraries/util/SignalHandler.cc (modified)
	* code/branches/output/src/libraries/util/Singleton.h (modified)
	* code/branches/output/src/libraries/util/Sleep.cc (modified)
	* code/branches/output/src/libraries/util/SubString.cc (modified)
	* code/branches/output/src/libraries/util/SubString.h (modified)

	Replaced COUT in util with orxout.
	Used user_error for Exceptions ...


Sat, 30 Jul 2011 20:05:49 GMT landauf [8803]
	* code/branches/output/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)

	no \n needed after executed command in shell.
	different color for ...


Sat, 30 Jul 2011 19:31:05 GMT landauf [8801]
	* code/branches/output/src/libraries/core/LuaState.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/libraries/util/StringUtils.cc (modified)
	* code/branches/output/src/libraries/util/StringUtils.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)

	fixed bug with multiple lines in shell.
	adjusted colors in IOConsole ...


Sat, 30 Jul 2011 17:51:08 GMT landauf [8799]
	* code/branches/output/src/libraries/core/Core.cc (modified)
	* code/branches/output/src/libraries/core/Core.h (modified)
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.h (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)

	Code related to config values for output is now implemented in ...


Sat, 30 Jul 2011 13:55:35 GMT landauf [8798]
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/GUIManager.h (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	adjusted output levels for ogre and cegui messages
	added config ...


Sat, 30 Jul 2011 08:39:33 GMT landauf [8797]
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.h (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.h (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.h (modified)

	removed onlyLastLineChanged() callback from ShellListener, since it's ...


Fri, 29 Jul 2011 22:54:55 GMT landauf [8796]
	* code/branches/output/src/libraries/core/Core.cc (modified)
	* code/branches/output/src/libraries/core/Core.h (modified)
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/LuaState.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	adjusted the rest of the code to the new output system, but some ...


Fri, 29 Jul 2011 20:26:45 GMT landauf [8795]
	* code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/branches/output/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.h (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.h (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.h (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)

	Shell and its derivatives are now based on the new output system


Thu, 28 Jul 2011 20:35:41 GMT landauf [8794]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.cc (added)
	* code/branches/output/src/libraries/util/output/BaseWriter.h (added)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.h (modified)
	* code/branches/output/src/libraries/util/output/MemoryWriter.h (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)

	added BaseWriter, a common base class of ConsoleWriter, LogWriter, ...


Tue, 26 Jul 2011 09:06:01 GMT landauf [8789]
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	some small details, allow direct usage of OutputStream()


Mon, 25 Jul 2011 22:05:23 GMT landauf [8788]
	* code/branches/output/src/Orxonox.cc (modified)
	* code/branches/output/src/libraries/core/ClassFactory.h (modified)
	* code/branches/output/src/libraries/core/CommandLineParser.cc (modified)
	* code/branches/output/src/libraries/core/Core.cc (modified)
	* code/branches/output/src/libraries/core/CoreIncludes.h (modified)
	* code/branches/output/src/libraries/core/CorePrecompiledHeaders.h (modified)
	* code/branches/output/src/libraries/core/GUIManager.cc (modified)
	* code/branches/output/src/libraries/core/Game.cc (modified)
	* code/branches/output/src/libraries/core/Game.h (modified)
	* code/branches/output/src/libraries/core/GameState.cc (modified)
	* code/branches/output/src/libraries/core/Identifier.h (modified)
	* code/branches/output/src/libraries/core/Language.cc (modified)
	* code/branches/output/src/libraries/core/Loader.cc (modified)
	* code/branches/output/src/libraries/core/LuaState.cc (modified)
	* code/branches/output/src/libraries/core/MetaObjectList.cc (modified)
	* code/branches/output/src/libraries/core/NamespaceNode.cc (modified)
	* code/branches/output/src/libraries/core/PathConfig.cc (modified)
	* code/branches/output/src/libraries/core/SubclassIdentifier.h (modified)
	* code/branches/output/src/libraries/core/Super.h (modified)
	* code/branches/output/src/libraries/core/Template.cc (modified)
	* code/branches/output/src/libraries/core/XMLPort.h (modified)
	* code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc (modified)
	* code/branches/output/src/libraries/core/command/Executor.cc (modified)
	* code/branches/output/src/libraries/core/command/Functor.h (modified)
	* code/branches/output/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/output/src/libraries/core/input/Button.cc (modified)
	* code/branches/output/src/libraries/core/input/InputDevice.h (modified)
	* code/branches/output/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/output/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/output/src/libraries/network/Client.cc (modified)
	* code/branches/output/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/output/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/output/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/output/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h (modified)
	* code/branches/output/src/libraries/network/Server.cc (modified)
	* code/branches/output/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/output/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/output/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/output/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/output/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/output/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/output/src/libraries/network/packet/Welcome.cc (modified)
	* code/branches/output/src/libraries/util/Clipboard.cc (modified)
	* code/branches/output/src/libraries/util/Convert.h (modified)
	* code/branches/output/src/libraries/util/Exception.cc (modified)
	* code/branches/output/src/libraries/util/Exception.h (modified)
	* code/branches/output/src/libraries/util/OrxAssert.h (modified)
	* code/branches/output/src/libraries/util/Scope.h (modified)
	* code/branches/output/src/libraries/util/SignalHandler.cc (modified)
	* code/branches/output/src/libraries/util/Sleep.cc (modified)
	* code/branches/output/src/libraries/util/SubString.cc (modified)
	* code/branches/output/src/modules/weapons/RocketController.cc (modified)
	* code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSServer.cc (modified)

	changed includes from Debug.h to Output.h
	doesn't compile.


Mon, 25 Jul 2011 21:53:17 GMT landauf [8787]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/Debug.h (deleted)
	* code/branches/output/src/libraries/util/Output.h (modified)
	* code/branches/output/src/libraries/util/OutputHandler.cc (deleted)
	* code/branches/output/src/libraries/util/OutputHandler.h (deleted)
	* code/branches/output/src/libraries/util/UtilPrereqs.h (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.h (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.h (modified)
	* code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/MemoryWriter.h (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	removed Debug.h and OutputHandler. removed test namespace from new ...


Mon, 25 Jul 2011 18:03:05 GMT landauf [8780]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.cc (added)
	* code/branches/output/src/libraries/util/output/ConsoleWriter.h (added)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)

	added ConsoleWriter


Mon, 25 Jul 2011 16:28:57 GMT landauf [8779]
	* code/branches/output/src/libraries/util/Output.h (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	small changes regarding context functions and orxout()


Mon, 25 Jul 2011 13:00:29 GMT landauf [8778]
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	guess we can afford a small macro in this case


Mon, 25 Jul 2011 12:47:49 GMT landauf [8777]
	* code/branches/output/src/libraries/util/Output.h (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	output contexts are now defined as functions instead of global ...


Mon, 25 Jul 2011 11:05:04 GMT landauf [8776]
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)

	in OutputManager: getInstance now only creates an instance of ...


Sun, 24 Jul 2011 22:01:30 GMT landauf [8775]
	* code/branches/output/src/libraries/util/OutputHandler.cc (modified)

	fixed problem with static initialization in old implementation of the ...


Sun, 24 Jul 2011 21:50:20 GMT landauf [8774]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (added)
	* code/branches/output/src/libraries/util/output/LogWriter.h (added)
	* code/branches/output/src/libraries/util/output/MemoryWriter.cc (added)
	* code/branches/output/src/libraries/util/output/MemoryWriter.h (added)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)

	added LogWriter and MemoryWriter


Sun, 24 Jul 2011 14:09:41 GMT landauf [8772]
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)

	send the lines of a message as a vector to the output listeners


Sat, 23 Jul 2011 23:22:11 GMT landauf [8771]
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.h (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	added function to register new output contexts.
	OutputManager owns ...


Tue, 19 Jul 2011 19:26:32 GMT landauf [8765]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/Output.h (added)
	* code/branches/output/src/libraries/util/output (added)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (added)
	* code/branches/output/src/libraries/util/output/OutputListener.cc (added)
	* code/branches/output/src/libraries/util/output/OutputListener.h (added)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (added)
	* code/branches/output/src/libraries/util/output/OutputManager.h (added)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (added)
	* code/branches/output/src/libraries/util/output/OutputStream.h (added)

	added draft for the the new output system


Sun, 10 Jul 2011 08:41:13 GMT landauf [8739]
	* code/branches/output (copied)

	created new branch to work on the console- and log-output


Mon, 04 Jul 2011 00:47:44 GMT rgrieder [8729]
	* code/trunk (modified)
	* code/trunk/cmake/CompilerConfigGCC.cmake (modified)
	* code/trunk/cmake/CompilerConfigMSVC.cmake (modified)
	* code/trunk/cmake/tools/BuildUnits.cmake (copied)
	* code/trunk/cmake/tools/GenerateToluaBindings.cmake (modified)
	* code/trunk/cmake/tools/SourceFileUtilities.cmake (modified)
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified)
	* code/trunk/data/gui/scripts/ChatBox.lua (modified)
	* code/trunk/data/gui/scripts/MenuSheet.lua (modified)
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/data/gui/scripts/NotificationLayer.lua (modified)
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/data/lua/Tools.lua (modified)
	* code/trunk/src/BuildUnitsConfigGCC.cmake (copied)
	* code/trunk/src/BuildUnitsConfigMSVC.cmake (copied)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/OrxonoxConfig.cmake (modified)
	* code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified)
	* code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified)
	* code/trunk/src/external/bullet/CMakeLists.txt (modified)
	* code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified)
	* code/trunk/src/external/enet/CMakeLists.txt (modified)
	* code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/trunk/src/external/ois/CMakeLists.txt (modified)
	* code/trunk/src/external/ois/linux/CMakeLists.txt (modified)
	* code/trunk/src/external/ois/mac/CMakeLists.txt (modified)
	* code/trunk/src/external/ois/win32/CMakeLists.txt (modified)
	* code/trunk/src/external/tinyxml/CMakeLists.txt (modified)
	* code/trunk/src/external/tolua/lua/basic.lua (modified)
	* code/trunk/src/external/tolua/lua/package.lua (modified)
	* code/trunk/src/libraries/core/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/CommandLineParser.cc (modified)
	* code/trunk/src/libraries/core/CommandLineParser.h (modified)
	* code/trunk/src/libraries/core/ConfigValueIncludes.h (modified)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/Core.h (modified)
	* code/trunk/src/libraries/core/CoreIncludes.h (modified)
	* code/trunk/src/libraries/core/EventIncludes.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/LuaState.cc (modified)
	* code/trunk/src/libraries/core/LuaState.h (modified)
	* code/trunk/src/libraries/core/ObjectListBase.h (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/PathConfig.cc (modified)
	* code/trunk/src/libraries/core/Super.h (modified)
	* code/trunk/src/libraries/core/ToluaInterface.h (deleted)
	* code/trunk/src/libraries/core/ToluaInterfaceHook.lua (copied)
	* code/trunk/src/libraries/core/ViewportEventListener.h (modified)
	* code/trunk/src/libraries/core/command/Functor.h (modified)
	* code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified)
	* code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified)
	* code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified)
	* code/trunk/src/libraries/core/command/Shell.cc (modified)
	* code/trunk/src/libraries/core/command/Shell.h (modified)
	* code/trunk/src/libraries/core/input/InputHandler.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/InputState.h (modified)
	* code/trunk/src/libraries/core/input/JoyStick.h (modified)
	* code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified)
	* code/trunk/src/libraries/core/input/KeyBinderManager.h (modified)
	* code/trunk/src/libraries/core/input/KeyDetector.h (modified)
	* code/trunk/src/libraries/core/input/Keyboard.h (modified)
	* code/trunk/src/libraries/core/input/Mouse.cc (modified)
	* code/trunk/src/libraries/network/WANDiscoverable.h (modified)
	* code/trunk/src/libraries/network/packet/CMakeLists.txt (modified)
	* code/trunk/src/libraries/tools/CMakeLists.txt (modified)
	* code/trunk/src/libraries/tools/Shader.h (modified)
	* code/trunk/src/libraries/tools/Timer.cc (modified)
	* code/trunk/src/libraries/tools/Timer.h (modified)
	* code/trunk/src/libraries/util/CMakeLists.txt (modified)
	* code/trunk/src/libraries/util/Convert.h (modified)
	* code/trunk/src/libraries/util/Debug.h (modified)
	* code/trunk/src/libraries/util/Math.h (modified)
	* code/trunk/src/libraries/util/OutputHandler.cc (modified)
	* code/trunk/src/libraries/util/OutputHandler.h (modified)
	* code/trunk/src/libraries/util/TriBool.h (deleted)
	* code/trunk/src/libraries/util/UtilPrereqs.h (modified)
	* code/trunk/src/libraries/util/tribool.h (copied)
	* code/trunk/src/modules/docking/Dock.cc (modified)
	* code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pong/CMakeLists.txt (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/questsystem/QuestManager.cc (modified)
	* code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/controllers/AIController.cc (modified)
	* code/trunk/src/orxonox/controllers/AIController.h (modified)
	* code/trunk/src/orxonox/controllers/DroneController.cc (modified)
	* code/trunk/src/orxonox/controllers/DroneController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/trunk/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/trunk/src/orxonox/sound/BaseSound.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/Munition.cc (modified)
	* code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified)

	Merged unity_build branch back to trunk.

	Features:
	- Implemented ...