#
# ChangeLog for code/branches/shaders_merge/data/levels/shadertest.oxw
#
# Generated by Trac 1.0.9
# May 24, 2024, 7:32:46 AM

Mon, 18 Jan 2016 21:15:35 GMT landauf [11074]
	* code/branches/shaders_merge/data/levels/shadertest.oxw (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	eol-style native


Mon, 18 Jan 2016 21:12:53 GMT landauf [11073]
	* code/branches/shaders_merge (modified)
	* code/branches/shaders_merge/data/levels/shadertest.oxw (copied)
	* code/branches/shaders_merge/src/libraries/tools/Mesh.cc (modified)
	* code/branches/shaders_merge/src/libraries/tools/Mesh.h (modified)
	* code/branches/shaders_merge/src/orxonox/CMakeLists.txt (modified)
	* code/branches/shaders_merge/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.cc (copied)
	* code/branches/shaders_merge/src/orxonox/RenderQueueListener.h (copied)
	* code/branches/shaders_merge/src/orxonox/Scene.cc (modified)
	* code/branches/shaders_merge/src/orxonox/Scene.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Billboard.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Billboard.h (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (copied)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (copied)
	* code/branches/shaders_merge/src/orxonox/graphics/Model.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/Model.h (modified)

	merged branch 'shaders' into branch 'shaders_merge'


Fri, 14 Dec 2012 13:26:47 GMT davidsa [9511]
	* code/branches/shaders/data/levels/shadertest.oxw (modified)

	tweaked lens flare base colour in the test level