Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui ...

Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp

2015-09-25 02:27:00 +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

GUI/Menu

Complete main menu without event bindings.

2015-09-25 01:29:14 +02:00

Test

Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water.

2015-09-23 18:01:15 +02:00

Background.png

Water now rendered in forward rendering

2015-09-24 23:21:46 +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