#
# ChangeLog for branches/adm/README in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 27, 2024, 6:51:47 AM

Thu, 10 May 2007 14:26:44 GMT snellen [10652]
	* branches/adm (copied)

	new branch for the development of th automatic defence mechanism


Mon, 04 Dec 2006 17:42:46 GMT patrick [10013]
	* trunk/README (modified)
	* trunk/src/lib/collision_detection/aabb_tree_node.cc (modified)
	* trunk/src/lib/collision_detection/obb_tree_node.cc (modified)
	* trunk/src/lib/collision_reaction/Makefile.am (modified)
	* trunk/src/lib/collision_reaction/collision.cc (modified)
	* trunk/src/lib/collision_reaction/collision.h (modified)
	* trunk/src/lib/collision_reaction/collision_event.cc (modified)
	* trunk/src/lib/collision_reaction/collision_event.h (modified)
	* trunk/src/lib/collision_reaction/collision_filter.cc (copied)
	* trunk/src/lib/collision_reaction/collision_filter.h (copied)
	* trunk/src/lib/collision_reaction/collision_handle.cc (deleted)
	* trunk/src/lib/collision_reaction/collision_handle.h (deleted)
	* trunk/src/lib/collision_reaction/collision_reaction.cc (modified)
	* trunk/src/lib/collision_reaction/collision_reaction.h (modified)
	* trunk/src/lib/collision_reaction/collision_tube.cc (copied)
	* trunk/src/lib/collision_reaction/collision_tube.h (copied)
	* trunk/src/lib/collision_reaction/cr_defs.h (modified)
	* trunk/src/lib/collision_reaction/cr_engine.cc (modified)
	* trunk/src/lib/collision_reaction/cr_engine.h (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* trunk/src/lib/collision_reaction/cr_object_damage.h (modified)
	* trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_full_walk.h (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified)
	* trunk/src/lib/graphics/importer/bsp_manager.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/world_entities/creatures/fps_player.cc (modified)
	* trunk/src/world_entities/npcs/attractor_mine.cc (modified)
	* trunk/src/world_entities/npcs/generic_npc.cc (modified)
	* trunk/src/world_entities/projectiles/projectile.cc (modified)
	* trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified)
	* trunk/src/world_entities/weapons/aiming_system.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	merged the collision reaction branche back to trunk