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

Browse Source

Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp

...

This commit is contained in:

ViktorLjung

2014-03-13 19:36:03 +01:00

parent 36069b2c3b 235e9648ad

commit 01f2ebfa20

23 changed files with 304 additions and 166 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/Models/powerupTexture.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB