Merge branch 'master' into Movement

# Conflicts: # include/Engine/Network/Client.h # resources/DefaultConfig.ini # resources/Schema/Entities/OverwatchCamera.xml # resources/Schema/Types/Entity.xsd
2016-03-13 22:22:36 +01:00
parent d587c9a692 77bb7a0f5c
commit a715f7fe86
47 changed files with 13403 additions and 10818 deletions
@@ -85,4 +85,7 @@ NumIterations=2
 NumIterations=4

 [GLOW3]
-NumIterations=6
+NumIterations=6
+
+[MSAA]
+Level = 0;