viktorljung 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics ...

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

2015-09-25 05:16:32 +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

submarine2.mtl

Falling bricks and collision filters

2015-09-25 04:28:46 +02:00

submarine2.obj

Falling bricks and collision filters

2015-09-25 04:28:46 +02:00

Submarine.mtl

Added submarine model and texture files

2015-09-24 20:31:47 +02:00

Submarine.obj

Merge and some small fixes

2015-09-25 01:49:08 +02:00

SubmarineTexture.png

Added submarine model and texture files

2015-09-24 20:31:47 +02:00