# # ChangeLog for code/branches/presentation/src/libraries/network # # Generated by Trac 1.0.9 # Jun 5, 2024, 9:51:38 PM 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 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. 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 ... Wed, 08 Dec 2010 18:33:11 GMT smerkli [7750] * code/branches/presentation/src/libraries/network/MasterServer.cc (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) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) documentation. Wed, 08 Dec 2010 16:56:33 GMT smerkli [7749] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops, I did it again. sorry. Wed, 08 Dec 2010 16:45:40 GMT smerkli [7748] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops. Wed, 08 Dec 2010 16:43:21 GMT smerkli [7747] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) removed the space in the WANDiscovery list (hopefully) Wed, 08 Dec 2010 16:35:36 GMT smerkli [7745] * 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) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) * code/branches/presentation/src/libraries/network/packet/ServerInformation.cc (modified) Removed some things and fixed some bugs Wed, 08 Dec 2010 16:18:10 GMT smerkli [7744] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) port fixed. 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, 01 Oct 2010 11:27:04 GMT scheusso [7503] * code/trunk/src/libraries/network/FunctionCall.cc (modified) don't know where this else got lost