#
# ChangeLog for branches/cdmerge in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 23, 2024, 6:19:50 PM

Tue, 31 Jan 2006 14:45:13 GMT patrick [6897]
	* branches/cdmerge/src/defs/debug.h (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree_node.cc (modified)
	* branches/cdmerge/src/story_entities/game_world.cc (modified)
	* branches/cdmerge/src/story_entities/game_world.h (modified)
	* branches/cdmerge/src/world_entities/world_entity.cc (modified)

	cdmerge: on the work agian


Tue, 31 Jan 2006 13:41:28 GMT patrick [6894]
	* branches/cdmerge/src/lib/collision_detection/bounding_sphere.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/bounding_volume.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/bounding_volume.h (modified)
	* branches/cdmerge/src/lib/collision_detection/bv_tree.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/bv_tree.h (modified)
	* branches/cdmerge/src/lib/collision_detection/bv_tree_node.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/bv_tree_node.h (modified)
	* branches/cdmerge/src/lib/collision_detection/cd_engine.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/collision.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/obb.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/obb.h (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree.h (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree_node.cc (modified)
	* branches/cdmerge/src/lib/collision_detection/obb_tree_node.h (modified)
	* branches/cdmerge/src/world_entities/world_entity.cc (modified)

	cdmerge: merged with the newest trunk an corrected some segfaults


Tue, 31 Jan 2006 13:01:16 GMT patrick [6891]
	* branches/cdmerge (copied)
	* branches/cdmerge/src/lib/graphics/effects/lense_flare.cc (copied)
	* branches/cdmerge/src/lib/graphics/effects/lense_flare.h (copied)
	* branches/cdmerge/src/lib/graphics/render2D/billboard.cc (copied)

	branches: added cdmerge branche for merging war


Tue, 31 Jan 2006 03:38:57 GMT patrick [6888]
	* trunk/src/lib/graphics/effects/lense_flare.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)

	trunk: the flare now look good, but occlusion culling missing :D ...