Merge branch 'master' into directx · d197ec07ad - squidout - Gitea: Git with a cup of tea

BTH/squidout

Merge branch 'master' into directx

Conflicts:
	include/Core/Engine.h

This commit is contained in:

sippeangelo

2015-10-20 15:13:20 +02:00

parent a4b9521c34 b4f098c80d

commit d197ec07ad

68 changed files with 3619 additions and 509 deletions

									
										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/hover-n.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.

After

Width: | Height: | Size: 7.4 KiB

assets/Textures/Particles/OilShot.psd

Executable

BIN

View File

Binary file not shown.