#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 1:08:14 AM

Sun, 20 Feb 2011 19:46:54 GMT rgrieder [7939]
	* code/branches/usability/src/libraries/core/GUIManager.cc (modified)

	Lua header not required in GUIManager.


Sun, 20 Feb 2011 18:24:04 GMT rgrieder [7938]
	* code/branches/usability/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/usability/src/libraries/core/WeakPtr.h (modified)
	* code/branches/usability/src/libraries/tools/ResourceLocation.cc (modified)

	Fixed mingw 3 build and removed a warning due to non-virtual
	destructors.


Sun, 20 Feb 2011 16:45:04 GMT landauf [7936]
	* code/branches/usability/src/orxonox/worldentities/WorldEntity.cc (modified)

	trying to fix a crash


Sun, 20 Feb 2011 16:29:02 GMT landauf [7935]
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/overlays/debug.oxo (modified)
	* code/branches/usability/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/usability/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/usability/src/modules/overlays/hud/PauseNotice.cc (added)
	* code/branches/usability/src/modules/overlays/hud/PauseNotice.h (added)
	* code/branches/usability/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/usability/src/orxonox/gamestates/GSRoot.h (modified)

	- opening the ingame menu pauses the game, closing the ingame menu ...


Sun, 20 Feb 2011 16:08:36 GMT rgrieder [7934]
	* code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified)
	* code/branches/mac_osx/src/external/ois/VERSION (modified)

	Correct OIS version in two other places.


Sun, 20 Feb 2011 16:03:47 GMT rgrieder [7933]
	* code/branches/mac_osx/src/external/ois/OISPrereqs.h (modified)

	Using the official v1.3 branch for OIS instead of the trunk for ...


Sun, 20 Feb 2011 15:53:43 GMT bknecht [7932]
	* code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.h (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h (modified)
	* code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	The boost bar is now flashing red when the boost is cooling down. ...


Sun, 20 Feb 2011 15:40:19 GMT scheusso [7931]
	* code/branches/network6/src/libraries/core/ThreadWin.cc (modified)

	fix for windows


Sun, 20 Feb 2011 14:28:18 GMT landauf [7930]
	* code/branches/usability/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/usability/src/orxonox/controllers/HumanController.h (modified)

	- fixed crash when calling toggleGodMode command without controllable ...


Sun, 20 Feb 2011 14:11:30 GMT landauf [7929]
	* code/branches/usability/src/orxonox/sound/AmbientSound.cc (modified)

	forgot to call RegisterObject() for AmbientSound - music now again ...


Sun, 20 Feb 2011 11:42:28 GMT landauf [7928]
	* code/branches/usability/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/usability/data/gui/scripts/SingleplayerMenu.lua (modified)

	more improvements for keyboard control of menus:
	 - added ...


Sun, 20 Feb 2011 02:31:35 GMT landauf [7927]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	renamed afterHide()/onAfterHide() as quit()/onQuit() as this seems to ...


Sun, 20 Feb 2011 02:24:55 GMT landauf [7926]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	greatly improved keyboard controlled navigation in menus with sparse ...


Sun, 20 Feb 2011 00:22:25 GMT landauf [7925]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	if a menu sheet was opened with the keyboard, preselect the first
	button


Sun, 20 Feb 2011 00:10:38 GMT landauf [7924]
	* code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)

	- the "back" button of MultiplayerMenu and SettingsMenu now fills the ...


Sun, 20 Feb 2011 00:02:51 GMT bknecht [7923]
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (modified)

	Turns out that permanentBoost probably is used for something else ...


Sat, 19 Feb 2011 23:47:57 GMT landauf [7922]
	* code/branches/usability/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/GUITools.lua (modified)
	* code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/usability/data/gui/scripts/SingleplayerMenu.lua (modified)

	implemented new keyboard control of menu buttons with these new ...


Sat, 19 Feb 2011 23:33:06 GMT bknecht [7920]
	* code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudimprovements/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (added)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h (added)
	* code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added HUDBoostBar, an additional bar in the HUD to determine ...


Sat, 19 Feb 2011 20:56:53 GMT bknecht [7919]
	* code/branches/hudimprovements (copied)

	new branch to visualize some new features for the player


Sat, 19 Feb 2011 16:05:08 GMT landauf [7916]
	* code/branches/usability/data/gui/configs/CEGUIConfig.xsd (modified)
	* code/branches/usability/data/gui/schemes/GUIScheme.xsd (modified)
	* code/branches/usability/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/branches/usability/data/gui/schemes/TaharezLook.scheme (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)

	replaced tabs with spaces in files where they were used mixed


