Tleety 2cae4e3fb2 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/RenderQueue.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/QualityAssurance.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/Sprite.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

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

..

.gitkeep

Added resource folder for lightweight run-time resources that is also relevant to code, eg. shaders and XML schemas

2015-11-20 16:06:30 +01:00

BasicForward.frag.glsl

Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info

2016-01-14 11:12:02 +01:00

BasicForward.vert.glsl

Importing custom mesh without material.

2016-01-18 19:37:55 +01:00

CullLights.comp.glsl

WIP

2016-01-18 17:57:45 +01:00

DrawColorCorrection.frag.glsl

Defender shield should now be working

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

DrawColorCorrection.vert.glsl

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

DrawScreenQuad.frag.glsl

Added 3D picking of models to renderer

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

DrawScreenQuad.vert.glsl

Added 3D picking of models to renderer

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

ExplosionEffect.frag.glsl

Merge

2016-01-19 09:58:52 +01:00

ExplosionEffect.geom.glsl

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

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

ExplosionEffect.vert.glsl

Merge

2016-01-19 09:58:52 +01:00

FillDepthBuffer.frag.glsl

Defender shield should now be working

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

FillDepthBuffer.vert.glsl

Defender shield should now be working

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

FillDepthBufferSkinned.vert.glsl

Merge fixes

2016-02-10 13:44:47 +01:00

ForwardPlus.frag.glsl

Added texture tiling to shaders (exkluding ExplosinEffects)

2016-02-07 15:27:26 +01:00

ForwardPlus.vert.glsl

Supports skinnd and unskinned meshes

2016-02-08 13:01:10 +01:00

ForwardPlusSkinned.vert.glsl

Merge fixes

2016-02-10 13:44:47 +01:00

ForwardPlusSplatMap.frag.glsl

Added texture tiling to shaders (exkluding ExplosinEffects)

2016-02-07 15:27:26 +01:00

Gaussian_horiz.frag.glsl

Some wierd shader faults and merge error fixe

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

Gaussian_horiz.vert.glsl

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

Gaussian_vert.frag.glsl

Some wierd shader faults and merge error fixe

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

Gaussian_vert.vert.glsl

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

GridFrustum.comp.glsl

Frustum culling now works correctly for all resolutions

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

Picking.frag.glsl

Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info

2016-01-14 11:12:02 +01:00

Picking.vert.glsl

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

PickingSkinned.vert.glsl

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

ShieldStencil.frag.glsl

Defender shield should now be working

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

ShieldStencil.vert.glsl

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

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

ShieldStencilSkinned.vert.glsl

Merge fixes

2016-02-10 13:44:47 +01:00

Sprite.frag.glsl

Animations kind of working

2016-02-06 18:09:51 +01:00

Sprite.vert.glsl

PNG is now a resource.

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

Text.frag.glsl

Text fixed

2016-01-23 18:17:20 +01:00

Text.vert.glsl

Text renderer up and working, needs more work to be compatible with the ResourceManager and the Entity Component system

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