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

This commit is contained in:
Stiffly
2015-10-21 15:52:29 +02:00
24 changed files with 2069 additions and 535 deletions
+1 -1
View File
@@ -9,4 +9,4 @@ BGMVolume=0.5
[Video]
Fullscreen=false
Width=675
Height=1080[Water]Radius=0.3[Cheat]GodMode=false
Height=1080[Water]Radius=0.3[Cheat]GodMode=false[Water]Radius=0.3[Cheat]GodMode=false
File diff suppressed because one or more lines are too long
+561 -487
View File
File diff suppressed because one or more lines are too long