Sat, 19 Feb 2011 15:38:44 GMT landauf [7915]
	* code/branches/usability (copied)

	creating usability branch to work on features which are more than ...


Wed, 16 Feb 2011 10:17:30 GMT scheusso [7903]
	* code/branches/lastmanstanding3/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw (copied)
	* code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/lastmanstanding3/data/overlays/lastTeamStandingHUD.oxo (added)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.cc (added)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h (copied)
	* code/branches/lastmanstanding3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (added)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.h (added)

	Merge branch 'jo-test' into lms3


Wed, 16 Feb 2011 09:14:04 GMT scheusso [7902]
	* code/branches/lastmanstanding3 (copied)

	creating new lastmanstanding branch


Tue, 15 Feb 2011 14:38:54 GMT jo [7901]
	* code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/levels/lastTeamStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)

	Finally working as intended.


Tue, 15 Feb 2011 13:34:09 GMT scheusso [7900]
	* code/branches/network6/src/libraries/core/Thread.cc (modified)
	* code/branches/network6/src/libraries/core/ThreadWin.cc (added)
	* code/branches/network6/src/libraries/network/Connection.cc (modified)

	castrating Thread.cc for windows because of high cpu usage


Tue, 15 Feb 2011 10:41:02 GMT jo [7899]
	* code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)

	Level polishing.


Tue, 15 Feb 2011 10:37:15 GMT scheusso [7898]
	* code/branches/network6/src/libraries/network/Connection.cc (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/network6/src/libraries/network/packet/Gamestate.cc (modified)

	trying to fix some uninitialised value warnings from valgrind
	remove ...


Mon, 14 Feb 2011 23:15:43 GMT jo [7897]
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	Problem with the destruction of the vector eachTeamsPlayers - ...


Mon, 14 Feb 2011 22:02:58 GMT dafrick [7894]
	* code/branches/tutoriallevel/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/tutoriallevel/src/libraries/core/GUIManager.cc (modified)
	* code/branches/tutoriallevel/src/libraries/core/GUIManager.h (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationManager.h (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationQueue.cc (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationQueue.h (modified)

	Some extension of NotificationQueue, font size and color can now be ...


Mon, 14 Feb 2011 21:59:22 GMT jo [7893]
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	still problem with vector to fix


Mon, 14 Feb 2011 19:29:14 GMT jo [7890]
	* code/branches/lastmanstanding2/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	trying to find a bug


Mon, 14 Feb 2011 08:00:48 GMT scheusso [7882]
	* code/branches/network6/src/libraries/network/Client.cc (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network6/src/libraries/network/Server.cc (modified)

	improving gamestate processing and generation


Mon, 14 Feb 2011 07:58:47 GMT scheusso [7881]
	* code/branches/network6/src/libraries/network/Connection.cc (modified)

	fixing possible malloc/delete problem


Sun, 13 Feb 2011 20:34:22 GMT scheusso [7878]
	* code/branches/network6/src/libraries/network/Client.cc (modified)
	* code/branches/network6/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network6/src/libraries/network/Connection.cc (modified)
	* code/branches/network6/src/libraries/network/Connection.h (modified)
	* code/branches/network6/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network6/src/libraries/network/Server.cc (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.cc (modified)

	-some cleaning up
	-fixing disconnect behaviour
	-trying to find a bug


Sun, 13 Feb 2011 13:29:30 GMT scheusso [7875]
	* code/branches/network6/src/libraries/network/WANDiscovery.cc (modified)

	using master.orxonox.net as new url for our masterserver


Sat, 12 Feb 2011 16:18:30 GMT bknecht [7869]
	* code/branches/menuanimations2 (deleted)

	there will be an animation engine in CEGUI 0.7.x


Sat, 12 Feb 2011 14:32:12 GMT landauf [7867]
	* code/branches/consolecommands2 (deleted)
	* code/branches/consolecommands3 (deleted)

	removed console command branches


Sat, 12 Feb 2011 14:11:12 GMT bknecht [7866]
	* code/branches/menuanimations (deleted)

	removing old branch


Sat, 12 Feb 2011 14:08:01 GMT bknecht [7864]
	* code/branches/menuanimations2 (copied)

	creating new branch to work on menu animations


Thu, 03 Feb 2011 16:46:31 GMT jo [7843]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)

	Little feature added: Bot's are following their victims. So that they ...


Mon, 31 Jan 2011 22:36:18 GMT jo [7842]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)

	Console command still doesn't seem to work. botLevel_ is now defined ...


Mon, 31 Jan 2011 20:33:18 GMT jo [7841]
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)

	That was not intened.


Mon, 31 Jan 2011 20:30:13 GMT jo [7840]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)

	Creating a console command.


Thu, 27 Jan 2011 21:55:30 GMT jo [7834]
	* code/branches/ai/data/levels/gametype_lastmanstanding.oxw (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)

	The bot's level can be set via spawnpoints. Example: lastmanstanding ...


Thu, 27 Jan 2011 18:50:16 GMT jo [7833]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)

	The ai's strength can be modified by changing the value botlevel_  . ...


Thu, 27 Jan 2011 14:58:04 GMT jo [7832]
	* code/branches/ai/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified)

	Now the ai use lensflare if the weapon is on board and if they are ...


