#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 14, 2024, 5:53:40 AM

Tue, 01 Nov 2011 18:25:24 GMT jo [8910]
	* code/branches/gamecontent/data/levels/missionOne.oxw (modified)




Fri, 28 Oct 2011 16:09:10 GMT jo [8909]
	* code/branches/gamecontent/data/levels/missionOne.oxw (modified)
	* code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc (modified)

	On the way to add quests. Combined distance trigger does not act as ...


Wed, 26 Oct 2011 18:34:40 GMT willis [8908]
	* code/branches/formation/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/formation/src/orxonox/controllers/ArtificialController.h (modified)

	formationflight: different form of formation + correct orientation
	added


Wed, 26 Oct 2011 14:22:52 GMT jo [8907]
	* code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h (added)

	Started to create an interface to make objects belong to a group.


Wed, 26 Oct 2011 14:10:30 GMT mspaling [8906]
	* code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hud/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/hud/src/orxonox/interfaces/RadarViewable.h (modified)

	names added in hud


Tue, 25 Oct 2011 20:56:31 GMT jo [8904]
	* code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified)
	* code/branches/gamecontent/data/levels/missionOne.oxw (modified)
	* code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt (modified)
	* code/branches/gamecontent/src/modules/pong/Pong.cc (modified)
	* code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.h (modified)
	* code/branches/gamecontent/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/gamecontent/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/gamecontent/src/orxonox/gametypes/Mission.cc (added)
	* code/branches/gamecontent/src/orxonox/gametypes/Mission.h (added)
	* code/branches/gamecontent/src/orxonox/gametypes/TeamDeathmatch.h (modified)
	* code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (modified)
	* code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (modified)
	* code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	On the way to a multiplayer gametype basceclass.


Fri, 21 Oct 2011 13:28:08 GMT jo [8901]
	* code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc (added)
	* code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h (added)

	Prototype of a baseclass for team gametypes. Work in progress.


Wed, 19 Oct 2011 21:02:56 GMT jo [8900]
	* code/branches/gamecontent/src/modules/pong/Pong.cc (modified)
	* code/branches/gamecontent/src/modules/pong/Pong.h (modified)
	* code/branches/gamecontent/src/modules/pong/PongScore.cc (modified)
	* code/branches/gamecontent/src/modules/pong/PongScore.h (modified)

	Finished Polishing Pong. (gametype ends properly now, points ...


Wed, 19 Oct 2011 14:23:22 GMT jo [8899]
	* code/branches/gamecontent/src/orxonox/gametypes/CMakeLists.txt (modified)

	Trying to add teamgametype as baseclass.


Wed, 19 Oct 2011 14:21:48 GMT eceline [8898]
	* code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/spaceraceTwo/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/spaceraceTwo/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/spaceraceTwo/src/orxonox/infos/GametypeInfo.cc (modified)

	Space Race mit countdown


Wed, 19 Oct 2011 14:18:16 GMT mspaling [8897]
	* code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified)

	Names for RadarViewablese added for later use in HUD


Wed, 19 Oct 2011 14:16:25 GMT mspaling [8896]
	* code/branches/hud/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/hud/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/hud/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/hud/src/orxonox/interfaces/RadarViewable.h (modified)

	Names for RadarViewablese added for later use in HUD


Thu, 13 Oct 2011 18:59:27 GMT jo [8895]
	* code/branches/gamecontent/src/modules/pong/Pong.cc (modified)
	* code/branches/gamecontent/src/modules/pong/Pong.h (modified)
	* code/branches/gamecontent/src/modules/pong/PongAI.h (modified)

	Added end to pong gametype. Unfortunately the hud isn't consistent at ...


Wed, 12 Oct 2011 19:48:04 GMT baermatt [8894]
	* code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified)

	Added tabs in Singleplayer level selection menu.


Wed, 12 Oct 2011 18:57:07 GMT jo [8893]
	* code/branches/gamecontent (copied)




