versions maintenance

Author: flipcoder

.gitmodules

@@ -1,4 +1,6 @@
 
 [submodule "lib/Qor"]
 	path = lib/Qor
-	url = https://github.com/flipcoder/qor.git
+	url = https://gitlab.com/flipcoder/qor.git
+    branch = master
+

bin/settings.json

@@ -1,12 +1,14 @@
 {
-   "audio" : {
-      "music-volume" : 50,
-      "sound-volume" : 50,
-      "volume" : 50
-   },
-   "video" : {
-      "resolution" : "1920x1080",
-      "vsync" : false,
-      "windowed" : true
-   }
+	"audio" : 
+	{
+		"music-volume" : 100,
+		"sound-volume" : 10,
+		"volume" : 50
+	},
+	"video" : 
+	{
+		"resolution" : "1920x1080",
+		"vsync" : false,
+		"windowed" : true
+	}
 }

lib/Qor

@@ -2,7 +2,15 @@ workspace("microarmy")
     targetdir("bin")
 
     configurations {"Debug", "Release"}
-        defines { "GLM_FORCE_RADIANS", "QOR_NO_PYTHON", "QOR_NO_CAIRO", "QOR_NO_PHYSICS" }
+        defines {
+            "GLM_FORCE_CTOR_INIT",
+            "GLM_ENABLE_EXPERIMENTAL",
+            "GLM_FORCE_RADIANS",
+            "QOR_NO_PYTHON",
+            "QOR_NO_CAIRO",
+            "QOR_NO_PHYSICS",
+            "NOMINMAX"
+        }
 
         -- Debug Config
         configuration "Debug"
@@ -50,13 +58,14 @@ workspace("microarmy")
                 "boost_regex",
                 "jsoncpp",
                 "z",
-                "RakNetDLL",
+                "raknet",
             }
             includedirs {
                 "lib/Qor/",
                 "lib/Qor/lib/kit",
                 "/usr/local/include/",
                 "/usr/include/bullet/",
+                "/usr/include/rapidxml/",
                 "/usr/include/raknet/DependentExtensions"
             }