#
# ChangeLog for branches/network/src/story_entities/game_world.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 14, 2024, 4:20:12 AM

Wed, 25 Jan 2006 20:36:29 GMT patrick [6740]
	* branches/network (copied)
	* branches/network/src/lib/network/converter.cc (copied)
	* branches/network/src/lib/network/converter.h (copied)
	* branches/network/src/lib/network/network_game_manager.cc (copied)
	* branches/network/src/lib/network/network_game_manager.h (copied)
	* branches/network/src/lib/network/network_stream.cc (copied)
	* branches/network/src/world_entities/space_ships/space_ship.cc (copied)
	* branches/network/src/world_entities/space_ships/space_ship.h (copied)
	* branches/network/src/world_entities/weapons/weapon_manager.cc (copied)

	network: added branche network again


Wed, 25 Jan 2006 15:18:12 GMT bensch [6710]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/playable.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (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)

	merged the powerups back to the trunk