Mon, 17 Jan 2011 19:51:15 GMT dafrick [7831]
	* code/branches/tutoriallevel/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/tutoriallevel/data/gui/scripts/QuestGUI.lua (modified)

	Improvements on QuestGUI, also documented some of the code.


Sun, 16 Jan 2011 13:15:39 GMT dafrick [7830]
	* code/branches/tutoriallevel/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/tutoriallevel/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/tutoriallevel/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/tutoriallevel/data/levels/quests.oxw (added)
	* code/branches/tutoriallevel/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/tutoriallevel/src/modules/questsystem/QuestManager.h (modified)

	New implementation of QuestGUI. Should be much more usable now, ...


Thu, 13 Jan 2011 22:43:20 GMT dafrick [7829]
	* code/branches/tutoriallevel/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/tutoriallevel/src/modules/objects/triggers/TriggerBase.h (modified)

	Fixing small bug in MultiTrigger.


Thu, 13 Jan 2011 20:56:25 GMT dafrick [7828]
	* code/branches/tutoriallevel/src/orxonox/LevelManager.cc (modified)

	Fixed bug in LevelManager.


Thu, 13 Jan 2011 19:25:19 GMT jo [7827]
	* code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/ai/src/orxonox/controllers/Detector.cc (added)
	* code/branches/ai/src/orxonox/controllers/Detector.h (added)

	First draft. The detector tries to detect events that are critical ...


Thu, 13 Jan 2011 19:22:15 GMT dafrick [7826]
	* code/branches/tutoriallevel (copied)

	Creating new branch to work on tutorial level (and everything that ...


Wed, 29 Dec 2010 22:41:51 GMT scheusso [7825]
	* code/branches/network6/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network6/src/libraries/network/Connection.cc (modified)
	* code/branches/network6/src/libraries/network/Connection.h (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network6/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network6/src/libraries/network/synchronisable/Synchronisable.cc (modified)

	-enabling client-side gamestate diffing
	-added some optimisations


Tue, 28 Dec 2010 18:11:32 GMT scheusso [7824]
	* code/branches/network6/src/libraries/network/Connection.cc (modified)

	this should prevent disconnecting clients from crashing our servers
	;)


Tue, 28 Dec 2010 15:46:42 GMT scheusso [7823]
	* code/branches/network6/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/network6/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network6/src/libraries/network/ClientConnection.h (modified)
	* code/branches/network6/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/network6/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/network6/src/libraries/network/ClientInformation.cc (deleted)
	* code/branches/network6/src/libraries/network/ClientInformation.h (deleted)
	* code/branches/network6/src/libraries/network/Connection.cc (modified)
	* code/branches/network6/src/libraries/network/Connection.h (modified)
	* code/branches/network6/src/libraries/network/GamestateClient.cc (deleted)
	* code/branches/network6/src/libraries/network/GamestateClient.h (deleted)
	* code/branches/network6/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network6/src/libraries/network/Host.cc (modified)
	* code/branches/network6/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/network6/src/libraries/network/Server.cc (modified)
	* code/branches/network6/src/libraries/network/Server.h (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.h (modified)
	* code/branches/network6/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network6/src/libraries/network/packet/Packet.h (modified)
	* code/branches/network6/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/network6/src/orxonox/ChatHistory.cc (modified)
	* code/branches/network6/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/network6/src/orxonox/PlayerManager.cc (modified)
	* code/branches/network6/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/network6/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/network6/src/orxonox/gametypes/LastManStanding.cc (modified)
	* code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc (modified)
	* code/branches/network6/src/orxonox/gametypes/UnderAttack.cc (modified)
	* code/branches/network6/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/network6/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/network6/src/orxonox/infos/PlayerInfo.cc (modified)

	again some structural changes in network to increase ...


Tue, 28 Dec 2010 15:43:05 GMT scheusso [7822]
	* code/branches/network6 (copied)

	creating new network6 branch to fix possible bug when client
	disconnects


Tue, 28 Dec 2010 15:40:44 GMT scheusso [7821]
	* code/branches/network4 (deleted)
	* code/branches/network5 (deleted)
	* code/branches/presentation (deleted)
	* code/branches/presentation2 (deleted)

	removing branches not needed anymore


Sun, 26 Dec 2010 12:54:30 GMT rgrieder [7812]
	* code/branches/ipv6 (deleted)

	Removed merged branch.


Wed, 22 Dec 2010 12:38:02 GMT rgrieder [7800]
	* code/branches/presentation2/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentation2/src/libraries/network/MasterServerComm.h (modified)

	Fixed build.


Wed, 22 Dec 2010 12:34:41 GMT rgrieder [7799]
	* code/branches/presentation2/src/libraries/network/Connection.h (modified)

	Fixed build.


Wed, 22 Dec 2010 10:19:25 GMT scheusso [7798]
	* code/branches/presentation2/src/modules/objects/ForceField.h (modified)

	another try ;)


Wed, 22 Dec 2010 10:08:53 GMT scheusso [7797]
	* code/branches/presentation2/src/modules/objects/ForceField.cc (modified)
	* code/branches/presentation2/src/modules/objects/ForceField.h (modified)

	trying to make forcefield synchronisable


Wed, 22 Dec 2010 09:37:18 GMT dafrick [7796]
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified)

	Making PickupSpawner more secure. Small gui adjustment.


