FakeShemp 20468cba1b Merge branch 'master' into Shadows ...

# Conflicts:
#	assets
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/FrameBuffer.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-02-29 18:03:00 +01:00

..

Engine

Merge branch 'master' into Shadows

2016-02-29 18:03:00 +01:00

Game

Fixed typo m_EPDoubleJump to m_EDoubleJump.

2016-02-25 16:04:27 +01:00