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

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

Browse Source 
Conflicts:
	include/Core/Engine.h
This commit is contained in:
viktorljung
2015-10-20 11:01:42 +02:00
parent 9e8d176999 dd6c5443eb
commit f5957fc91a
53 changed files with 1674 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/DefaultConfig.ini
+1 -1
View File
@@ -9,4 +9,4 @@ BGMVolume=0.5
[Video]
Fullscreen=false
Width=675
Height=1080
Height=1080[Water]Radius=0.3[Cheat]GodMode=false
assets/Sounds/BGM/soft-guitar.wav → assets/Sounds/BGM/eastern-music.wav
BIN
View File
Binary file not shown.
assets/Sounds/BGM/under-the-sea-instrumental.wav → assets/Sounds/BGM/under-the-sea-n.wav
BIN
View File
Binary file not shown.
assets/Sounds/Brick/LTTP_Boss_Hit.wav
BIN
View File
Binary file not shown.
assets/Sounds/GUI/click-n.wav
BIN
View File
Binary file not shown.
assets/Sounds/GUI/click.wav
BIN
View File
Binary file not shown.
assets/Sounds/GUI/hover-n.wav
BIN
View File
Binary file not shown.
assets/Sounds/GUI/hover.wav
BIN
View File
Binary file not shown.
assets/Sounds/screwed.wav
BIN
View File
Binary file not shown.
assets/Textures/Particles/OilShot.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

assets/Textures/Particles/OilShot.psd
Executable
BIN
View File
Binary file not shown.