sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara
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
..
Audio Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Core Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Graphics Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Lua Updated copyright year 2015-01-21 20:53:01 +01:00
Math (Ray) Fixed Intersect(Plane, T) method 2015-01-24 16:18:06 +01:00
Noise Updated copyright year 2015-01-21 20:53:01 +01:00
Physics Updated copyright year 2015-01-21 20:53:01 +01:00
Renderer Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Utility Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Audio.hpp Big UberShader update 2014-02-21 19:27:39 +01:00
Core.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Debug.hpp Fixed ParameterList placement new conflicting with MLT 2014-02-18 00:52:23 +01:00
DebugOff.hpp Happy thousandth commit Nazara 2014-01-12 20:16:21 +01:00
Graphics.hpp Removed unused file 2015-01-23 20:07:24 +01:00
Lua.hpp Big UberShader update 2014-02-21 19:27:39 +01:00
Math.hpp Fixed global math include 2014-09-03 13:30:21 +02:00
Noise.hpp Big UberShader update 2014-02-21 19:27:39 +01:00
Physics.hpp Big UberShader update 2014-02-21 19:27:39 +01:00
Prerequesites.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Renderer.hpp Fixed compilation error 2014-03-01 12:20:37 +01:00
Utility.hpp Regenerated global headers 2015-01-17 00:39:40 +01:00