Wed, 22 Dec 2010 09:36:39 GMT scheusso [7795]
	* code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified)

	disabling formationflight per default (as it seems to make bots more ...


Wed, 22 Dec 2010 09:15:12 GMT scheusso [7794]
	* code/branches/presentation2/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified)

	WANDiscovery singleton is now in graphics scope (not needed in ...


Wed, 22 Dec 2010 02:05:31 GMT scheusso [7793]
	* code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/network/Connection.cc (modified)
	* code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation2/src/libraries/network/MasterServerComm.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/WANDiscoverable.cc (added)
	* code/branches/presentation2/src/libraries/network/WANDiscoverable.h (added)
	* code/branches/presentation2/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/ServerInformation.h (modified)

	some changes in WANDiscovering:
	- fixed a bug which caused memory ...


Tue, 21 Dec 2010 22:23:07 GMT dafrick [7792]
	* code/branches/presentation2/src/orxonox/infos/Bot.cc (modified)

	Forgot a comma in the bot name list.


Tue, 21 Dec 2010 21:24:50 GMT dafrick [7791]
	* code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified)

	Resolving bug in release mode, asserts apparently are just ignored ...


Tue, 21 Dec 2010 20:27:36 GMT scheusso [7790]
	* code/branches/presentation2/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/presentation2/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSServer.cc (modified)

	changing landiscoverable port to fix problem when running ...


Tue, 21 Dec 2010 18:10:53 GMT rgrieder [7789]
	* code/branches/mac_osx (moved)

	Renaming branch to better fit it's purpose.
	Please use 'svn switch ...


