sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
NazaraEngine/include/Nazara
History
Lynix ead44173ba Merge remote-tracking branch 'origin/Particle-Update' 
Conflicts:
	include/Nazara/Graphics/Enums.hpp
	include/Nazara/Graphics/ForwardRenderQueue.hpp
	include/Nazara/Graphics/ForwardRenderTechnique.hpp
	include/Nazara/Graphics/Sprite.hpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/Resources/Shaders/Basic/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert
	src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert
	src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
	src/Nazara/Graphics/Sprite.cpp

Former-commit-id: 73139ce47d7721635d87c74b2ca1183c2f67c090
 		2015-01-19 02:20:28 +01:00
..
Audio Added ResourceListenerWrapper 2015-01-18 23:59:01 +01:00
Core Changed meaning of return value from resource events 2015-01-19 00:00:54 +01:00
Graphics Merge remote-tracking branch 'origin/Particle-Update' 2015-01-19 02:20:28 +01:00
Lua Minor changes 2015-01-03 21:45:37 +01:00
Math Added OpenGL-like Vector constructors 2015-01-05 02:32:57 +01:00
Noise Big config/debug update 2014-07-08 10:56:37 +02:00
Physics Big config/debug update 2014-07-08 10:56:37 +02:00
Renderer Removed ShaderUniform_[EyePosition|SceneAmbient] 2015-01-19 00:15:01 +01:00
Utility Added ResourceListenerWrapper 2015-01-18 23:59:01 +01:00
Audio.hpp Big UberShader update 2014-02-21 19:27:39 +01:00
Core.hpp Regenerated global headers 2015-01-17 00:39:40 +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 Regenerated global headers 2015-01-17 00:39:40 +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 Added Nazara[Prefix|Suffix](Macro) 2014-07-08 10:46:09 +02: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