viktorljung 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp

2016-02-10 11:33:45 +01:00

..

Util

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

AnimationSystem.h

WIP

2016-02-02 14:52:31 +01:00

BaseTexture.h

Async load works, using exceptions for special resources.

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

BoneAttachmentSystem.h

Added BoneAttachment component

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

Camera.h

Camera::WorldToScreen helper function

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

DirectionalLightJob.h

DirectionalLight now correctly getting directions

2016-01-19 14:44:17 +01:00

DrawBloomPass.h

Fixed some rendering bugs and some code refactoring

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

DrawBloomPassState.h

Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.

2016-01-21 12:02:28 +01:00

DrawColorCorrectionPass.h

Defender shield should now be working

2016-02-08 11:47:35 +01:00

DrawFinalPass.h

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

2016-02-10 11:33:45 +01:00

DrawFinalPassState.h

Some state stuff, some draw stuff, some QA map stuff

2016-02-03 18:09:44 +01:00

DrawScreenQuadPass.h

WIP

2016-01-20 13:34:56 +01:00

DrawScreenQuadPassState.h

WIP

2016-01-20 13:34:56 +01:00

DummyRenderer.h

Camera component and RenderQueue changes

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

EAnimationComplete.h

AnimationSystem base WIP

2016-01-24 17:05:34 +01:00

ESetCamera.h

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

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

ExplosionEffectJob.h

Splatmapping now working.

2016-02-07 13:39:13 +01:00

Font.h

Clean up

2016-01-21 10:16:03 +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

*cough*

2016-02-01 13:37:51 +01:00

LightCullingPass.h

Working directional light

2016-01-19 12:32:34 +01:00

LightCullingPassState.h

Revert "Revert "Forward+""

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

Model.h

Splatmapping now working.

2016-02-07 13:39:13 +01:00

ModelJob.h

Merge remote-tracking branch 'origin/Importer' into Animations

2016-02-09 22:50:19 +01:00

PickingPass.h

Picking supports skinned meshes

2016-02-08 17:37:18 +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

PointLightJob.h

Frustum culling now works correctly for all resolutions

2016-01-15 15:38:14 +01:00

RawModelAssimp.h

Animations PROBABLY works fine if all joints got keyframes.

2016-01-23 18:02:42 +01:00

RawModelCustom.h

Splatmapping now working.

2016-02-07 13:39:13 +01:00

Renderer.h

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

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

RenderJob.h

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

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

RenderQueue.h

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

RenderState.h

Working stencil buffer for the shield.

2016-02-04 14:33:39 +01:00

RenderSystem.h

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

2016-02-10 11:33:45 +01:00

ShaderProgram.h

ShaderProgram is now a Resource.

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

Skeleton.h

Cleanup

2016-02-10 11:04:28 +01:00

TextJob.h

Font loading crash fixed

2016-01-19 17:18:18 +01:00

TextPass.h

WIP

2016-01-23 18:07:07 +01:00

TextPassState.h

WIP

2016-01-23 18:07:07 +01:00

Texture.h

Async load works, using exceptions for special resources.

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