#
# ChangeLog for trunk/src/story_entities/game_world.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# Jun 3, 2024, 4:57:50 PM

Sun, 05 Feb 2006 22:26:21 GMT patrick [7035]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/util/game_rules.cc (modified)
	* trunk/src/util/game_rules.h (modified)
	* trunk/src/util/multiplayer_team_deathmatch.cc (modified)
	* trunk/src/util/multiplayer_team_deathmatch.h (modified)

	trunk: game rules loading problems


Fri, 03 Feb 2006 20:16:07 GMT bensch [7029]
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)

	orxonox/trunk: element2d's should be cleanly deleted at the end now
	:)


Fri, 03 Feb 2006 02:03:59 GMT bensch [7004]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/world_entities/space_ships/turbine_hover.cc (modified)

	orxonox/trunk: togglePNodeVisibility as it can be .... cool :)


Thu, 02 Feb 2006 21:55:43 GMT bensch [6992]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)

	orxonox/trunk: now the StoryEntity stores the path it was loaded ...


Thu, 02 Feb 2006 21:02:24 GMT bensch [6989]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/single_player_world.cc (modified)
	* trunk/src/world_entities/image_entity.cc (modified)

	trunk: story entity work.


Thu, 02 Feb 2006 19:31:10 GMT bensch [6988]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/world_entities/environments/model_entity.h (modified)

	orxonox/trunk: soundEngine works again


Thu, 02 Feb 2006 13:45:07 GMT bensch [6981]
	* trunk/src/lib/graphics/effects/graphics_effect.cc (modified)
	* trunk/src/lib/graphics/importer/height_map.h (modified)
	* trunk/src/lib/graphics/importer/media_container.h (modified)
	* trunk/src/lib/graphics/importer/movie_player.h (modified)
	* trunk/src/lib/graphics/importer/texture.h (modified)
	* trunk/src/lib/graphics/importer/texture_sequence.h (modified)
	* trunk/src/lib/graphics/text_engine/text.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_audio.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_banner.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_exec.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_flags.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_keys.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_update.h (modified)
	* trunk/src/lib/gui/gtk_gui/gui_video.h (modified)
	* trunk/src/lib/network/connection_monitor.h (modified)
	* trunk/src/lib/network/converter.h (modified)
	* trunk/src/lib/network/data_stream.h (modified)
	* trunk/src/lib/network/network_game_manager.h (modified)
	* trunk/src/lib/network/network_manager.h (modified)
	* trunk/src/lib/network/network_protocol.h (modified)
	* trunk/src/lib/network/network_socket.h (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/network/server_socket.h (modified)
	* trunk/src/lib/parser/ini_parser/ini_parser.h (modified)
	* trunk/src/lib/shell/shell_command_class.h (modified)
	* trunk/src/lib/sound/ogg_player.h (modified)
	* trunk/src/lib/sound/sound_buffer.h (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.h (modified)
	* trunk/src/subprojects/framework.h (modified)
	* trunk/src/subprojects/network/network_unit_test.h (modified)
	* trunk/src/subprojects/network/read_sync.h (modified)
	* trunk/src/subprojects/network/simple_sync.h (modified)
	* trunk/src/subprojects/network/write_sync.h (modified)
	* trunk/src/util/loading/game_loader.h (modified)
	* trunk/src/util/loading/load_param.h (modified)
	* trunk/src/util/track/track_manager.h (modified)
	* trunk/src/world_entities/environments/water.h (modified)
	* trunk/src/world_entities/movie_entity.h (modified)
	* trunk/src/world_entities/npcs/npc.h (modified)
	* trunk/src/world_entities/npcs/npc_test.h (modified)
	* trunk/src/world_entities/npcs/npc_test1.h (modified)
	* trunk/src/world_entities/recorder.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)

	trunk: some virtuals


Tue, 31 Jan 2006 00:49:04 GMT patrick [6878]
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/story_entity.cc (modified)

	trunk: now working with element2d only, game always returns to menu ...


Mon, 30 Jan 2006 01:01:00 GMT bensch [6845]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)

	trunk: Element2D's should be loadable over the <Elements> </Elements>
	tab


Sun, 29 Jan 2006 23:52:08 GMT patrick [6839]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/simple_game_menu.h (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)

	trunk: the menu is processing


Sun, 29 Jan 2006 22:59:39 GMT patrick [6835]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/simple_game_menu.cc (modified)
	* trunk/src/story_entities/simple_game_menu.h (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)

	trunk: resturcture of the game menu for multi-level menus


Sun, 29 Jan 2006 13:10:48 GMT bensch [6827]
	* trunk/src/lib/sound/ogg_player.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/game_world_data.h (modified)

	trunk: Music should be loadable


