Teejoon 6fab971734 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SeeTeamMates ...

Conflicts:
	include/Engine/Rendering/SpriteJob.h
	resources/Schema/Components.xsd
	resources/Schema/Entities/Player.xml
	resources/Schema/Entities/PlayerRed.xml

2016-02-22 16:43:18 +01:00

..

Util

PNG is now a resource.

2016-02-10 17:50:17 +01:00

AnimationSystem.cpp

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

2016-02-11 23:48:30 +01:00

BoneAttachmentSystem.cpp

Fixed BoneAttachment component

2016-02-11 13:36:27 +01:00

Camera.cpp

spriteComponent WIP

2016-02-05 16:43:57 +01:00

DrawBloomPass.cpp

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO

2016-02-22 14:51:42 +01:00

DrawBloomPassState.cpp

Fixed some rendering bugs and some code refactoring

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

DrawColorCorrectionPass.cpp

SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.

2016-02-22 14:48:20 +01:00

DrawFinalPass.cpp

Pull request fixes

2016-02-22 16:38:20 +01:00

DrawFinalPassState.cpp

Working stencil buffer for the shield.

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

DrawScreenQuadPass.cpp

Splatmapping now working.

2016-02-07 13:39:13 +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

Resize should now be working correctly.

2016-02-19 11:42:52 +01:00

ImGuiRenderPass.cpp

Fixes #66 warnings

2016-02-01 17:53:01 +01:00

LightCullingPass.cpp

Resize should now be working correctly.

2016-02-19 11:42:52 +01:00

LightCullingPassState.cpp

Revert "Revert "Forward+""

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

Model.cpp

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

2016-02-11 14:43:30 +01:00

PickingPass.cpp

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into SSAO

2016-02-22 14:51:42 +01:00

PickingPassState.cpp

Resolution fixed and Centered text

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

PNG.cpp

PNG is now a resource.

2016-02-10 17:50:17 +01:00

RawModelAssimp.cpp

Added animation blending and offset animation component

2016-02-09 22:15:43 +01:00

RawModelCustom.cpp

Fixed material file reading bug

2016-02-11 19:38:43 +01:00

Renderer.cpp

Fixed PerformanceTimer start and stop in Renderer.cpp since I have changed a little code there

2016-02-22 15:02:20 +01:00

RenderState.cpp

Working stencil buffer for the shield.

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

RenderSystem.cpp

Player Indicator now working OK. Scaling depending on how far away you are makes the Indicator to hide players head behind it. Shields are making indicators to disappear.

2016-02-17 17:58:01 +01:00

ShaderProgram.cpp

SSAO is working, but is kinda crappy. You can change shade variables in the debug window.

2016-02-19 16:50:04 +01:00

Skeleton.cpp

Player names

2016-02-12 09:07:59 +01:00

SSAOPass.cpp

SSAO now working. Changed in DrawFinalePass so that th AOTexture is on texture position 0 and only get binded once.

2016-02-22 14:48:20 +01:00

SSAOPassState.cpp

SSAO is working, but is kinda crappy. You can change shade variables in the debug window.

2016-02-19 16:50:04 +01:00

TextPass.cpp

Added Queues for the models with shield and shielded components.

2016-02-03 13:53:57 +01:00

TextPassState.cpp

WIP

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

Texture.cpp

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

2016-02-11 14:43:30 +01:00