Teejoon c272857819 Merge branch 'Importer' of https://github.com/teamfisk/TacticalZ into Importer ...

Conflicts:
	src/Engine/Rendering/RawModelCustom.cpp
	tools/MayaExporter/MayaExporter/Skeleton.cpp

2016-02-04 15:05:00 +01:00

..

Util

Fixed some rendering bugs and some code refactoring

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

AnimationSystem.cpp

fixed crashes

2016-01-24 21:12:41 +01:00

Camera.cpp

Camera::WorldToScreen helper function

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

DrawBloomPass.cpp

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

2016-01-27 15:41:31 +01:00

DrawBloomPassState.cpp

Fixed some rendering bugs and some code refactoring

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

DrawColorCorrectionPass.cpp

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

DrawFinalPass.cpp

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

2016-01-27 15:41:31 +01:00

DrawFinalPassState.cpp

Fixed some rendering bugs and some code refactoring

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

DrawScreenQuadPass.cpp

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +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

Resolution fix in render stages //Tobias

2016-01-25 00:07:17 +01:00

LightCullingPassState.cpp

Revert "Revert "Forward+""

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

Model.cpp

WIP, commit to be able to pull stuff down

2016-02-04 14:58:46 +01:00

PickingPass.cpp

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

2016-01-27 15:41:31 +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

RawModelAssimp.cpp

Removed temp variables & the "forced" animation in DrawFinalPass

2016-01-24 15:30:20 +01:00

RawModelCustom.cpp

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

2016-02-04 15:05:00 +01:00

Renderer.cpp

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

2016-01-27 15:41:31 +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

Some wierd shader faults and merge error fixe

2016-01-27 15:54:36 +01:00

ShaderProgram.cpp

Added 3D picking of models to renderer

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

Skeleton.cpp

Changed the structure of the Animation Data in both Exporter & Importer.

2016-02-04 11:25:31 +01:00

TextPass.cpp

WIP

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

TextPassState.cpp

WIP

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

Texture.cpp

Async load works, using exceptions for special resources.

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