Merge branch 'master' of https://github.com/sippeangelo/Escape-the-Dawn

Browse Source

Conflicts:
	Escape-the-Dawn/Systems/CollisionSystem.cpp

...

This commit is contained in:

Tleety

2015-06-01 23:30:05 +02:00

parent c15a082e4f b81d60799e

commit 076e1bba74

5 changed files with 83 additions and 54 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

Escape-the-Dawn/Sounds/swoosh.wav

BIN

Binary file not shown.