sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara
History
Lynix eaf1bb3601 Merge branch 'NDK-Refactor' into NDK 
Conflicts:
	examples/HardwareInfo/main.cpp
	include/Nazara/Renderer/Enums.hpp
	include/Nazara/Renderer/GpuQuery.hpp
	include/Nazara/Renderer/OpenGL.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/RenderTexture.hpp
	include/Nazara/Renderer/Texture.hpp
	src/Nazara/Graphics/AbstractRenderTechnique.cpp
	src/Nazara/Graphics/DeferredRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/GpuQuery.cpp
	src/Nazara/Renderer/OpenGL.cpp
	src/Nazara/Renderer/RenderBuffer.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Renderer/Shader.cpp
	src/Nazara/Renderer/ShaderStage.cpp
	src/Nazara/Renderer/Texture.cpp

Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
 		2015-09-25 23:16:58 +02:00
..
Audio Switch from Nz prefix to namespace Nz 2015-09-25 19:20:05 +02:00
Core Switch from Nz prefix to namespace Nz 2015-09-25 19:20:05 +02:00
Graphics Merge branch 'NDK-Refactor' into NDK 2015-09-25 23:16:58 +02:00
Lua Merge branch 'NDK-Refactor' into NDK 2015-09-25 23:16:58 +02:00
Math Merge branch 'NDK-Refactor' into NDK 2015-09-25 23:16:58 +02:00
Noise Switch from Nz prefix to namespace Nz 2015-09-25 19:20:05 +02:00
Physics Switch from Nz prefix to namespace Nz 2015-09-25 19:20:05 +02:00
Renderer Merge branch 'NDK-Refactor' into NDK 2015-09-25 23:16:58 +02:00
Utility Merge branch 'NDK-Refactor' into NDK 2015-09-25 23:16:58 +02:00
Audio.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Core.hpp Core: Remove NonCopyable 2015-09-24 00:37:21 +02:00
Debug.hpp Regenerated global headers (and updated copyright year, again) 2015-01-30 22:33:41 +01:00
DebugOff.hpp Regenerated global headers (and updated copyright year, again) 2015-01-30 22:33:41 +01:00
Graphics.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Lua.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Math.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Noise.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Physics.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Prerequesites.hpp Switch from Nz prefix to namespace Nz 2015-09-25 19:20:05 +02:00
Renderer.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00
Utility.hpp Regenerate global headers 2015-06-24 13:56:18 +02:00