sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara/Utility
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
..
AbstractAtlas.hpp Suppression of warnings 2015-01-21 13:51:49 +01:00
AbstractBuffer.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
AbstractImage.hpp Fixed AbstractImage destructor not being virtual 2015-01-16 12:53:23 +01:00
AbstractTextDrawer.hpp Added TextDrawer classes 2015-01-16 23:36:20 +01:00
Algorithm.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Algorithm.inl Updated copyright year 2015-01-21 20:53:01 +01:00
Animation.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Buffer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
BufferMapper.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
BufferMapper.inl 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
CubemapParams.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Cursor.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
Enums.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Event.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Font.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
FontData.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
FontGlyph.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
GuillotineImageAtlas.hpp Fixed crash on Utility uninitialisation 2015-01-17 22:55:50 +01:00
Icon.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Image.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
IndexBuffer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
IndexIterator.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
IndexIterator.inl Updated copyright year 2015-01-21 20:53:01 +01:00
IndexMapper.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Joint.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Joystick.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Keyboard.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Mesh.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
MeshData.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Mouse.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Node.hpp Merge remote-tracking branch 'origin/Scene-Update' 2015-01-25 16:35:18 +01:00
PixelFormat.hpp Fixed comment 2015-01-23 20:21:19 +01:00
PixelFormat.inl Updated copyright year 2015-01-21 20:53:01 +01:00
Sequence.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
SimpleTextDrawer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
SkeletalMesh.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
Skeleton.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
StaticMesh.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
SubMesh.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
TriangleIterator.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Utility.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
VertexBuffer.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
VertexDeclaration.hpp Merge remote-tracking branch 'origin/master' into Resource-Update 2015-01-25 19:29:55 +01:00
VertexMapper.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
VertexMapper.inl Updated copyright year 2015-01-21 20:53:01 +01:00
VertexStruct.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
VideoMode.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
Window.hpp Updated copyright year 2015-01-21 20:53:01 +01:00
WindowHandle.hpp Updated copyright year 2015-01-21 20:53:01 +01:00