#
# ChangeLog for branches/bsp_model in orxonox.OLD
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 4:41:20 PM

Thu, 01 Jun 2006 15:19:14 GMT bensch [8088]
	* branches/bsp_model/src/lib/graphics/importer/Makefile.am (modified)
	* branches/bsp_model/src/lib/graphics/importer/bsp_file.cc (modified)
	* branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (modified)

	merge complete


Thu, 01 Jun 2006 15:10:54 GMT bensch [8087]
	* branches/bsp_model/src/defs/class_id.h (modified)
	* branches/bsp_model/src/lib/collision_detection/cd_engine.cc (modified)
	* branches/bsp_model/src/lib/collision_detection/cd_engine.h (modified)
	* branches/bsp_model/src/lib/coord/p_node.h (modified)
	* branches/bsp_model/src/lib/graphics/importer/Makefile.am (modified)
	* branches/bsp_model/src/lib/graphics/importer/bsp_file.cc (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_file.h (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_manager.h (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_tree_leaf.cc (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_tree_leaf.h (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_tree_node.cc (copied)
	* branches/bsp_model/src/lib/graphics/importer/bsp_tree_node.h (copied)
	* branches/bsp_model/src/world_entities/WorldEntities.am (modified)
	* branches/bsp_model/src/world_entities/bsp_entity.cc (copied)
	* branches/bsp_model/src/world_entities/bsp_entity.h (copied)

	merges some merges


Thu, 01 Jun 2006 14:47:22 GMT bensch [8083]
	* branches/bsp_model (copied)

	new copy


Thu, 01 Jun 2006 12:28:16 GMT patrick [8068]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/importer/height_map.cc (modified)
	* trunk/src/lib/network/Makefile.am (modified)
	* trunk/src/lib/network/connection_monitor.cc (modified)
	* trunk/src/lib/network/connection_monitor.h (modified)
	* trunk/src/lib/network/message_manager.cc (modified)
	* trunk/src/lib/network/message_manager.h (modified)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/player_stats.cc (copied)
	* trunk/src/lib/network/player_stats.h (copied)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/lib/network/synchronizeable.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world.h (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/util/Makefile.am (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)
	* trunk/src/util/network_game_rules.cc (copied)
	* trunk/src/util/network_game_rules.h (copied)
	* trunk/src/util/object_manager.h (modified)
	* trunk/src/util/signal_handler.cc (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/spawning_point.h (modified)
	* trunk/src/world_entities/spectator.cc (copied)
	* trunk/src/world_entities/spectator.h (copied)

	trunk: merged the network branche back to trunk