Wed, 12 Oct 2011 14:04:35 GMT baermatt [8890]
	* code/branches/menue/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/menue/data/gui/scripts/SingleplayerMenu.lua (modified)

	First steps with lua, CEGUI and the Singleplayer menu.


Wed, 12 Oct 2011 14:01:30 GMT fmauro [8889]
	* code/branches/environment3/data/levels/asteroidField.oxw (added)
	* code/branches/environment3/data/levels/includes/asteroidField.lua (added)

	First implementation of asteroid field generator


Wed, 12 Oct 2011 11:57:16 GMT jo [8887]
	* code/branches/environment3 (copied)




Wed, 12 Oct 2011 11:49:32 GMT jo [8886]
	* code/branches/enviroment (copied)




Wed, 12 Oct 2011 11:48:46 GMT jo [8885]
	* code/branches/formation (copied)




Wed, 12 Oct 2011 11:47:36 GMT jo [8884]
	* code/branches/menue (copied)




Wed, 12 Oct 2011 11:47:15 GMT jo [8883]
	* code/branches/hud (copied)




Wed, 12 Oct 2011 11:36:41 GMT smerkli [8882]
	* code/branches/tutorial/CMakeLists.txt (modified)

	just testing


Wed, 12 Oct 2011 11:33:18 GMT jo [8881]
	* code/branches/spaceraceTwo (copied)




Mon, 10 Oct 2011 19:03:50 GMT jo [8880]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)

	Some level improvements. e.g. flying tutorial


Sun, 02 Oct 2011 08:05:11 GMT jo [8878]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/orxonox/interfaces/RadarViewable.h (modified)

	Trying to add quests.


Wed, 28 Sep 2011 12:45:58 GMT jo [8877]
	* code/branches/tutorial/cmake/LibraryConfigTardis.cmake (modified)

	Tardis fix for 64 bit. Throws another error.


Sun, 04 Sep 2011 20:27:17 GMT jo [8875]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/ai2/src/orxonox/LevelManager.cc (modified)
	* code/branches/ai2/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Radar fix: pawns were not displayed when their visibility/activity ...


Sun, 04 Sep 2011 13:15:41 GMT jo [8874]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/ai2/src/modules/overlays/hud/HUDRadar.h (modified)

	Radar & Navigation tweaks: Radar is now hiding 'radar invisible' ...


Thu, 01 Sep 2011 10:11:47 GMT jo [8873]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)

	Some level polishing. E.g. better message display.


Thu, 01 Sep 2011 09:45:55 GMT jo [8872]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)

	Some level polishing. E.g. better message display.


Mon, 29 Aug 2011 14:30:28 GMT jo [8871]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)

	Tutorial in first 'playable' version. There are some serious bugs ...


Thu, 25 Aug 2011 15:13:18 GMT jo [8869]
	* code/branches/ai2/data/levels/includes/weaponSettingsTransporter.oxi (modified)
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified)

	Further work on tutorial. More about it in the forums.


Mon, 22 Aug 2011 13:05:58 GMT dafrick [8856]
	* code/branches/gameimmersion (deleted)

	Removing obsolete branch.


Sun, 21 Aug 2011 21:56:59 GMT landauf [8854]
	* code/branches/output/data/levels/presentationDM.oxw (modified)
	* code/branches/output/src/libraries/core/Language.cc (modified)
	* code/branches/output/src/libraries/core/input/InputManager.cc (modified)

	change some output's level to verbose: 1. in Language.cc because it ...


Sun, 21 Aug 2011 21:18:20 GMT landauf [8853]
	* code/branches/output/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/util/Output.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/CMakeLists.txt (added)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/SubcontextOutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/SubcontextOutputListener.h (modified)

	documented the remaining code of the output system
	created a build ...


Sun, 21 Aug 2011 21:10:54 GMT jo [8852]
	* code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Buxfix.


Sun, 21 Aug 2011 16:52:33 GMT jo [8851]
	* code/branches/ai2/data/levels/includes/weaponSettingsSpacecruiser.oxi (added)
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/data/levels/presentationFS11.oxw (modified)
	* code/branches/ai2/data/levels/templates/spaceshipSpacecruiser.oxt (added)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)

	Added docking part & powerful spaceship to the level. Some ...


