#
# ChangeLog for branches/cd_merge in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 23, 2024, 8:36:00 PM

Mon, 23 Jan 2006 13:25:13 GMT bensch [6657]
	* branches/cd_merge/src/defs/debug.h (modified)
	* branches/cd_merge/src/lib/collision_detection/bounding_sphere.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/bounding_volume.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/bounding_volume.h (modified)
	* branches/cd_merge/src/lib/collision_detection/bv_tree.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/bv_tree.h (modified)
	* branches/cd_merge/src/lib/collision_detection/bv_tree_node.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/bv_tree_node.h (modified)
	* branches/cd_merge/src/lib/collision_detection/cd_engine.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/collision.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/obb.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/obb.h (modified)
	* branches/cd_merge/src/lib/collision_detection/obb_tree.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/obb_tree.h (modified)
	* branches/cd_merge/src/lib/collision_detection/obb_tree_node.cc (modified)
	* branches/cd_merge/src/lib/collision_detection/obb_tree_node.h (modified)
	* branches/cd_merge/src/lib/math/matrix.cc (modified)
	* branches/cd_merge/src/lib/util/executor/executor_specials.h (modified)
	* branches/cd_merge/src/orxonox.cc (modified)
	* branches/cd_merge/src/subprojects/collision_detection/collision_detection.cc (modified)

	orxonox/cd_merge: merged the old collision-detection here.


Mon, 23 Jan 2006 13:05:50 GMT bensch [6656]
	* branches/cd_merge (copied)

	copy of the Trunk as a new copy of the trunk


Mon, 23 Jan 2006 13:02:22 GMT bensch [6655]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/util/loading/resource_manager.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/items (added)
	* trunk/src/world_entities/items/item_container.cc (copied)
	* trunk/src/world_entities/items/item_container.h (copied)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/weapons/ammo_container.cc (copied)
	* trunk/src/world_entities/weapons/ammo_container.h (copied)

	orxonox/trunk: ammoContainer added