stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp

2015-12-15 11:50:01 +01:00

..

Util

PickingPass now sets state and clear it when done.

2015-12-11 11:18:30 +01:00

BaseTexture.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Camera.h

Picking now returning world position

2015-12-03 14:50:14 +01:00

DebugCameraInputController.h

Made debug camera detect UI focus properly

2015-12-14 13:58:27 +01:00

DrawScenePass.h

ShaderProgram is now a Resource.

2015-12-11 16:53:46 +01:00

DrawScenePassState.h

DrawPass now moved to it's own class to make renderer cleaner.

2015-12-11 14:22:54 +01:00

DummyRenderer.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

EPicking.h

Fixed picking event

2015-12-14 14:24:11 +01:00

FrameBuffer.h

Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util

2015-12-08 10:37:24 +01:00

Image.h

More CMake bullshit

2015-11-30 11:16:43 +01:00

ImGuiRenderPass.h

Created a RenderState for ImGuiRenderPass

2015-12-14 20:26:04 +01:00

IRenderer.h

Rectangle definition conflicted with a definition included by <boost/asio.hpp>.

2015-12-07 16:52:42 +01:00

Model.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

PickingPass.h

ShaderProgram is now a Resource.

2015-12-11 16:53:46 +01:00

PickingPassState.h

Fixed a bugg with RenderState.

2015-12-11 16:07:12 +01:00

PNG.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

RawModel.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Renderer.h

Added basic ImGui implementation

2015-12-14 13:57:45 +01:00

RenderQueue.h

fixup! Merge remote-tracking branch 'origin/master' into ecs

2015-12-08 18:20:42 +01:00

RenderQueueFactory.h

Fixed absolute positions once and for all (maybe?)

2015-12-14 13:57:56 +01:00

RenderState.h

Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT

2015-12-14 20:23:29 +01:00

ShaderProgram.h

ShaderProgram is now a Resource.

2015-12-11 16:53:46 +01:00

Skeleton.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Texture.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00