viktorljung aacfc47fb5 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp

2016-01-23 15:12:19 +01:00

..

Util

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

Camera.cpp

Camera::WorldToScreen helper function

2016-01-21 10:29:36 +01:00

DrawBloomPass.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DrawBloomPassState.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DrawColorCorrectionPass.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DrawFinalPass.cpp

Merge remote-tracking branch 'origin/master' into Menu

2016-01-23 15:12:19 +01:00

DrawFinalPassState.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DrawScreenQuadPass.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DrawScreenQuadPassState.cpp

Fixed some rendering bugs and some code refactoring

2016-01-23 12:17:38 +01:00

DummyRenderer.cpp

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Font.cpp

Clean up

2016-01-21 10:16:03 +01:00

FrameBuffer.cpp

Colors above value 1 is now added to the bloomtexture, and will be used to get a glow effect in later stage.

2016-01-20 15:23:49 +01:00

ImGuiRenderPass.cpp

Editor entity reparenting.

2016-01-18 21:20:20 +01:00

LightCullingPass.cpp

Removed some debug code

2016-01-19 16:48:59 +01:00

LightCullingPassState.cpp

Revert "Revert "Forward+""

2016-01-11 17:56:58 +01:00

Model.cpp

ResourceManager::Load never returns null, throws exceptions instead.

2016-01-15 15:25:01 +01:00

PickingPass.cpp

Merge remote-tracking branch 'origin/master' into Forward+

2016-01-23 13:59:21 +01:00

PickingPassState.cpp

Resolution fixed and Centered text

2016-01-19 11:45:34 +01:00

PNG.cpp

Engine puzzle completed

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

RawModel.cpp

The main thread is not mutex blocked while child threads load anymore.

2016-01-15 11:29:46 +01:00

Renderer.cpp

Removed a temp variable.

2016-01-23 14:52:29 +01:00

RenderState.cpp

Rendering pipeline fixes across the board and base work on refactored editor

2016-01-17 06:29:25 +01:00

RenderSystem.cpp

HealthMeter

2016-01-23 14:53:17 +01:00

ShaderProgram.cpp

Added 3D picking of models to renderer

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

Skeleton.cpp

Engine puzzle completed

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

TextPass.cpp

Changed name and made a TextPassState

2016-01-23 11:38:31 +01:00

TextPassState.cpp

Changed name and made a TextPassState

2016-01-23 11:38:31 +01:00

Texture.cpp

Async load works, using exceptions for special resources.

2016-01-14 16:27:45 +01:00