# # ChangeLog for code/branches/masterserver/src # # Generated by Trac 1.0.9 # Nov 22, 2024, 5:16:22 PM Wed, 08 Dec 2010 15:13:02 GMT smerkli [7738] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) aaaand it works Wed, 08 Dec 2010 15:08:22 GMT smerkli [7737] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) pre-merge Wed, 08 Dec 2010 14:36:53 GMT smerkli [7733] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) fixed a segfault Wed, 08 Dec 2010 14:11:59 GMT smerkli [7731] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) Wed, 08 Dec 2010 14:05:07 GMT smerkli [7730] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver (deleted) * code/branches/masterserver/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (modified) changes done, use --masterserver to launch master server Wed, 08 Dec 2010 13:33:54 GMT smerkli [7729] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.cc (copied) * code/branches/masterserver/src/libraries/network/MasterServer.h (copied) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/PeerList.cc (copied) * code/branches/masterserver/src/libraries/network/PeerList.h (copied) * code/branches/masterserver/src/libraries/network/ServerList.cc (copied) * code/branches/masterserver/src/libraries/network/ServerList.h (copied) * code/branches/masterserver/src/libraries/network/masterserver (deleted) moved some files. Wed, 08 Dec 2010 12:52:14 GMT smerkli [7728] * code/branches/masterserver/src/libraries/network/masterserver (copied) Wed, 08 Dec 2010 12:49:39 GMT smerkli [7727] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (copied) Before conversion of masterserver from module to library Mon, 06 Dec 2010 20:14:27 GMT smerkli [7725] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) fixed some warnings Fri, 03 Dec 2010 13:38:46 GMT dafrick [7717] * code/branches/masterserver/data/DefaultResources.oxr (modified) * code/branches/masterserver/src/libraries/core/GUIManager.cc (modified) * code/branches/masterserver/src/libraries/tools/ResourceLocation.cc (modified) Updating branch for changes in the data repository. Please also ... Wed, 01 Dec 2010 15:28:46 GMT smerkli [7692] * code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) done for today, didn't get bug to leave, and connect doesn't quite ... Wed, 01 Dec 2010 13:11:44 GMT smerkli [7688] * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) further debugging. Wed, 01 Dec 2010 12:51:15 GMT smerkli [7684] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) further testing. Wed, 24 Nov 2010 22:12:30 GMT smerkli [7672] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) just added some notes so I understand my own stuff next week. Wed, 24 Nov 2010 16:12:49 GMT dafrick [7668] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) fix this... Wed, 24 Nov 2010 16:12:36 GMT dafrick [7667] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) fix this... Wed, 24 Nov 2010 15:13:04 GMT smerkli [7666] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) further corrections. Wed, 24 Nov 2010 14:58:46 GMT smerkli [7665] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) and another one. Wed, 24 Nov 2010 14:29:56 GMT smerkli [7662] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) fatal bug found. Wed, 24 Nov 2010 14:00:11 GMT smerkli [7661] * code/branches/masterserver/src/modules/masterserver/CMakeLists.txt (added) now with actually compiling masterserver module. Wed, 24 Nov 2010 13:34:29 GMT smerkli [7659] * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) wee Wed, 24 Nov 2010 13:18:36 GMT smerkli [7658] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) minor changes Wed, 24 Nov 2010 13:07:53 GMT smerkli [7657] * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.cc (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) * code/branches/masterserver/src/orxonox/Main.cc (modified) it has compiled. Wed, 17 Nov 2010 15:18:14 GMT smerkli [7651] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/libraries/network/packet/ServerInformation.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) done for today Wed, 17 Nov 2010 15:05:13 GMT smerkli [7650] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (added) * code/branches/masterserver/src/libraries/network/Server.cc (modified) * code/branches/masterserver/src/libraries/network/Server.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) Minimum target achieved for today, servers can log on to master ... Wed, 10 Nov 2010 15:22:58 GMT smerkli [7634] * code/branches/masterserver/src/libraries/network/Server.cc (modified) * code/branches/masterserver/src/libraries/network/Server.h (modified) Wed, 10 Nov 2010 15:01:07 GMT smerkli [7633] * code/branches/masterserver/src/libraries/network/Server.cc (modified) done for today. Wed, 10 Nov 2010 14:54:59 GMT smerkli [7632] * code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/Server.cc (modified) oops, forgot to rename the new lua function. Wed, 10 Nov 2010 14:35:39 GMT smerkli [7631] * code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (moved) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (moved) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) added comments, lua function (to be tested) and various ... Wed, 10 Nov 2010 13:19:44 GMT smerkli [7630] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (copied) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (copied) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.cc (modified) initiated WANDiscovery code, now implementing... Wed, 03 Nov 2010 15:20:02 GMT smerkli [7611] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (moved) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.cc (moved) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.h (added) * code/branches/masterserver/src/modules/masterserver/PeerList.cc (moved) * code/branches/masterserver/src/modules/masterserver/ServerList.cc (moved) Communication channel now working both ways, doxygen documentation ... Wed, 27 Oct 2010 14:16:08 GMT smerkli [7590] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) done for today, everything compiles, test client as well. beginning ... Wed, 27 Oct 2010 13:24:56 GMT smerkli [7589] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/TestClient.cpp (added) wrote some test client and further implemented the master server ... Sun, 24 Oct 2010 18:33:58 GMT smerkli [7580] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) Further implementation, constructing a testing environment soon. Wed, 20 Oct 2010 21:34:21 GMT smerkli [7574] * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/PeerList.h (added) initial peerlist stuff, implementation to follow sometime this week Wed, 20 Oct 2010 13:47:12 GMT smerkli [7569] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) ...everything looks better with a GPL on top. Wed, 20 Oct 2010 13:43:42 GMT smerkli [7568] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) some progress, nothing working yet though. Wed, 20 Oct 2010 12:54:08 GMT smerkli [7566] * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (deleted) Wed, 20 Oct 2010 12:53:53 GMT smerkli [7565] * code/branches/masterserver/src/modules/masterserver (added) * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (added) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/ServerList.h (added) Initial check-in of the master server code. Nowhere near completion ... Wed, 29 Sep 2010 13:39:00 GMT dafrick [7501] * code/branches/masterserver (copied) New branch for Sandro to work on THE master server. Tue, 28 Sep 2010 19:48:32 GMT scheusso [7495] * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCall.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) buffering incoming function calls for non-existing objects works now