[GENERAL]

- update RakNetStaticLib - removed nlohmann json dependency - added cereal support - removed pipe communication files
Zandor300 · Mar 30, 2018 · 24af675 · 24af675
1 parent 021c23e
commit 24af675
Show file tree

Hide file tree

Showing 105 changed files with 29,359 additions and 15,306 deletions.
diff --git a/Bin/data/server_parameters.json b/Bin/data/server_parameters.json
@@ -1,10 +1,10 @@
 {
-	"ServerPort" : 60000,
-	"MaxClients" : 128,
-    "Lobbies": [
-        "ScotlandYard",
-        "BattleShips",
-        "Sokoban",
-        "Tron"
-    ]
+    "ServerPort": 60000,
+    "MaxClients": 128,
+    "Lobbies": {
+        "value0": "ScotlandYard",
+        "value1": "BattleShips",
+        "value2": "Sokoban",
+        "value3": "Tron"
+    }
 }
diff --git a/Bin/data/students_2017.json b/Bin/data/students_2017.json
@@ -1 +1,358 @@
-{"logins":[{"snr": 1002797,"name": "Bojan Endrovski","passhash": 3436468189},{"snr": 1002009,"name": "Colin Morrison","passhash": 3950304909},{"snr": 1002600,"name": "Ralph Palmer","passhash": 2399871801},{"snr": 1002632,"name": "Rene Derks","passhash": 4276402450},{"snr": 1002794,"name": "Martin Romero","passhash": 1765325946},{"snr": 1002578,"name": "Bert Heesakkers","passhash": 2967952197},{"snr": 170740,"name": "Joaquin Aguilera Valdebenito","passhash": 0},{"snr": 170271,"name": "Vasilen Aleksandrov","passhash": 0},{"snr": 170383,"name": "Pepijn Averink","passhash": 0},{"snr": 170208,"name": "Mark Baaij","passhash": 0},{"snr": 171309,"name": "Matei Bargau","passhash": 0},{"snr": 160020,"name": "Bruce van den Berg","passhash": 0},{"snr": 170384,"name": "Thijs van Boesschoten","passhash": 0},{"snr": 170374,"name": "Luke Buitendijk","passhash": 0},{"snr": 170313,"name": "Vincent Burger","passhash": 0},{"snr": 170733,"name": "Zadok Buurmans","passhash": 0},{"snr": 170118,"name": "Hugo Cornel","passhash": 0},{"snr": 154240,"name": "Conor Damery Mendez","passhash": 0},{"snr": 170063,"name": "Rebekka van Doorn","passhash": 0},{"snr": 171262,"name": "nick Erkens","passhash": 0},{"snr": 170491,"name": "Wouter Grutter","passhash": 0},{"snr": 131578,"name": "Valencio Hoffman","passhash": 0},{"snr": 170048,"name": "Tim Hogers","passhash": 0},{"snr": 170046,"name": "Stefan Ilmer","passhash": 0},{"snr": 171427,"name": "Joey Jacobs","passhash": 0},{"snr": 170211,"name": "Stefan Jagers","passhash": 0},{"snr": 160010,"name": "Frank de Jong","passhash": 0},{"snr": 170002,"name": "Marjolein Kaal","passhash": 0},{"snr": 140095,"name": "Bart van Kesteren","passhash": 0},{"snr": 170204,"name": "Lukas Klein","passhash": 0},{"snr": 170462,"name": "Dirk de Kok","passhash": 0},{"snr": 170153,"name": "Marnix Kuijs","passhash": 0},{"snr": 170108,"name": "Arthur Kuylaars","passhash": 0},{"snr": 170044,"name": "Pelle Ladegaard","passhash": 0},{"snr": 170023,"name": "Stefano Lazzaroni","passhash": 0},{"snr": 170602,"name": "Sabine Leijten","passhash": 0},{"snr": 170034,"name": "Glyn Leine","passhash": 0},{"snr": 162354,"name": "Jeroen Lischer","passhash": 0},{"snr": 171271,"name": "Cas Luitwieler","passhash": 0},{"snr": 170682,"name": "Menno Markus","passhash": 0},{"snr": 170350,"name": "Artiom Matievschi","passhash": 0},{"snr": 170699,"name": "Ryan Mazer","passhash": 0},{"snr": 170147,"name": "Damy Metzke","passhash": 0},{"snr": 170770,"name": "Carlos Paz Hernandez","passhash": 0},{"snr": 170636,"name": "Simon Renger","passhash": 0},{"snr": 170291,"name": "Jesse Roffel","passhash": 0},{"snr": 163011,"name": "Fin Rovers","passhash": 0},{"snr": 170088,"name": "Jonah Rutten","passhash": 0},{"snr": 170139,"name": "Remco Scheffer","passhash": 0},{"snr": 160607,"name": "Vincent Seremak","passhash": 0},{"snr": 170545,"name": "Leo Simonetto","passhash": 0},{"snr": 170222,"name": "Zandor Smith","passhash": 0},{"snr": 170091,"name": "Niels van Steeg","passhash": 0},{"snr": 160664,"name": "Maiko Steeman","passhash": 0},{"snr": 170100,"name": "Corne Steenhuis","passhash": 0},{"snr": 170821,"name": "Niels Strijker","passhash": 0},{"snr": 171228,"name": "David Turley","passhash": 0},{"snr": 170596,"name": "Jorn Veen","passhash": 0},{"snr": 170098,"name": "Nathaniel Veldkamp","passhash": 0},{"snr": 170594,"name": "Daan van de Ven","passhash": 0},{"snr": 161341,"name": "Angelo Verberne","passhash": 0},{"snr": 170678,"name": "Hannes Vernooij","passhash": 0},{"snr": 151850,"name": "Erico Wiggers","passhash": 0},{"snr": 143264,"name": "Job van Wijngaarden","passhash": 0},{"snr": 170664,"name": "Danail Yordanov","passhash": 0},{"snr": 151955,"name": "Dave Ruptash","passhash": 0},{"snr": 160012,"name": "Bas Veeneman","passhash": 0},{"snr": 162006,"name": "Simon van Vueren","passhash": 0},{"snr": 161619,"name": "Meine Zandstra","passhash": 0},{"snr": 161055,"name": "Channing Eggers","passhash": 0},{"snr": 162672,"name": "Jen Hagen","passhash": 0}]}
+{
+    "num_entries": 71,
+    "value0": {
+        "name": "Bojan Endrovski",
+        "snr": "1002797",
+        "passhash": 3436468189
+    },
+    "value1": {
+        "name": "Colin Morrison",
+        "snr": "1002009",
+        "passhash": 3950304909
+    },
+    "value2": {
+        "name": "Ralph Palmer",
+        "snr": "1002600",
+        "passhash": 2399871801
+    },
+    "value3": {
+        "name": "Rene Derks",
+        "snr": "1002632",
+        "passhash": 4276402450
+    },
+    "value4": {
+        "name": "Martin Romero",
+        "snr": "1002794",
+        "passhash": 1765325946
+    },
+    "value5": {
+        "name": "Bert Heesakkers",
+        "snr": "1002578",
+        "passhash": 2967952197
+    },
+    "value6": {
+        "name": "Joaquin Aguilera Valdebenito",
+        "snr": "170740",
+        "passhash": 0
+    },
+    "value7": {
+        "name": "Vasilen Aleksandrov",
+        "snr": "170271",
+        "passhash": 0
+    },
+    "value8": {
+        "name": "Pepijn Averink",
+        "snr": "170383",
+        "passhash": 0
+    },
+    "value9": {
+        "name": "Mark Baaij",
+        "snr": "170208",
+        "passhash": 0
+    },
+    "value10": {
+        "name": "Matei Bargau",
+        "snr": "171309",
+        "passhash": 0
+    },
+    "value11": {
+        "name": "Bruce van den Berg",
+        "snr": "160020",
+        "passhash": 0
+    },
+    "value12": {
+        "name": "Thijs van Boesschoten",
+        "snr": "170384",
+        "passhash": 0
+    },
+    "value13": {
+        "name": "Luke Buitendijk",
+        "snr": "170374",
+        "passhash": 0
+    },
+    "value14": {
+        "name": "Vincent Burger",
+        "snr": "170313",
+        "passhash": 0
+    },
+    "value15": {
+        "name": "Zadok Buurmans",
+        "snr": "170733",
+        "passhash": 0
+    },
+    "value16": {
+        "name": "Hugo Cornel",
+        "snr": "170118",
+        "passhash": 0
+    },
+    "value17": {
+        "name": "Conor Damery Mendez",
+        "snr": "154240",
+        "passhash": 0
+    },
+    "value18": {
+        "name": "Rebekka van Doorn",
+        "snr": "170063",
+        "passhash": 0
+    },
+    "value19": {
+        "name": "nick Erkens",
+        "snr": "171262",
+        "passhash": 0
+    },
+    "value20": {
+        "name": "Wouter Grutter",
+        "snr": "170491",
+        "passhash": 0
+    },
+    "value21": {
+        "name": "Valencio Hoffman",
+        "snr": "131578",
+        "passhash": 0
+    },
+    "value22": {
+        "name": "Tim Hogers",
+        "snr": "170048",
+        "passhash": 0
+    },
+    "value23": {
+        "name": "Stefan Ilmer",
+        "snr": "170046",
+        "passhash": 0
+    },
+    "value24": {
+        "name": "Joey Jacobs",
+        "snr": "171427",
+        "passhash": 0
+    },
+    "value25": {
+        "name": "Stefan Jagers",
+        "snr": "170211",
+        "passhash": 0
+    },
+    "value26": {
+        "name": "Frank de Jong",
+        "snr": "160010",
+        "passhash": 0
+    },
+    "value27": {
+        "name": "Marjolein Kaal",
+        "snr": "170002",
+        "passhash": 0
+    },
+    "value28": {
+        "name": "Bart van Kesteren",
+        "snr": "140095",
+        "passhash": 0
+    },
+    "value29": {
+        "name": "Lukas Klein",
+        "snr": "170204",
+        "passhash": 0
+    },
+    "value30": {
+        "name": "Dirk de Kok",
+        "snr": "170462",
+        "passhash": 0
+    },
+    "value31": {
+        "name": "Marnix Kuijs",
+        "snr": "170153",
+        "passhash": 0
+    },
+    "value32": {
+        "name": "Arthur Kuylaars",
+        "snr": "170108",
+        "passhash": 0
+    },
+    "value33": {
+        "name": "Pelle Ladegaard",
+        "snr": "170044",
+        "passhash": 0
+    },
+    "value34": {
+        "name": "Stefano Lazzaroni",
+        "snr": "170023",
+        "passhash": 0
+    },
+    "value35": {
+        "name": "Sabine Leijten",
+        "snr": "170602",
+        "passhash": 0
+    },
+    "value36": {
+        "name": "Glyn Leine",
+        "snr": "170034",
+        "passhash": 0
+    },
+    "value37": {
+        "name": "Jeroen Lischer",
+        "snr": "162354",
+        "passhash": 0
+    },
+    "value38": {
+        "name": "Cas Luitwieler",
+        "snr": "171271",
+        "passhash": 0
+    },
+    "value39": {
+        "name": "Menno Markus",
+        "snr": "170682",
+        "passhash": 0
+    },
+    "value40": {
+        "name": "Artiom Matievschi",
+        "snr": "170350",
+        "passhash": 0
+    },
+    "value41": {
+        "name": "Ryan Mazer",
+        "snr": "170699",
+        "passhash": 0
+    },
+    "value42": {
+        "name": "Damy Metzke",
+        "snr": "170147",
+        "passhash": 0
+    },
+    "value43": {
+        "name": "Carlos Paz Hernandez",
+        "snr": "170770",
+        "passhash": 0
+    },
+    "value44": {
+        "name": "Simon Renger",
+        "snr": "170636",
+        "passhash": 0
+    },
+    "value45": {
+        "name": "Jesse Roffel",
+        "snr": "170291",
+        "passhash": 0
+    },
+    "value46": {
+        "name": "Fin Rovers",
+        "snr": "163011",
+        "passhash": 0
+    },
+    "value47": {
+        "name": "Jonah Rutten",
+        "snr": "170088",
+        "passhash": 0
+    },
+    "value48": {
+        "name": "Remco Scheffer",
+        "snr": "170139",
+        "passhash": 0
+    },
+    "value49": {
+        "name": "Vincent Seremak",
+        "snr": "160607",
+        "passhash": 0
+    },
+    "value50": {
+        "name": "Leo Simonetto",
+        "snr": "170545",
+        "passhash": 0
+    },
+    "value51": {
+        "name": "Zandor Smith",
+        "snr": "170222",
+        "passhash": 0
+    },
+    "value52": {
+        "name": "Niels van Steeg",
+        "snr": "170091",
+        "passhash": 0
+    },
+    "value53": {
+        "name": "Maiko Steeman",
+        "snr": "160664",
+        "passhash": 0
+    },
+    "value54": {
+        "name": "Corne Steenhuis",
+        "snr": "170100",
+        "passhash": 0
+    },
+    "value55": {
+        "name": "Niels Strijker",
+        "snr": "170821",
+        "passhash": 0
+    },
+    "value56": {
+        "name": "David Turley",
+        "snr": "171228",
+        "passhash": 0
+    },
+    "value57": {
+        "name": "Jorn Veen",
+        "snr": "170596",
+        "passhash": 0
+    },
+    "value58": {
+        "name": "Nathaniel Veldkamp",
+        "snr": "170098",
+        "passhash": 0
+    },
+    "value59": {
+        "name": "Daan van de Ven",
+        "snr": "170594",
+        "passhash": 0
+    },
+    "value60": {
+        "name": "Angelo Verberne",
+        "snr": "161341",
+        "passhash": 0
+    },
+    "value61": {
+        "name": "Hannes Vernooij",
+        "snr": "170678",
+        "passhash": 0
+    },
+    "value62": {
+        "name": "Erico Wiggers",
+        "snr": "151850",
+        "passhash": 0
+    },
+    "value63": {
+        "name": "Job van Wijngaarden",
+        "snr": "143264",
+        "passhash": 0
+    },
+    "value64": {
+        "name": "Danail Yordanov",
+        "snr": "170664",
+        "passhash": 0
+    },
+    "value65": {
+        "name": "Dave Ruptash",
+        "snr": "151955",
+        "passhash": 0
+    },
+    "value66": {
+        "name": "Bas Veeneman",
+        "snr": "160012",
+        "passhash": 0
+    },
+    "value67": {
+        "name": "Simon van Vueren",
+        "snr": "162006",
+        "passhash": 0
+    },
+    "value68": {
+        "name": "Meine Zandstra",
+        "snr": "161619",
+        "passhash": 0
+    },
+    "value69": {
+        "name": "Channing Eggers",
+        "snr": "161055",
+        "passhash": 0
+    },
+    "value70": {
+        "name": "Jen Hagen",
+        "snr": "162672",
+        "passhash": 0
+    }
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,9 @@ set(CMAKE_DEBUG_POSTFIX "_d")
 
 include_directories(${ROOT_INCLUDE_FOLDER})
 
-add_definitions(-D_WINSOCKAPI_)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	add_definitions(-D_WINSOCKAPI_)
+endif()
 
 add_subdirectory(Libraries)
 add_subdirectory(Applications)