Tue, 21 Dec 2010 17:09:09 GMT scheusso [7788]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/network/Client.cc (modified)
	* code/branches/presentation2/src/libraries/network/Client.h (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/ClientInformation.cc (modified)
	* code/branches/presentation2/src/libraries/network/ClientInformation.h (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/GamestateClient.h (modified)
	* code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/presentation2/src/libraries/network/GamestateManager.h (modified)
	* code/branches/presentation2/src/libraries/network/Host.cc (modified)
	* code/branches/presentation2/src/libraries/network/Host.h (modified)
	* code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation2/src/libraries/network/NetworkPrereqs.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/WANDiscovery.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Chat.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/ClassID.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/DeleteObjects.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/FunctionCalls.h (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/Gamestate.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Packet.h (modified)
	* code/branches/presentation2/src/libraries/network/packet/Welcome.cc (modified)
	* code/branches/presentation2/src/libraries/network/packet/Welcome.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/util/SignalHandler.cc (modified)
	* code/branches/presentation2/src/modules/weapons/MuzzleFlash.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified)

	merged network5 into presentation2 branch (untested)


Tue, 21 Dec 2010 17:04:36 GMT scheusso [7787]
	* code/branches/presentation2 (copied)

	creating presentation2 branch (in order to merge network5 into it)


Tue, 21 Dec 2010 13:10:35 GMT dafrick [7786]
	* code/branches/presentation/data/levels/lastManStanding.oxw (modified)

	Also applying the skybox changes to the presentation branch. ;)


Mon, 20 Dec 2010 22:09:06 GMT youngk [7782]
	* code/branches/ois_update/cmake/tools/FindALUT.cmake (modified)

	ois_update branch now compiles on all unixes again. Made a minor
	booboo.


Sun, 19 Dec 2010 20:48:30 GMT scheusso [7781]
	* code/branches/network5/src/orxonox/controllers/NewHumanController.cc (modified)

	fix: NHC doesn't aim (and shoot) at own spaceship and objects to ...


Sun, 19 Dec 2010 20:41:57 GMT scheusso [7780]
	* code/branches/network5/src/libraries/network/Client.h (modified)
	* code/branches/network5/src/libraries/network/Connection.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network5/src/libraries/network/Server.cc (modified)
	* code/branches/network5/src/libraries/network/Server.h (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified)

	some fixes
	reactivating acking and gamestate diffing


Sun, 19 Dec 2010 18:37:18 GMT konrad [7779]
	* code/branches/presentation/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/presentation/data/gui/layouts/CreditsMenu.layout (modified)
	* code/branches/presentation/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/presentation/data/gui/scripts/GraphicsMenu.lua (modified)

	Final changes to menu


Sun, 19 Dec 2010 13:29:44 GMT scheusso [7778]
	* code/branches/network5/src/orxonox/PlayerManager.cc (modified)
	* code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified)

	removing some debug output i forgot in the last commit
	further ...


Sun, 19 Dec 2010 13:27:06 GMT scheusso [7777]
	* code/branches/network5/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/network5/src/libraries/network/Client.cc (modified)
	* code/branches/network5/src/libraries/network/Client.h (modified)
	* code/branches/network5/src/libraries/network/ClientConnection.h (modified)
	* code/branches/network5/src/libraries/network/ClientInformation.cc (modified)
	* code/branches/network5/src/libraries/network/ClientInformation.h (modified)
	* code/branches/network5/src/libraries/network/Connection.cc (modified)
	* code/branches/network5/src/libraries/network/Connection.h (modified)
	* code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/network5/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/network5/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateClient.h (modified)
	* code/branches/network5/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network5/src/libraries/network/Host.cc (modified)
	* code/branches/network5/src/libraries/network/Host.h (modified)
	* code/branches/network5/src/libraries/network/Server.cc (modified)
	* code/branches/network5/src/libraries/network/Server.h (modified)
	* code/branches/network5/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/network5/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Chat.h (modified)
	* code/branches/network5/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/network5/src/libraries/network/packet/ClassID.h (modified)
	* code/branches/network5/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/network5/src/libraries/network/packet/DeleteObjects.h (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.h (modified)
	* code/branches/network5/src/libraries/network/packet/Welcome.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Welcome.h (modified)
	* code/branches/network5/src/orxonox/PlayerManager.cc (modified)
	* code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified)

	some (^^) structural changes
	some functional changes ...


Fri, 17 Dec 2010 19:26:35 GMT scheusso [7776]
	* code/branches/network5/src/libraries/util/SignalHandler.cc (modified)

	this should fix problems on linux versions other than ubuntu 10.10


Fri, 17 Dec 2010 13:22:00 GMT scheusso [7775]
	* code/branches/network5/src/libraries/util/SignalHandler.cc (modified)

	this should reenable the SignalHandler's backtrace for more ...


Fri, 17 Dec 2010 10:49:08 GMT scheusso [7774]
	* code/branches/network5/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network5/src/libraries/network/Connection.cc (modified)
	* code/branches/network5/src/libraries/network/Connection.h (modified)
	* code/branches/network5/src/libraries/network/ServerConnection.cc (modified)

	some comments
	enable enet packet compression


Fri, 17 Dec 2010 10:09:14 GMT scheusso [7773]
	* code/branches/network5/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/network5/src/libraries/network/Server.cc (modified)
	* code/branches/network5/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.cc (modified)

	small fix (ensure correct termination of communicationThread)


