#
# ChangeLog for code/branches/shaders_merge
#
# Generated by Trac 1.0.9
# May 3, 2024, 9:34:33 PM

Tue, 19 Jan 2016 22:05:02 GMT landauf [11079]
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	bugfix: the attached objects are stored in a set, so there's no ...


Tue, 19 Jan 2016 21:49:57 GMT landauf [11078]
	* code/branches/shaders_merge/src/orxonox/Scene.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	fixed numerous issues:
	 - fixed memory leaks (delete allocated heap ...


Mon, 18 Jan 2016 21:35:11 GMT landauf [11075]
	* 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/Billboard.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.cc (modified)
	* code/branches/shaders_merge/src/orxonox/graphics/LensFlare.h (modified)

	fixed author and added some c++11 features


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'


Mon, 18 Jan 2016 20:58:41 GMT landauf [11072]
	* code/branches/shaders_merge (copied)

	created branch to merge 'shaders' branch (from pps HS 2012)