Sun, 21 Aug 2011 16:27:30 GMT landauf [8850]
	* code/branches/output/src/libraries/util/CMakeLists.txt (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/OutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)
	* code/branches/output/src/libraries/util/output/SubcontextOutputListener.cc (added)
	* code/branches/output/src/libraries/util/output/SubcontextOutputListener.h (added)

	moved filtering of sub-contexts from BaseWriter to a new interface ...


Sun, 21 Aug 2011 14:50:36 GMT landauf [8849]
	* code/branches/output/src/libraries/core/CoreIncludes.h (modified)
	* code/branches/output/src/libraries/core/command/CommandExecutor.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputStream.h (modified)

	function argument was ignored in CommandExecutor::execute()
	added ...


Sun, 21 Aug 2011 14:04:54 GMT landauf [8848]
	* code/branches/output/src/libraries/util/Output.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)

	added documentation and some comments


Thu, 18 Aug 2011 20:48:28 GMT jo [8847]
	* code/branches/ai2/data/levels/fightInOurBack.oxw (modified)
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/data/levels/presentationFS11.oxw (modified)
	* code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified)

	Some level extensions.


Sun, 14 Aug 2011 22:03:50 GMT rgrieder [8846]
	* code/branches/output/CMakeLists.txt (modified)

	The CMake version check should be placed AFTER the PROJECT command to ...


Sun, 14 Aug 2011 20:58:07 GMT jo [8845]
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/DroneController.h (modified)

	QUICK&DIRTY: drone uses portals.


Sun, 14 Aug 2011 20:47:05 GMT rgrieder [8844]
	* code/branches/output/src/libraries/core/LuaState.h (modified)
	* code/branches/output/src/libraries/network/NetworkChatListener.h (modified)
	* code/branches/output/src/libraries/network/PeerList.cc (modified)
	* code/branches/output/src/orxonox/chat/ChatListener.h (modified)

	Added missing includes (only show up when PCH and build units are ...


Sun, 14 Aug 2011 16:45:57 GMT dafrick [8843]
	* code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/ai2/src/modules/questsystem/QuestManager.h (modified)

	Fixing bug.


Sun, 14 Aug 2011 11:45:06 GMT dafrick [8842]
	* code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/ai2/src/modules/questsystem/QuestItem.h (modified)
	* code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/ai2/src/modules/questsystem/QuestManager.h (modified)

	Renam to find bug.


Sun, 14 Aug 2011 08:10:26 GMT dafrick [8841]
	* code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified)

	Adding some asserts.


Sat, 13 Aug 2011 21:58:07 GMT landauf [8840]
	* code/branches/output/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/output/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/output/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/output/data/lua/LuaStateInit.lua (modified)
	* code/branches/output/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/core/LuaState.cc (modified)
	* code/branches/output/src/libraries/core/LuaState.h (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	Exported orxout() and the output levels to lua, replaces logMessage() ...


Sat, 13 Aug 2011 21:27:42 GMT jo [8839]
	* code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified)

	sorry, I forgot to remove a wrong buxfix entirely.


Sat, 13 Aug 2011 21:21:03 GMT jo [8838]
	* code/branches/ai2/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/data/levels/planets.oxw (modified)
	* code/branches/ai2/src/modules/questsystem/QuestManager.cc (modified)

	Minor level changes. Questmenu pauses game now.


