Merge remote-tracking branch 'origin/master' into Networking

# Conflicts: # include/Game/Game.h # resources/DefaultConfig.ini # src/Game/Game.cpp
2015-12-14 17:07:12 +01:00
parent bac0a1de26 6723e71fee
commit 3f77da4a07
45 changed files with 1582 additions and 655 deletions
@@ -13,5 +13,6 @@ VSYNC=false
 Width=1280

 Height=720
+FOV=45
 [Networking]
 StartNetwork=false