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

Browse Source

Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp

...

This commit is contained in:

viktorljung

2015-10-22 14:40:09 +02:00

parent 2051c8186c eedcc76e92

commit e49a150f55

16 changed files with 174 additions and 75 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/Models/Brick/InkBrick.png

Executable

BIN

Binary file not shown.

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