Sat, 13 Aug 2011 19:41:38 GMT landauf [8837]
	* code/branches/output/data/tcl/init.tcl (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/Shell.cc (modified)

	added console command "orxout" (and also "orxout_context")
	re-added ...


Sat, 13 Aug 2011 17:30:04 GMT landauf [8836]
	* 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/CommandExecutor.h (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/core/command/TclBind.cc (modified)
	* code/branches/output/src/libraries/core/command/TclThreadManager.cc (modified)

	improved error output of CommandExecutor and Tcl


Thu, 11 Aug 2011 22:48:23 GMT landauf [8835]
	* code/branches/output/src/libraries/core/ClassFactory.h (modified)
	* code/branches/output/src/libraries/core/command/Executor.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/modules/objects/Script.cc (modified)
	* code/branches/output/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/output/src/orxonox/overlays/OrxonoxOverlay.cc (modified)

	cleaned up contexts, added some sub-contexts and made some output
	verbose


Thu, 11 Aug 2011 22:26:40 GMT landauf [8834]
	* code/branches/output/src/libraries/core/command/Shell.cc (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/OutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.h (modified)

	added flag to disable automatic registration of output listeners. ...


Thu, 11 Aug 2011 21:20:39 GMT landauf [8833]
	* code/branches/output/src/libraries/core/Core.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/util/Output.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/LogWriter.cc (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)

	A context is now defined by a struct instead of only a mask.
 ...


Mon, 08 Aug 2011 22:37:21 GMT landauf [8832]
	* code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/output/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/output/src/libraries/network/MasterServerComm.h (modified)
	* code/branches/output/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/output/src/libraries/network/Server.cc (modified)
	* code/branches/output/src/libraries/network/Server.h (modified)
	* code/branches/output/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/output/src/libraries/network/WANDiscovery.h (modified)

	Quick and dirty fix to un-singletonize WANDiscovery. It is now ...


Mon, 08 Aug 2011 20:19:09 GMT landauf [8831]
	* code/branches/output/src/libraries/core/ConfigFileManager.cc (modified)
	* code/branches/output/src/libraries/core/command/Shell.cc (modified)
	* code/branches/output/src/libraries/util/output/BaseWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/LogWriter.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	fixed wrong config value callback in Shell
	fixed bug in ...


Sun, 07 Aug 2011 20:51:54 GMT landauf [8830]
	* code/branches/output/src/Orxonox.cc (modified)
	* code/branches/output/src/libraries/core/Core.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/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/Language.cc (modified)
	* code/branches/output/src/libraries/core/Loader.cc (modified)
	* code/branches/output/src/libraries/util/Scope.h (modified)
	* code/branches/output/src/orxonox/Main.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSClient.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/output/src/orxonox/sound/SoundManager.cc (modified)

	added some output (user and internal) throughout the initialization ...


Sun, 07 Aug 2011 13:11:16 GMT landauf [8829]
	* code/branches/output/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/output/src/libraries/network/ChatListener.cc (deleted)
	* code/branches/output/src/libraries/network/ChatListener.h (deleted)
	* code/branches/output/src/libraries/network/Client.cc (modified)
	* code/branches/output/src/libraries/network/Client.h (modified)
	* code/branches/output/src/libraries/network/Host.cc (modified)
	* code/branches/output/src/libraries/network/Host.h (modified)
	* code/branches/output/src/libraries/network/NetworkChatListener.h (added)
	* code/branches/output/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/output/src/libraries/network/Server.cc (modified)
	* code/branches/output/src/libraries/network/Server.h (modified)
	* code/branches/output/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/output/src/libraries/network/packet/Chat.h (modified)
	* code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/output/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/branches/output/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/output/src/orxonox/chat/CMakeLists.txt (modified)
	* code/branches/output/src/orxonox/chat/ChatHistory.cc (modified)
	* code/branches/output/src/orxonox/chat/ChatHistory.h (modified)
	* code/branches/output/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/branches/output/src/orxonox/chat/ChatInputHandler.h (modified)
	* code/branches/output/src/orxonox/chat/ChatListener.h (added)
	* code/branches/output/src/orxonox/chat/ChatManager.cc (added)
	* code/branches/output/src/orxonox/chat/ChatManager.h (added)
	* code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified)

	enhanced chat system. chat related code is now separated into ...


Sat, 06 Aug 2011 16:33:55 GMT landauf [8828]
	* code/branches/output/src/orxonox/CMakeLists.txt (modified)
	* code/branches/output/src/orxonox/chat (added)
	* code/branches/output/src/orxonox/chat/CMakeLists.txt (added)
	* code/branches/output/src/orxonox/chat/ChatHistory.cc (moved)
	* code/branches/output/src/orxonox/chat/ChatHistory.h (moved)
	* code/branches/output/src/orxonox/chat/ChatInputHandler.cc (moved)
	* code/branches/output/src/orxonox/chat/ChatInputHandler.h (moved)

	moved chat related files to a new subdirectory


Sat, 06 Aug 2011 13:42:38 GMT landauf [8827]
	* code/branches/output/src/libraries/network/Host.cc (modified)

	small fix in Host::isServer in agreement with Oli


Sat, 06 Aug 2011 13:40:37 GMT landauf [8826]
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/output/src/orxonox/ChatHistory.cc (modified)
	* code/branches/output/src/orxonox/ChatInputHandler.cc (modified)

	display chat messages without sender without name (currently used for ...


Sat, 06 Aug 2011 09:07:35 GMT landauf [8825]
	* code/branches/output/data/overlays/debug.oxo (modified)
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified)

	There's a bug in ogre 1.7 (?) causing the first text overlay with a ...


Thu, 04 Aug 2011 21:54:03 GMT jo [8824]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)

	Some updates to the level.


Thu, 04 Aug 2011 10:51:24 GMT dafrick [8823]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/ai2/src/modules/notifications/NotificationDispatcher.h (modified)

	Forgot to change some debug stuff. ;)


Wed, 03 Aug 2011 22:45:06 GMT landauf [8822]
	* code/branches/output/data/levels/presentationDM.oxw (modified)
	* code/branches/output/src/libraries/network/Host.cc (modified)
	* code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/output/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified)

	Chat works again
	Removed console output for almost all gameplay ...


Wed, 03 Aug 2011 22:09:03 GMT dafrick [8821]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/ai2/src/modules/notifications/NotificationDispatcher.h (modified)

	Adding broadcast functionality to NotificationDispatcher.


Wed, 03 Aug 2011 21:28:06 GMT landauf [8820]
	* code/branches/output/data/levels/templates/FPS.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipGhost.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipH2.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipHXY.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipHXYSL.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipImmTest.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipSwallow.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipTransporter.oxt (modified)
	* code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt (modified)
	* code/branches/output/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/output/src/libraries/core/Loader.cc (modified)
	* code/branches/output/src/libraries/core/Loader.h (modified)
	* code/branches/output/src/orxonox/worldentities/WorldEntity.cc (modified)

	fixed some stuff that became visible after the recent changes in the ...


Wed, 03 Aug 2011 19:54:19 GMT dafrick [8819]
	* code/branches/ai2/src/modules/pickup/PickupSpawner.cc (modified)

	Minor change in PickupSpawner, fixing possible cause for segfaults.


Wed, 03 Aug 2011 18:56:26 GMT landauf [8817]
	* code/branches/output/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/output/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/output/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/output/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/output/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/output/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/output/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/branches/output/src/orxonox/graphics/AnimatedModel.h (modified)

	corrected authors


Tue, 02 Aug 2011 20:36:41 GMT landauf [8816]
	* code/branches/output/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified)

	fixed bug in auto completion function


Mon, 01 Aug 2011 22:15:08 GMT landauf [8814]
	* code/branches/output/data/overlays/OrxonoxLoading.overlay (deleted)

	OrxonoxLoading.overlay is not needed anymore (see r8813)


Mon, 01 Aug 2011 18:42:26 GMT landauf [8812]
	* code/branches/output/src/Orxonox.cc (modified)
	* code/branches/output/src/OrxonoxConfig.h.in (modified)
	* code/branches/output/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/output/src/libraries/util/Output.h (modified)

	removed COUT, CCOUT, and DOUT macros. COUT is now defined as a ...


