sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara/Graphics
History
Lynix 5f5be93992 Merge remote-tracking branch 'origin/master' into Resource-Update 
Conflicts:
	include/Nazara/Audio/Music.hpp
	include/Nazara/Audio/SoundBuffer.hpp
	include/Nazara/Core/Resource.hpp
	include/Nazara/Core/ResourceListener.hpp
	include/Nazara/Graphics/Material.hpp
	include/Nazara/Renderer/Context.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/Shader.hpp
	include/Nazara/Renderer/Texture.hpp
	include/Nazara/Renderer/UberShader.hpp
	include/Nazara/Utility/Animation.hpp
	include/Nazara/Utility/Buffer.hpp
	include/Nazara/Utility/Image.hpp
	include/Nazara/Utility/IndexBuffer.hpp
	include/Nazara/Utility/Mesh.hpp
	include/Nazara/Utility/SkeletalMesh.hpp
	include/Nazara/Utility/Skeleton.hpp
	include/Nazara/Utility/StaticMesh.hpp
	include/Nazara/Utility/SubMesh.hpp
	include/Nazara/Utility/VertexBuffer.hpp
	include/Nazara/Utility/VertexDeclaration.hpp
	src/Nazara/Core/Resource.cpp
	src/Nazara/Core/ResourceListener.cpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/SkinningManager.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Utility/Mesh.cpp

Former-commit-id: 99b5ad26a19fe9c9f8118da7b5920bffe89f60f8
 		2015-01-25 19:29:55 +01:00
..
AbstractBackground.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
AbstractRenderQueue.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
AbstractRenderTechnique.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
AbstractViewer.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Camera.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
ColorBackground.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Config.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ConfigCheck.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Debug.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DebugOff.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredBloomPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredDOFPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredFXAAPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredFinalPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredFogPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredForwardPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredGeometryPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredPhongLightingPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredRenderPass.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
DeferredRenderQueue.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
DeferredRenderTechnique.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Drawable.hpp (Drawable) Made destructor virtual 2015-01-25 16:34:34 +01:00
Enums.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ForwardRenderQueue.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ForwardRenderTechnique.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Graphics.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
GuillotineTextureAtlas.hpp Fixed crash on Utility uninitialisation 2015-01-17 22:55:50 +01:00
Light.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
LightManager.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Material.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Model.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ParticleController.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ParticleDeclaration.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ParticleEmitter.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ParticleGenerator.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ParticleMapper.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ParticleMapper.inl Updated copyright year 2015-01-21 20:53:01 +01:00
ParticleRenderer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ParticleStruct.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ParticleSystem.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
RenderTechniques.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Scene.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
Scene.inl (Scene) Added FindNode(As) and RemoveNode methods 2015-01-24 22:00:55 +01:00
SceneNode.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
SceneRoot.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
SkeletalModel.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
SkinningManager.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
SkyboxBackground.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Sprite.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
TextSprite.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
TextureBackground.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
View.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00