Merge remote-tracking branch 'origin' into Tobias

Browse Source

...

This commit is contained in:

tleety

2015-10-19 15:57:41 +02:00

parent 7b428f2b54 3f2a1c8d90

commit c1df5d69a9

13 changed files with 49 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/Sounds/BGM/soft-guitar.wav → assets/Sounds/BGM/eastern-music.wav

BIN

Binary file not shown.

assets/Sounds/BGM/under-the-sea-instrumental.wav → assets/Sounds/BGM/under-the-sea-n.wav

BIN

Binary file not shown.

assets/Sounds/GUI/click-n.wav

BIN

Binary file not shown.

assets/Sounds/GUI/click.wav

BIN

Binary file not shown.

assets/Sounds/GUI/hover-n.wav

BIN

Binary file not shown.

assets/Sounds/GUI/hover.wav

BIN

Binary file not shown.

assets/Sounds/screwed.wav

BIN

Binary file not shown.