Mon, 01 Aug 2011 17:09:29 GMT landauf [8811]
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/output/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/output/src/modules/docking/Dock.cc (modified)
	* code/branches/output/src/modules/docking/DockToShip.cc (modified)
	* code/branches/output/src/modules/docking/DockingController.cc (modified)
	* code/branches/output/src/modules/docking/DockingTarget.cc (modified)
	* code/branches/output/src/modules/gametypes/RaceCheckPoint.cc (modified)
	* code/branches/output/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/output/src/modules/notifications/NotificationDispatcher.cc (modified)
	* code/branches/output/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/output/src/modules/notifications/NotificationQueue.cc (modified)
	* code/branches/output/src/modules/notifications/NotificationQueueCEGUI.cc (modified)
	* code/branches/output/src/modules/objects/ForceField.cc (modified)
	* code/branches/output/src/modules/objects/Planet.cc (modified)
	* code/branches/output/src/modules/objects/Script.cc (modified)
	* code/branches/output/src/modules/objects/SpaceBoundaries.cc (modified)
	* code/branches/output/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/output/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/output/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/output/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/branches/output/src/modules/objects/eventsystem/EventFilter.cc (modified)
	* code/branches/output/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/branches/output/src/modules/objects/eventsystem/EventTarget.cc (modified)
	* code/branches/output/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/output/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/output/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/output/src/modules/objects/triggers/TriggerBase.cc (modified)
	* code/branches/output/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/output/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/output/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/output/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/output/src/modules/pickup/Pickup.cc (modified)
	* code/branches/output/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/output/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/output/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/output/src/modules/pickup/items/DronePickup.cc (modified)
	* code/branches/output/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/branches/output/src/modules/pickup/items/InvisiblePickup.cc (modified)
	* code/branches/output/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/branches/output/src/modules/pickup/items/ShieldPickup.cc (modified)
	* code/branches/output/src/modules/pickup/items/ShrinkPickup.h (modified)
	* code/branches/output/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/output/src/modules/pong/Pong.cc (modified)
	* code/branches/output/src/modules/questsystem/GlobalQuest.cc (modified)
	* code/branches/output/src/modules/questsystem/LocalQuest.cc (modified)
	* code/branches/output/src/modules/questsystem/Quest.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestDescription.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestEffect.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestHint.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestListener.cc (modified)
	* code/branches/output/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/AddQuest.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/AddQuestHint.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/AddReward.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/CompleteQuest.cc (modified)
	* code/branches/output/src/modules/questsystem/effects/FailQuest.cc (modified)
	* code/branches/output/src/modules/tetris/Tetris.cc (modified)
	* code/branches/output/src/modules/weapons/RocketController.cc (modified)
	* code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc (modified)

	Replaced COUT() with orxout() in all modules. phew.


Mon, 01 Aug 2011 14:40:20 GMT landauf [8810]
	* code/branches/output/src/orxonox/graphics/CEGuiSample.cc (deleted)
	* code/branches/output/src/orxonox/graphics/CEGuiSample.h (deleted)

	removed CEGuiSample, I think this is not needed anymore


