#
# ChangeLog for branches/coll_rect.merge in orxonox.OLD
#
# Generated by Trac 1.0.9
# May 15, 2024, 12:22:42 AM

Mon, 04 Dec 2006 16:32:59 GMT patrick [10012]
	* branches/coll_rect.merge/src/world_entities/npcs/attractor_mine.cc (modified)
	* branches/coll_rect.merge/src/world_entities/space_ships/spacecraft_2d.cc (modified)

	now the attractor mines collide with the spaceshipt too, and vice
	versa


Mon, 04 Dec 2006 16:16:13 GMT patrick [10011]
	* branches/coll_rect.merge/src/lib/collision_detection/obb_tree_node.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_engine.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_object_damage.cc (modified)

	collision detection is working again, completely


Mon, 04 Dec 2006 15:39:45 GMT patrick [10010]
	* branches/coll_rect.merge/README (modified)
	* branches/coll_rect.merge/src/lib/collision_detection/aabb_tree_node.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_detection/obb_tree_node.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/Makefile.am (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_event.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_event.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_filter.cc (copied)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_filter.h (copied)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_handle.cc (deleted)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_handle.h (deleted)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_reaction.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_reaction.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_tube.cc (copied)
	* branches/coll_rect.merge/src/lib/collision_reaction/collision_tube.h (copied)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_defs.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_engine.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_engine.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_object_damage.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_object_damage.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_physics_full_walk.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_physics_full_walk.h (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified)
	* branches/coll_rect.merge/src/lib/collision_reaction/cr_physics_ground_walk.h (modified)
	* branches/coll_rect.merge/src/lib/graphics/importer/bsp_manager.cc (modified)
	* branches/coll_rect.merge/src/story_entities/game_world.cc (modified)
	* branches/coll_rect.merge/src/story_entities/game_world_data.cc (modified)
	* branches/coll_rect.merge/src/world_entities/creatures/fps_player.cc (modified)
	* branches/coll_rect.merge/src/world_entities/npcs/generic_npc.cc (modified)
	* branches/coll_rect.merge/src/world_entities/weapons/aiming_system.cc (modified)
	* branches/coll_rect.merge/src/world_entities/world_entity.cc (modified)
	* branches/coll_rect.merge/src/world_entities/world_entity.h (modified)

	merged the temp branch


Mon, 04 Dec 2006 15:02:21 GMT patrick [10009]
	* branches/coll_rect.merge (copied)

	create copy-merge-move branche


Thu, 23 Nov 2006 10:51:39 GMT bensch [9951]
	* trunk/src/lib/util/debug.h (modified)

	Debug-output: m minor bugfix of the Debug output