Lynix ead44173ba Merge remote-tracking branch 'origin/Particle-Update' ...

Conflicts:
	include/Nazara/Graphics/Enums.hpp
	include/Nazara/Graphics/ForwardRenderQueue.hpp
	include/Nazara/Graphics/ForwardRenderTechnique.hpp
	include/Nazara/Graphics/Sprite.hpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/Resources/Shaders/Basic/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
	src/Nazara/Graphics/Sprite.cpp

Former-commit-id: 73139ce47d7721635d87c74b2ca1183c2f67c090

2015-01-19 02:20:28 +01:00

..

AbstractBackground.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

AbstractRenderQueue.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

AbstractRenderTechnique.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

AbstractViewer.hpp

Added viewer-relative directions

2015-01-03 22:39:51 +01:00

Camera.hpp

Added viewer-relative directions

2015-01-03 22:39:51 +01:00

ColorBackground.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

Config.hpp

Big config/debug update

2014-07-08 10:56:37 +02:00

ConfigCheck.hpp

Big config/debug update

2014-07-08 10:56:37 +02:00

Debug.hpp

Big config/debug update

2014-07-08 10:56:37 +02:00

DebugOff.hpp

Fixed DebugOff

2014-08-05 09:42:37 +02:00

DeferredBloomPass.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

DeferredDOFPass.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

DeferredFinalPass.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

DeferredFogPass.hpp

Removed ShaderUniform_[EyePosition|SceneAmbient]

2015-01-19 00:15:01 +01:00

DeferredForwardPass.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

DeferredFXAAPass.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

DeferredGeometryPass.hpp

Removed ShaderUniform_[EyePosition|SceneAmbient]

2015-01-19 00:15:01 +01:00

DeferredPhongLightingPass.hpp

Removed ShaderUniform_[EyePosition|SceneAmbient]

2015-01-19 00:15:01 +01:00

DeferredRenderPass.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

DeferredRenderQueue.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

DeferredRenderTechnique.hpp

Made Initialize/Uninitialize static methods from non-submodules private

2014-04-21 00:08:34 +02:00

Drawable.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

Enums.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ForwardRenderQueue.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ForwardRenderTechnique.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

Graphics.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

GuillotineTextureAtlas.hpp

Fixed crash on Utility uninitialisation

2015-01-17 22:55:50 +01:00

Light.hpp

Modified SceneNode::FrustumCull

2014-06-05 21:28:17 +02:00

LightManager.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

Material.hpp

Added ResourceListenerWrapper

2015-01-18 23:59:01 +01:00

Model.hpp

Made SceneNodes non-movable

2015-01-17 00:15:01 +01:00

ParticleController.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ParticleDeclaration.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ParticleEmitter.hpp

Separated ParticleEmitter

2014-08-31 14:09:43 +02:00

ParticleGenerator.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ParticleMapper.hpp

Added particles first implementation

2014-08-08 17:17:58 +02:00

ParticleMapper.inl

Added particles first implementation

2014-08-08 17:17:58 +02:00

ParticleRenderer.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

ParticleStruct.hpp

Added particles first implementation

2014-08-08 17:17:58 +02:00

ParticleSystem.hpp

Merge remote-tracking branch 'origin/Particle-Update'

2015-01-19 02:20:28 +01:00

RenderTechniques.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

Scene.hpp

Added viewer-relative directions

2015-01-03 22:39:51 +01:00

SceneLayer.hpp

Happy thousandth commit Nazara

2014-01-12 20:16:21 +01:00

SceneNode.hpp

Made SceneNodes non-movable

2015-01-17 00:15:01 +01:00

SceneRoot.hpp

Modified SceneNode::FrustumCull

2014-06-05 21:28:17 +02:00

SkeletalModel.hpp

Added support for skeletal models (WIP)

2014-12-17 13:56:33 +01:00

SkinningManager.hpp

Added SkinningManager

2014-06-21 16:23:38 +02:00

SkyboxBackground.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

Sprite.hpp

Added default material to sprites

2015-01-17 00:34:09 +01:00

TextSprite.hpp

Added TextSprites

2015-01-17 00:16:52 +01:00

TextureBackground.hpp

Big UberShader update

2014-02-21 19:27:39 +01:00

View.hpp

Added View::SetSize(width, height)

2015-01-17 00:34:59 +01:00