Fri, 17 Dec 2010 09:41:24 GMT scheusso [7772]
	* code/branches/network5/src/libraries/network/Client.cc (modified)
	* code/branches/network5/src/libraries/network/Client.h (modified)
	* code/branches/network5/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/network5/src/libraries/network/ClientConnection.h (modified)
	* code/branches/network5/src/libraries/network/Connection.cc (modified)
	* code/branches/network5/src/libraries/network/Connection.h (modified)
	* code/branches/network5/src/libraries/network/Host.cc (modified)
	* code/branches/network5/src/libraries/network/Host.h (modified)
	* code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/network5/src/libraries/network/Server.cc (modified)
	* code/branches/network5/src/libraries/network/Server.h (modified)
	* code/branches/network5/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/network5/src/libraries/network/ServerConnection.h (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.h (modified)

	network is now multithreaded again
	further testing needed


Thu, 16 Dec 2010 16:46:47 GMT youngk [7771]
	* code/branches/ois_update/src/libraries/core/Super.h (modified)

	Orxonox now properly loads resources on the Mac. It has become
	playable\!


Wed, 15 Dec 2010 20:57:17 GMT dafrick [7770]
	* code/branches/presentation/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentation/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/presentation/src/modules/pickup/PickupManager.cc (modified)

	Changing masterserver port to 55557. Some minor adjustments: Fixed ...


Wed, 15 Dec 2010 18:12:32 GMT smerkli [7769]
	* code/branches/presentation/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)

	fixes 2


Wed, 15 Dec 2010 17:53:02 GMT smerkli [7768]
	* code/branches/presentation/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)

	fixes


Wed, 15 Dec 2010 16:45:16 GMT youngk [7767]
	* code/branches/ois_update/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/ois_update/src/external/ois/mac/MacKeyboard.cpp (modified)
	* code/branches/ois_update/src/libraries/core/GUIManager.cc (modified)
	* code/branches/ois_update/src/orxonox/MoodManager.cc (modified)
	* code/branches/ois_update/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/ois_update/src/orxonox/sound/SoundManager.cc (modified)

	Committing a few minor changes to some files. They affect: Keyboard ...


Wed, 15 Dec 2010 14:27:22 GMT smerkli [7765]
	* code/branches/presentation/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)

	prepared MSC for singleton usage.


Wed, 15 Dec 2010 13:56:28 GMT smerkli [7764]
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/Server.h (modified)

	disconnect works now.


Wed, 15 Dec 2010 13:51:39 GMT smerkli [7763]
	* code/branches/presentation/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/Server.h (modified)
	* code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentation/src/libraries/network/WANDiscovery.h (modified)

	disconnect implemented, switching to only use the MSC object of ...


Wed, 15 Dec 2010 13:05:48 GMT smerkli [7762]
	* code/branches/presentation/src/libraries/network/Server.cc (modified)

	changes for testing


Wed, 15 Dec 2010 12:39:56 GMT smerkli [7761]
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)

	disconnect implemented, getting ready for testing.


Wed, 15 Dec 2010 09:59:10 GMT dafrick [7760]
	* code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme (moved)
	* code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme (moved)
	* code/branches/presentation/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation/src/libraries/core/GUIManager.h (modified)

	Making the GUI scheme configurable through a config value.


Tue, 14 Dec 2010 19:54:00 GMT scheusso [7759]
	* code/branches/network5/src/libraries/network/Client.cc (modified)
	* code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/network5/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/network5/src/libraries/network/GamestateClient.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateClient.h (modified)
	* code/branches/network5/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network5/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified)
	* code/branches/network5/src/libraries/network/Server.cc (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/network5/src/libraries/network/synchronisable/Synchronisable.h (modified)

	a lot of changes:
	- some fixes (mostly gamestate:diff)
	- ...


Sun, 12 Dec 2010 22:13:01 GMT scheusso [7758]
	* code/branches/network5 (modified)
	* code/branches/network5/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network5/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/network5/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/network5/src/modules/weapons/MuzzleFlash.cc (modified)
	* code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/network5/src/orxonox/gametypes/Gametype.h (modified)

	merging network4 into network5 branch


Sun, 12 Dec 2010 21:50:14 GMT scheusso [7757]
	* code/branches/network5 (copied)

	creating new network5 branch out of presentation branch


Sat, 11 Dec 2010 20:07:55 GMT smerkli [7756]
	* code/branches/presentation/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (modified)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified)

	started implementing server pings, but need a change to ...


Sat, 11 Dec 2010 15:12:21 GMT scheusso [7755]
	* code/branches/network4/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/network4/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified)

	build fix