Thu, 26 Jan 2006 17:47:32 GMT bensch [6780]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/shell/shell.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/camera.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/planet.cc (modified)
	* trunk/src/world_entities/power_ups/laser_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/terrain.cc (modified)

	trunk: war of the popers


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


Sat, 21 Jan 2006 00:18:19 GMT bensch [6634]
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/graphics_engine.cc (modified)
	* trunk/src/lib/graphics/importer/texture.cc (modified)
	* trunk/src/lib/lang/base_object.cc (modified)
	* trunk/src/lib/network/converter.cc (modified)
	* trunk/src/lib/network/converter.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_socket.cc (modified)
	* trunk/src/lib/network/network_stream.cc (modified)
	* trunk/src/lib/network/network_stream.h (modified)
	* trunk/src/lib/sound/sound_source.h (modified)
	* trunk/src/story_entities/Makefile.am (modified)
	* trunk/src/story_entities/campaign_data.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/game_world_data.h (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/story_entities/simple_game_menu.cc (copied)
	* trunk/src/story_entities/simple_game_menu.h (copied)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/subprojects/network/Makefile.am (modified)
	* trunk/src/subprojects/network/isolated_unit_test.cc (copied)
	* trunk/src/subprojects/network/isolated_unit_test.h (copied)
	* trunk/src/subprojects/network/read_sync.cc (modified)
	* trunk/src/subprojects/network/simple_sync.cc (modified)
	* trunk/src/subprojects/network/write_sync.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/image_entity.cc (copied)
	* trunk/src/world_entities/image_entity.h (copied)
	* trunk/src/world_entities/planet.cc (copied)
	* trunk/src/world_entities/planet.h (copied)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.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/world_entity.cc (modified)

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

	merged ...


Thu, 19 Jan 2006 17:23:56 GMT bensch [6619]
	* trunk/src/lib/event/event_handler.cc (modified)
	* trunk/src/lib/particles/Makefile.am (modified)
	* trunk/src/lib/particles/engine (added)
	* trunk/src/lib/particles/engine/particle_engine.cc (moved)
	* trunk/src/lib/particles/engine/particle_engine.h (moved)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_emitter.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/world_entities/projectiles/bomb.cc (modified)
	* trunk/src/world_entities/projectiles/guided_missile.cc (modified)
	* trunk/src/world_entities/projectiles/laser.cc (modified)
	* trunk/src/world_entities/projectiles/rocket.cc (modified)
	* trunk/src/world_entities/projectiles/test_bullet.cc (modified)

	orxonox/trunk: rendering without the ParticleEngine, so now we are ...


Tue, 17 Jan 2006 21:01:07 GMT bensch [6512]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/graphics/light.cc (modified)
	* trunk/src/lib/graphics/light.h (modified)
	* trunk/src/lib/graphics/render2D/element_2d.cc (modified)
	* trunk/src/lib/graphics/render2D/element_2d.h (modified)
	* trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.h (modified)
	* trunk/src/lib/lang/base_object.h (modified)
	* trunk/src/lib/particles/particle_emitter.cc (modified)
	* trunk/src/lib/particles/particle_emitter.h (modified)
	* trunk/src/lib/particles/particle_engine.h (modified)
	* trunk/src/lib/particles/particle_system.cc (modified)
	* trunk/src/lib/particles/particle_system.h (modified)
	* trunk/src/lib/physics/fields/field.cc (modified)
	* trunk/src/lib/physics/fields/field.h (modified)
	* trunk/src/lib/physics/fields/gravity.cc (modified)
	* trunk/src/lib/physics/fields/gravity.h (modified)
	* trunk/src/lib/physics/physics_connection.cc (modified)
	* trunk/src/lib/physics/physics_engine.h (modified)
	* trunk/src/proto/proto_world_entity.cc (modified)
	* trunk/src/proto/proto_world_entity.h (modified)
	* trunk/src/story_entities/campaign.cc (modified)
	* trunk/src/story_entities/campaign.h (modified)
	* trunk/src/story_entities/campaign_data.h (modified)
	* trunk/src/story_entities/dedicated_server_world.cc (modified)
	* trunk/src/story_entities/dedicated_server_world.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/story_entities/multi_player_world.cc (modified)
	* trunk/src/story_entities/multi_player_world.h (modified)
	* trunk/src/story_entities/single_player_world.cc (modified)
	* trunk/src/story_entities/single_player_world.h (modified)
	* trunk/src/story_entities/story_entity.cc (modified)
	* trunk/src/story_entities/story_entity.h (modified)
	* trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified)
	* trunk/src/subprojects/collision_detection/collision_test_entity.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/hud.h (modified)
	* trunk/src/util/track/track_manager.cc (modified)
	* trunk/src/util/track/track_manager.h (modified)
	* trunk/src/world_entities/creatures/md2_creature.cc (modified)
	* trunk/src/world_entities/creatures/md2_creature.h (modified)
	* trunk/src/world_entities/environment.cc (modified)
	* trunk/src/world_entities/environment.h (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.h (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/projectiles/bomb.cc (modified)
	* trunk/src/world_entities/projectiles/bomb.h (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/skybox.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.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/spawning_point.h (modified)
	* trunk/src/world_entities/terrain.cc (modified)
	* trunk/src/world_entities/terrain.h (modified)
	* trunk/src/world_entities/test_entity.cc (modified)
	* trunk/src/world_entities/test_entity.h (modified)
	* trunk/src/world_entities/weapons/aim.cc (modified)
	* trunk/src/world_entities/weapons/aim.h (modified)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/aiming_turret.h (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)
	* trunk/src/world_entities/weapons/cannon.h (modified)
	* trunk/src/world_entities/weapons/crosshair.cc (modified)
	* trunk/src/world_entities/weapons/crosshair.h (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.h (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.h (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/turret.h (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)
	* trunk/src/world_entities/weapons/weapon.h (modified)
	* trunk/src/world_entities/weapons/weapon_manager.cc (modified)
	* trunk/src/world_entities/weapons/weapon_manager.h (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	orxonox/trunk: loadParams is now virtual.
	ALL THE CLASSES HAVE TO ...


Wed, 11 Jan 2006 20:58:22 GMT patrick [6498]
	* trunk/src/lib/coord/p_node.cc (modified)
	* trunk/src/lib/coord/p_node.h (modified)
	* trunk/src/lib/lang/base_object.cc (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/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.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/story_entities/multi_player_world_data.h (modified)
	* trunk/src/util/hud.cc (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/power_ups/param_power_up.cc (modified)
	* trunk/src/world_entities/power_ups/power_up.cc (modified)
	* trunk/src/world_entities/power_ups/turret_power_up.cc (modified)
	* trunk/src/world_entities/skybox.cc (modified)
	* trunk/src/world_entities/space_ships/space_ship.cc (modified)
	* trunk/src/world_entities/world_entity.cc (modified)
	* trunk/src/world_entities/world_entity.h (modified)

	trunk: merged the network branche into the trunk


Mon, 09 Jan 2006 23:39:08 GMT bensch [6457]
	* trunk/src/lib/graphics/importer/grid.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/environments/water.cc (modified)
	* trunk/src/world_entities/environments/water.h (modified)

	water works


Sun, 08 Jan 2006 01:00:48 GMT bensch [6434]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world_data.cc (modified)
	* trunk/src/story_entities/multi_player_world_data.cc (modified)
	* trunk/src/world_entities/Makefile.am (modified)
	* trunk/src/world_entities/projectiles (added)
	* trunk/src/world_entities/projectiles/bomb.cc (moved)
	* trunk/src/world_entities/projectiles/bomb.h (moved)
	* trunk/src/world_entities/projectiles/guided_missile.cc (moved)
	* trunk/src/world_entities/projectiles/guided_missile.h (moved)
	* trunk/src/world_entities/projectiles/laser.cc (moved)
	* trunk/src/world_entities/projectiles/laser.h (moved)
	* trunk/src/world_entities/projectiles/projectile.cc (moved)
	* trunk/src/world_entities/projectiles/projectile.h (moved)
	* trunk/src/world_entities/projectiles/rocket.cc (moved)
	* trunk/src/world_entities/projectiles/rocket.h (moved)
	* trunk/src/world_entities/projectiles/test_bullet.cc (moved)
	* trunk/src/world_entities/projectiles/test_bullet.h (moved)
	* trunk/src/world_entities/weapons/aiming_turret.cc (modified)
	* trunk/src/world_entities/weapons/cannon.cc (modified)
	* trunk/src/world_entities/weapons/targeting_turret.cc (modified)
	* trunk/src/world_entities/weapons/test_gun.cc (modified)
	* trunk/src/world_entities/weapons/turret.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)

	orxonox/trunk: moved the projectiles to Projectiles


Sun, 08 Jan 2006 00:50:16 GMT bensch [6433]
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/world_entities/npcs/ground_turret.cc (modified)
	* trunk/src/world_entities/weapons/guided_missile.cc (modified)
	* trunk/src/world_entities/weapons/rocket.cc (modified)
	* trunk/src/world_entities/weapons/weapon.cc (modified)

	orxonox/trunk: the turret now fires too


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 ...


Fri, 06 Jan 2006 14:28:51 GMT bensch [6416]
	* branches/network/src/story_entities/game_world.cc (modified)

	network: PNodes visible again