sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara/Renderer
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
..
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
Context.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ContextParameters.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
DebugDrawer.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
Enums.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
GpuQuery.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
OpenGL.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
RenderBuffer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
RenderStates.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
RenderStates.inl Updated copyright year 2015-01-21 20:53:01 +01:00
RenderTarget.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
RenderTargetParameters.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
RenderTexture.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
RenderWindow.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Renderer.hpp Removed useless std::function from rendering code 2015-01-23 20:21:00 +01:00
Shader.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
ShaderLibrary.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
ShaderStage.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Texture.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
TextureSampler.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
UberShader.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
UberShaderInstance.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
UberShaderInstancePreprocessor.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
UberShaderLibrary.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
UberShaderPreprocessor.hpp Updated copyright year 2015-01-21 20:53:01 +01:00