Mon, 01 Aug 2011 14:37:38 GMT landauf [8809]
	* code/branches/output/src/libraries/tools/BillboardSet.cc (modified)
	* code/branches/output/src/libraries/tools/Mesh.cc (modified)
	* code/branches/output/src/libraries/tools/ParticleInterface.cc (modified)
	* code/branches/output/src/libraries/tools/ResourceCollection.cc (modified)
	* code/branches/output/src/libraries/tools/ResourceLocation.cc (modified)
	* code/branches/output/src/libraries/tools/Shader.cc (modified)
	* code/branches/output/src/libraries/tools/Timer.h (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)
	* code/branches/output/src/orxonox/ChatHistory.cc (modified)
	* code/branches/output/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/output/src/orxonox/Level.cc (modified)
	* code/branches/output/src/orxonox/LevelInfo.cc (modified)
	* code/branches/output/src/orxonox/LevelManager.cc (modified)
	* code/branches/output/src/orxonox/MoodManager.cc (modified)
	* code/branches/output/src/orxonox/PlayerManager.cc (modified)
	* code/branches/output/src/orxonox/Radar.cc (modified)
	* code/branches/output/src/orxonox/Scene.cc (modified)
	* code/branches/output/src/orxonox/Test.cc (modified)
	* code/branches/output/src/orxonox/Test.h (modified)
	* code/branches/output/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/branches/output/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/branches/output/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/output/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/output/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSMasterServer.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/output/src/orxonox/gamestates/GSServer.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Asteroids.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Deathmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastManStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/output/src/orxonox/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/output/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/output/src/orxonox/graphics/Model.cc (modified)
	* code/branches/output/src/orxonox/graphics/ParticleEmitter.cc (modified)
	* code/branches/output/src/orxonox/interfaces/PickupCarrier.cc (modified)
	* code/branches/output/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/branches/output/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/output/src/orxonox/items/Engine.cc (modified)
	* code/branches/output/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/output/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/output/src/orxonox/pickup/PickupIdentifier.cc (modified)
	* code/branches/output/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/output/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/output/src/orxonox/sound/SoundBuffer.cc (modified)
	* code/branches/output/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/output/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/output/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/output/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/output/src/orxonox/worldentities/BigExplosion.cc (modified)
	* code/branches/output/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/output/src/orxonox/worldentities/ExplosionChunk.cc (modified)
	* code/branches/output/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/output/src/orxonox/worldentities/SpawnPoint.cc (modified)
	* code/branches/output/src/orxonox/worldentities/StaticEntity.cc (modified)
	* code/branches/output/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/output/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)
	* code/branches/output/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)

	Replaced COUT() with orxout() in tools and orxonox library. Requires ...


Sun, 31 Jul 2011 21:42:55 GMT landauf [8808]
	* code/branches/output/src/libraries/core/Loader.cc (modified)
	* code/branches/output/src/libraries/core/Loader.h (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.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/OutputDefinitions.h (modified)
	* code/branches/output/src/libraries/util/output/OutputListener.cc (modified)
	* code/branches/output/src/libraries/util/output/OutputManager.cc (modified)

	Removed debugLevel_ from Shell, using correct variable inherited from ...


Sun, 31 Jul 2011 19:09:23 GMT landauf [8807]
	* code/branches/output/src/libraries/network/ChatListener.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/Connection.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/LANDiscovery.cc (modified)
	* code/branches/output/src/libraries/network/MasterServer.cc (modified)
	* code/branches/output/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/output/src/libraries/network/PeerList.cc (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/TrafficControl.cc (modified)
	* code/branches/output/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/output/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/output/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/output/src/libraries/network/packet/ClassID.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/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/output/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/output/src/libraries/network/synchronisable/SynchronisableVariable.h (modified)
	* code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified)

	Replaced COUT with orxout in network library. Tried to set levels and ...


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 19:25:32 GMT jo [8800]
	* code/branches/ai2/data/levels/lastTeamStandingII.oxw (modified)
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)

	Some work on the level. Pawndeath trigger doesn't work.


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


Thu, 28 Jul 2011 15:24:32 GMT jo [8793]
	* code/branches/ai2/data/levels/lastTeamStanding.oxw (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified)

	Destructor update.


Wed, 27 Jul 2011 19:21:29 GMT jo [8792]
	* code/branches/ai2/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified)

	Yeay, works. The pickuping efficiency isn't as good as expected
	though.


Tue, 26 Jul 2011 21:41:45 GMT jo [8791]
	* code/branches/ai2/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)

	Bug is triggered in AIController.cc @ line 243. Can't find the reason ...


Tue, 26 Jul 2011 21:21:43 GMT dafrick [8790]
	* code/branches/hudimprovements (deleted)

	Removing hudimprovements branch. (Is already in trunk)


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 21:18:20 GMT jo [8786]
	* code/branches/ai2/data/levels/missionOne.oxw (modified)
	* code/branches/ai2/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified)

	Bots can fetch pickups. Waypointmanagement is unstable yet.


Mon, 25 Jul 2011 21:07:51 GMT landauf [8785]
	* code/archive/ggz2 (moved)

	moved ggz2 branch to archive