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

Browse Source

Conflicts:
	include/Core/Engine.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

...

This commit is contained in:

viktorljung

2015-09-17 17:11:37 +02:00

parent c0155b7900 692e0ca9df

commit 8ca01ae9c7

48 changed files with 19163 additions and 223 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/Textures/Ball.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 4.0 MiB

assets/Textures/Core/NeutralSpecularMap.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB