viktorljung 8ca01ae9c7 Merge remote-tracking branch 'origin/master' into Physics ...

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

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

..

Brick

Collisions kind of working

2015-09-17 14:11:09 +01:00

Core

Fixed unit quad with texture coordinates

2015-09-10 22:38:44 +02:00

Test

Added a low poly brick model and changed their ingame scale

2015-09-15 18:20:26 +02:00

Halfpipe.mtl

Collisions kind of working

2015-09-17 14:11:09 +01:00

Halfpipe.obj

Collisions kind of working

2015-09-17 14:11:09 +01:00