#
# ChangeLog for branches/cdmerge/scripts in orxonox.OLD
#
# Generated by Trac 1.0.9
# Dec 28, 2024, 4:43:04 AM

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


Sat, 07 Jan 2006 22:07:22 GMT bensch [6424]
	* branches/preferences/AUTHORS (modified)
	* trunk/scripts/orxonoxServer.sh (copied)
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/data (copied)
	* trunk/src/lib/data/data_tank.cc (copied)
	* trunk/src/lib/data/data_tank.h (copied)
	* trunk/src/lib/network/network_game_manager.cc (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/synchronizeable.cc (modified)
	* trunk/src/orxonox.cc (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/campaign.h (modified)
	* trunk/src/story_entities/campaign_data.cc (copied)
	* trunk/src/story_entities/campaign_data.h (copied)
	* trunk/src/story_entities/debug_world.cc (modified)
	* trunk/src/story_entities/debug_world.h (modified)
	* trunk/src/story_entities/dedicated_server_world.cc (copied)
	* trunk/src/story_entities/dedicated_server_world.h (copied)
	* trunk/src/story_entities/game_world.cc (copied)
	* trunk/src/story_entities/game_world.h (copied)
	* trunk/src/story_entities/game_world_data.cc (copied)
	* trunk/src/story_entities/game_world_data.h (copied)
	* trunk/src/story_entities/multi_player_world.cc (copied)
	* trunk/src/story_entities/multi_player_world.h (copied)
	* trunk/src/story_entities/multi_player_world_data.cc (copied)
	* trunk/src/story_entities/multi_player_world_data.h (copied)
	* trunk/src/story_entities/network_world.cc (deleted)
	* trunk/src/story_entities/network_world.h (deleted)
	* trunk/src/story_entities/single_player_world.cc (copied)
	* trunk/src/story_entities/single_player_world.h (copied)
	* trunk/src/story_entities/single_player_world_data.cc (copied)
	* trunk/src/story_entities/single_player_world_data.h (copied)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/story_entities/world.cc (deleted)
	* trunk/src/story_entities/world.h (deleted)
	* trunk/src/subprojects/network/network_unit_test.cc (modified)
	* trunk/src/util/loading/game_loader.cc (modified)
	* trunk/src/util/loading/game_loader.h (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/param_power_up.h (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.h (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.h (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/weapon_power_up.h (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.h (modified)
	* trunk/src/world_entities/spawning_point.cc (modified)
	* trunk/src/world_entities/weapons/ground_turret.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: merged the branche network back to the trunk
	merged ...