#
# ChangeLog for code/branches/presentation/src
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 7:55:38 AM

Wed, 08 Dec 2010 16:13:03 GMT smerkli [7743]
	* code/branches/presentation/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation/src/orxonox/Main.cc (modified)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (modified)

	made mastserserver mode non-blocking


Wed, 08 Dec 2010 15:39:04 GMT smerkli [7740]
	* code/branches/presentation/src/libraries/network/Server.cc (modified)

	fixed server startup


Wed, 08 Dec 2010 15:25:52 GMT dafrick [7739]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation/src/libraries/network/MasterServer.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServer.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (copied)
	* code/branches/presentation/src/libraries/network/PeerList.cc (copied)
	* code/branches/presentation/src/libraries/network/PeerList.h (copied)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/Server.h (modified)
	* code/branches/presentation/src/libraries/network/ServerList.cc (copied)
	* code/branches/presentation/src/libraries/network/ServerList.h (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.cc (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.h (copied)
	* code/branches/presentation/src/libraries/network/packet/ServerInformation.h (modified)
	* code/branches/presentation/src/orxonox/Main.cc (modified)
	* code/branches/presentation/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (copied)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.h (copied)

	Merging masterserver branch to new presentation branch.


Wed, 08 Dec 2010 15:00:30 GMT dafrick [7736]
	* code/branches/presentation (copied)

	Creating presentation branch.


Fri, 03 Dec 2010 13:58:02 GMT dafrick [7724]
	* code/trunk/src/orxonox/LevelManager.cc (modified)

	Changing default level, since it has been renamed.