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

..

Bricks

Made a Stage! Imported PlaceHolder Graphics!

2015-09-10 21:06:21 +02:00

Core

Models now get a standard normal and specular map if they dont have one

2015-09-16 16:09:20 +02:00

Test

Added some textures and fixed camera perspective

2015-09-11 15:07:48 +02:00

Ball.png

Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button.

2015-09-14 16:53:14 +02:00

Pad.png

Gusp.

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

Park_1.jpg

Collisions kind of working

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