# # ChangeLog for branches/proxy in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 29, 2024, 3:23:15 AM Fri, 28 Jul 2006 13:34:51 GMT patrick [9571] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) disconnecting instead of joining.. Fri, 28 Jul 2006 13:21:22 GMT patrick [9570] * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.h (modified) disconnecting client over the network via proxy control Fri, 28 Jul 2006 12:57:05 GMT bensch [9569] * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) more gui work Fri, 28 Jul 2006 12:50:13 GMT patrick [9568] * branches/proxy/src/lib/network/message_manager.cc (modified) synchronizeables from the masterserver get deleted now Fri, 28 Jul 2006 12:43:01 GMT bensch [9567] * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) more around the network statistics gui Fri, 28 Jul 2006 12:41:07 GMT patrick [9566] * branches/proxy/src/lib/network/message_manager.cc (modified) major server message forwarding alg fix Fri, 28 Jul 2006 12:19:52 GMT patrick [9565] * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) server team joining and gui showing fix Fri, 28 Jul 2006 12:04:40 GMT patrick [9564] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) nick name handling Fri, 28 Jul 2006 10:46:22 GMT patrick [9563] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) playable now gets assigned correctly. but clients can't play it yet Fri, 28 Jul 2006 10:42:36 GMT patrick [9562] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) message forwarding now with the real id of the sender Fri, 28 Jul 2006 10:33:29 GMT patrick [9561] * branches/proxy/src/lib/network/network_game_manager.cc (modified) tracing with debug out Fri, 28 Jul 2006 10:30:12 GMT bensch [9560] * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) resizing works perfectly :)... man there were little bugs... Fri, 28 Jul 2006 10:23:36 GMT patrick [9559] * branches/proxy/src/lib/network/player_stats.cc (modified) more documentation. clients now chooses the playable for the proxy:D ... Fri, 28 Jul 2006 10:18:58 GMT bensch [9558] * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_handler.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_handler.h (modified) resizing should work, but strangely it does not Fri, 28 Jul 2006 10:11:25 GMT patrick [9557] * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) found the bug, now the network should work :D Fri, 28 Jul 2006 10:11:07 GMT bensch [9556] * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) positioning works (almost) Fri, 28 Jul 2006 10:09:56 GMT patrick [9555] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) cleaned up a smaller memory leak Fri, 28 Jul 2006 10:07:51 GMT bensch [9554] * branches/proxy/src/lib/BuildLibs.am (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h (modified) * branches/proxy/src/lib/gui/gl/glgui_handler.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) event-listening Fri, 28 Jul 2006 09:58:26 GMT patrick [9553] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) found a bug in the debug output and switched implementation Fri, 28 Jul 2006 09:52:57 GMT bensch [9552] * branches/proxy/src/lib/BuildLibs.am (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) linking stuff Fri, 28 Jul 2006 09:50:41 GMT patrick [9551] * branches/proxy/src/lib/network/network_stream.cc (modified) a little more debug because i don't get it Fri, 28 Jul 2006 09:44:05 GMT bensch [9550] * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) should compile again :) Fri, 28 Jul 2006 09:43:02 GMT bensch [9549] * branches/proxy/src/lib/gui/gl/Makefile.am (modified) * branches/proxy/src/lib/gui/gl/glgui.h (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) * branches/proxy/src/world_entities/space_ships/hover.cc (modified) should link Fri, 28 Jul 2006 09:28:32 GMT patrick [9548] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) more docu and a much better debug interface Fri, 28 Jul 2006 09:23:52 GMT bensch [9547] * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) orxonox/proxy: linking problem, trying another tardis Fri, 28 Jul 2006 09:13:00 GMT bensch [9546] * branches/proxy/src/lib/gui/gl/Makefile.am (modified) * branches/proxy/src/lib/gui/gl/glgui_box.h (modified) * branches/proxy/src/lib/gui/gl/glgui_defs.h (modified) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.cc (copied) * branches/proxy/src/lib/gui/gl/glgui_fixedposition_box.h (copied) * branches/proxy/src/lib/gui/gl/glgui_handler.cc (modified) * branches/proxy/src/lib/gui/gl/glgui_handler.h (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) * branches/proxy/src/story_entities/menu/game_menu.cc (modified) * branches/proxy/src/story_entities/multi_player_world.cc (modified) added a fixed positionBox, so that everything can be centered Fri, 28 Jul 2006 09:12:32 GMT patrick [9545] * branches/proxy/src/lib/network/handshake.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/peer_info.cc (modified) initializing the default values in a better way to prevent ... Fri, 28 Jul 2006 09:02:37 GMT patrick [9544] * branches/proxy/src/lib/network/network_stream.cc (modified) more tracing work, trying this Fri, 28 Jul 2006 08:50:27 GMT patrick [9543] * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) found another smaller bug, tracing Fri, 28 Jul 2006 08:48:17 GMT patrick [9542] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) more generalized message handling now Fri, 28 Jul 2006 08:33:34 GMT patrick [9541] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) discovered a bug in the client id assignement algorithm. corrected. ... Fri, 28 Jul 2006 07:30:47 GMT patrick [9540] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) some small doc entry Thu, 27 Jul 2006 21:51:09 GMT patrick [9539] * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) message exchange should work already Thu, 27 Jul 2006 21:46:50 GMT patrick [9538] * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.h (modified) more proxy control functionality: message passing init Thu, 27 Jul 2006 21:28:45 GMT patrick [9537] * branches/proxy/src/defs/class_id.h (modified) * branches/proxy/src/lib/network/Makefile.am (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/proxy/proxy_control.cc (added) * branches/proxy/src/lib/network/proxy/proxy_control.h (added) * branches/proxy/src/world_entities/player.cc (modified) found the bug. there is need for another control center for proxies ... Thu, 27 Jul 2006 20:41:24 GMT patrick [9536] * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) * branches/proxy/src/world_entities/player.cc (modified) still tracing ghosts Thu, 27 Jul 2006 20:38:21 GMT patrick [9535] * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) tracing a handshake failure since the new id handling Thu, 27 Jul 2006 20:25:55 GMT patrick [9534] * branches/proxy/src/lib/network/network_stream.cc (modified) forgot about the server clients host id Thu, 27 Jul 2006 20:24:00 GMT patrick [9533] * branches/proxy/src/lib/network/network_stream.cc (modified) the hanshake synch unique id correction adjusted to new address space Thu, 27 Jul 2006 20:16:34 GMT patrick [9532] * branches/proxy/src/lib/network/network_stream.cc (modified) the synchronizeable now got the correct id Thu, 27 Jul 2006 19:59:32 GMT patrick [9531] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) found the bug reason: assigning an individual address space for every ... Thu, 27 Jul 2006 19:45:38 GMT patrick [9530] * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) tracing the playable creation missunderstanding Thu, 27 Jul 2006 19:35:23 GMT patrick [9529] * branches/proxy/src/lib/network/message_manager.cc (modified) forgott to enable the relaying. now strange things could happen... Thu, 27 Jul 2006 19:30:14 GMT patrick [9528] * branches/proxy/src/lib/network/message_manager.cc (modified) big error in the recvType checking, now forwarding should be less ... Thu, 27 Jul 2006 19:22:25 GMT patrick [9527] * branches/proxy/src/lib/network/message_manager.cc (modified) forgot to ack the messages forwarded Thu, 27 Jul 2006 19:13:48 GMT patrick [9526] * branches/proxy/src/lib/network/message_manager.cc (modified) relay disabled, more debug Thu, 27 Jul 2006 19:05:12 GMT patrick [9525] * branches/proxy/src/lib/network/message_manager.cc (modified) relay messages is enabled again. checking out Thu, 27 Jul 2006 18:57:19 GMT patrick [9524] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) receiver type is transmitted also since it is needed for message relays Thu, 27 Jul 2006 18:37:24 GMT patrick [9523] * branches/proxy/src/lib/network/message_manager.cc (modified) of course clients shouldn't forward any messages. forgot one message ... Thu, 27 Jul 2006 18:29:32 GMT patrick [9522] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/subprojects/network/network_unit_test.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) new the message handler is checking, if this message is also for the ... Thu, 27 Jul 2006 17:51:06 GMT patrick [9521] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_game_manager.h (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/player_stats.h (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) * branches/proxy/src/world_entities/spawning_point.h (modified) extended the callback function for message handlers to match the new ... Thu, 27 Jul 2006 17:40:42 GMT patrick [9520] * branches/proxy/src/lib/network/message_manager.cc (modified) sender now also include the source and destination userId so they can ... Thu, 27 Jul 2006 17:24:41 GMT patrick [9519] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) extending the message structure Thu, 27 Jul 2006 16:58:04 GMT bensch [9518] * branches/proxy/src/world_entities/npcs/ground_turret.cc (modified) * branches/proxy/src/world_entities/weapons/aim.cc (modified) * branches/proxy/src/world_entities/weapons/targeting_turret.h (modified) targetting turrets are firing all the time now, but the hack is out :/ Thu, 27 Jul 2006 16:48:47 GMT patrick [9517] * branches/proxy/src/lib/network/message_manager.cc (modified) wrong debug output last time Thu, 27 Jul 2006 16:45:58 GMT bensch [9516] * branches/proxy/src/util/object_manager.cc (modified) * branches/proxy/src/world_entities/projectiles/guided_missile.h (modified) * branches/proxy/src/world_entities/weapons/aim.cc (modified) * branches/proxy/src/world_entities/weapons/aim.h (modified) * branches/proxy/src/world_entities/weapons/targeting_turret.cc (modified) * branches/proxy/src/world_entities/weapons/targeting_turret.h (modified) * branches/proxy/src/world_entities/world_entity.cc (modified) orxonox/proxy: the rockets from the targeting turrets aquire targets ... Thu, 27 Jul 2006 16:15:09 GMT patrick [9515] * branches/proxy/src/lib/network/message_manager.cc (modified) better debug Thu, 27 Jul 2006 16:07:18 GMT patrick [9514] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) messag reciving debug Thu, 27 Jul 2006 15:38:53 GMT bensch [9513] * branches/proxy/src/lib/network/server_socket.h (modified) * branches/proxy/src/util/object_manager.cc (modified) * branches/proxy/src/util/object_manager.h (modified) * branches/proxy/src/world_entities/npcs/ground_turret.cc (modified) * branches/proxy/src/world_entities/weapons/aim.h (modified) * branches/proxy/src/world_entities/world_entity.cc (modified) * branches/proxy/src/world_entities/world_entity.h (modified) toList editable Thu, 27 Jul 2006 14:07:38 GMT patrick [9512] * branches/proxy/src/lib/network/message_manager.cc (modified) now the proxy server has also special handling for message piping Thu, 27 Jul 2006 14:05:39 GMT patrick [9511] * branches/proxy/src/lib/network/message_manager.cc (modified) produced segfault by double sending messages. fixed Thu, 27 Jul 2006 13:59:25 GMT patrick [9510] * branches/proxy/src/lib/network/message_manager.cc (modified) clients permission correction Thu, 27 Jul 2006 13:55:22 GMT patrick [9509] * branches/proxy/src/lib/network/message_manager.cc (modified) starting special implementation for message forwarding (pipeing) Thu, 27 Jul 2006 13:37:11 GMT patrick [9508] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_game_manager.h (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/player_stats.h (modified) * branches/proxy/src/subprojects/network/network_unit_test.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) * branches/proxy/src/world_entities/spawning_point.h (modified) message handler: changed some variable names - standardisations to ... Thu, 27 Jul 2006 11:59:30 GMT patrick [9507] * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/player_stats.h (modified) * branches/proxy/src/world_entities/playable.cc (modified) * branches/proxy/src/world_entities/playable.h (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) the player team change should now work on all clients in the network, ... Thu, 27 Jul 2006 11:30:02 GMT snellen [9506] * branches/proxy/src/world_entities/script_trigger.cc (modified) removed testerror from scripttrigger Thu, 27 Jul 2006 11:00:55 GMT patrick [9505] * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/player_stats.h (modified) changing the team color now works and a little cleanup Thu, 27 Jul 2006 10:54:39 GMT patrick [9504] * branches/proxy/src/lib/network/message_manager.cc (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/player_stats.h (modified) * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) - removing entities from the network works now also on proxies. - ... Thu, 27 Jul 2006 10:32:50 GMT bensch [9503] * branches/proxy/src/lib/network/network_game_manager.cc (modified) coloring for single-players Thu, 27 Jul 2006 10:30:31 GMT bensch [9502] * branches/proxy/src/lib/particles/particle_system.cc (modified) * branches/proxy/src/lib/particles/quick_animation.cc (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) coloring works on server Thu, 27 Jul 2006 10:15:55 GMT bensch [9501] * branches/proxy/src/world_entities/playable.h (modified) compiles for real Thu, 27 Jul 2006 10:15:06 GMT bensch [9500] * branches/proxy/src/lib/particles/particle_system.cc (modified) * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) * branches/proxy/src/world_entities/playable.cc (modified) * branches/proxy/src/world_entities/playable.h (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.h (modified) compiles again, the Playables should now be able to choose their ... Thu, 27 Jul 2006 10:10:08 GMT patrick [9499] * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/world_entities/playable.h (modified) team id is supported Thu, 27 Jul 2006 09:57:58 GMT patrick [9498] * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) set team id is invoked on team change Thu, 27 Jul 2006 09:20:28 GMT bensch [9497] * branches/proxy/src/lib/particles/particle_system.cc (modified) * branches/proxy/src/lib/particles/particle_system.h (modified) * branches/proxy/src/lib/util/color.h (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) * branches/proxy/src/world_entities/space_ships/turbine_hover.h (modified) coloring for the hovers Thu, 27 Jul 2006 08:45:35 GMT bensch [9496] * branches/proxy (copied) new copy Thu, 27 Jul 2006 08:44:28 GMT bensch [9494] * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/README.NETWORK (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/ip.cc (modified) * trunk/src/lib/network/ip.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/monitor/connection_monitor.cc (modified) * trunk/src/lib/network/monitor/connection_monitor.h (modified) * trunk/src/lib/network/monitor/network_monitor.cc (modified) * trunk/src/lib/network/monitor/network_monitor.h (modified) * trunk/src/lib/network/monitor/network_node.cc (modified) * trunk/src/lib/network/monitor/network_node.h (modified) * trunk/src/lib/network/monitor/network_stats_widget.cc (copied) * trunk/src/lib/network/monitor/network_stats_widget.h (copied) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/nettypes.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/peer_info.cc (modified) * trunk/src/lib/network/peer_info.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/network_settings.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) * trunk/src/lib/network/tcp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.h (modified) * trunk/src/lib/network/zip.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/network_stats_widget.cc (deleted) * trunk/src/util/network_stats_widget.h (deleted) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/world_entity.cc (modified) merged the proxy back