#
# ChangeLog for code/branches/merger/bin
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 11:22:11 PM

Wed, 12 Dec 2007 21:33:38 GMT nicolasc [490]
	* code/branches/merger/Media/material (copied)
	* code/branches/merger/Media/material/PE_materials.material (copied)
	* code/branches/merger/Media/particle/rauch.particle (copied)
	* code/branches/merger/Media/particle/schuss.particle (copied)
	* code/branches/merger/Media/particle/strahl.particle (copied)
	* code/branches/merger/Media/particle/strahl2.particle (copied)
	* code/branches/merger/Media/particle/treibwerk.particle (copied)
	* code/branches/merger/Media/textures (copied)
	* code/branches/merger/Media/textures/Thumbs.db (copied)
	* code/branches/merger/Media/textures/bigflame.png (copied)
	* code/branches/merger/Media/textures/black.png (copied)
	* code/branches/merger/Media/textures/explosion.png (copied)
	* code/branches/merger/Media/textures/flare.png (copied)
	* code/branches/merger/Media/textures/flaretrail.png (copied)
	* code/branches/merger/Media/textures/ring_flare.png (copied)
	* code/branches/merger/Media/textures/ring_flare2.png (copied)
	* code/branches/merger/Media/textures/smoke.png (copied)
	* code/branches/merger/Media/textures/streak.png (copied)
	* code/branches/merger/bin/resources.cfg (modified)
	* code/branches/merger/src/particle (copied)
	* code/branches/merger/src/particle/ParticleInterface.cc (copied)
	* code/branches/merger/src/particle/ParticleInterface.h (copied)

	merged particle branch


Wed, 12 Dec 2007 21:29:08 GMT nicolasc [489]
	* code/branches/merger (copied)

	created new merger branch to merge particle hud an some other ...


Wed, 12 Dec 2007 18:54:44 GMT nicolape [480]
	* code/branches/FICN/bin/levels/sample.oxw (modified)
	* code/branches/FICN/bin/levels/sp_level_moonstation.oxw (deleted)
	* code/branches/FICN/src/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/CMakeLists.txt (modified)
	* code/branches/FICN/src/loader/LevelLoader.cc (modified)
	* code/branches/FICN/src/loader/LevelLoader.h (modified)
	* code/branches/FICN/src/orxonox/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified)
	* code/branches/FICN/src/orxonox/objects/BaseObject.h (modified)
	* code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified)
	* code/branches/FICN/src/orxonox/objects/test1.cc (modified)
	* code/branches/FICN/src/orxonox/objects/test1.h (modified)
	* code/branches/FICN/src/orxonox/orxonox.cc (modified)

	Level loader working, see test1 class