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

2016-03-13 00:09:07 +01:00
parent 958850903a 7ea90bede7
commit 2e89227061
28 changed files with 379 additions and 26567 deletions
@@ -39,6 +39,7 @@ ResourceLoading=true
 [Sound]
 BGMVolume=1.0
 SFXVolume=1.0
+AnnouncerVolume=1.0
 Announcer=female

 [SSAO]
@@ -87,4 +88,4 @@ NumIterations=9
 NumIterations=13

 [MSAA]
-Level = 0;
+Level = 0;