BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/game/Sound/SoundSystem.cpp
This commit is contained in:
Stiffly
2015-10-16 11:53:38 +02:00
parent 64f903a6b6 f335955396
commit 0180b29544
31 changed files with 1460 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/DefaultConfig.ini
Executable
+12
View File
@@ -0,0 +1,12 @@
[Debug]
SkipStory=false
LogLevel=1
[Audio]
SFXVolume=0.5
BGMVolume=0.5
[Video]
Fullscreen=false
Width=675
Height=1080
assets/Models/Sid/Sid.dae
+1097
View File
File diff suppressed because one or more lines are too long
assets/Models/Sid/SquidTexture.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB