# # ChangeLog for branches/proxy in orxonox.OLD # # Generated by Trac 1.0.9 # Jun 1, 2024, 4:11:15 AM Wed, 26 Jul 2006 13:26:59 GMT patrick [9493] * branches/proxy/src/lib/network/network_game_manager.cc (modified) removing does not yet work. debuging Wed, 26 Jul 2006 13:14:17 GMT patrick [9492] * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/shared_network_data.cc (modified) * branches/proxy/src/lib/network/shared_network_data.h (modified) extended the sharednetworkdata inteface. now synchronizeables should ... Wed, 26 Jul 2006 12:43:26 GMT patrick [9491] * 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/subprojects/network/network_unit_test.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) the clients can now connect to the proxy server and get synchronized ... Wed, 26 Jul 2006 11:56:48 GMT patrick [9490] * branches/proxy/src/lib/network/network_stream.cc (modified) redirection is disabled now for network traffic measurement Wed, 26 Jul 2006 09:38:04 GMT patrick [9489] * branches/proxy/src/lib/network/network_stream.cc (modified) only master servers got the right to redirect clients Wed, 26 Jul 2006 09:27:32 GMT patrick [9488] * branches/proxy/src/lib/network/synchronizeable.cc (modified) now clients do also accept proxys as athorities, i hope Wed, 26 Jul 2006 09:02:25 GMT patrick [9487] * branches/proxy/src/lib/network/synchronizeable.cc (modified) stuck in permissions war: something prevents the client from ... Wed, 26 Jul 2006 08:54:34 GMT patrick [9486] * branches/proxy/src/lib/network/README.NETWORK (modified) the clients now almost synchronizes with the proxy :D Wed, 26 Jul 2006 08:51:20 GMT patrick [9485] * branches/proxy/src/lib/network/network_stream.cc (modified) the proxy server receives to force clients creating world entities Wed, 26 Jul 2006 08:42:10 GMT bensch [9484] * branches/proxy/src/lib/network/monitor/network_node.h (modified) typo Wed, 26 Jul 2006 08:41:33 GMT patrick [9483] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) giving the proxy server more rights to write the clients Wed, 26 Jul 2006 08:13:48 GMT patrick [9482] * branches/proxy/src/lib/network/network_manager.cc (modified) forgot about this Wed, 26 Jul 2006 08:12:26 GMT patrick [9481] * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) working on the segfault when clients are redirected to a synchronized ... Tue, 25 Jul 2006 21:59:26 GMT patrick [9480] * branches/proxy/src/lib/network/README.NETWORK (modified) big progress today, tomorrow the synchronization of a client-proxy- ... Tue, 25 Jul 2006 21:52:37 GMT patrick [9479] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) proxy server not able to load the world file, some more safty in the ... Tue, 25 Jul 2006 21:45:07 GMT patrick [9478] * branches/proxy/src/lib/network/network_manager.cc (modified) shortly trying the hybrid mode again Tue, 25 Jul 2006 21:37:41 GMT patrick [9477] * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) now the proxy is in client mode again for testing Tue, 25 Jul 2006 21:35:11 GMT patrick [9476] * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) now the clients can connect to the proxy servers. => hybrid proxy ... Tue, 25 Jul 2006 21:15:45 GMT patrick [9475] * branches/proxy/src/lib/network/network_manager.cc (modified) proxy server now starts the server socket also Tue, 25 Jul 2006 21:09:28 GMT patrick [9474] * 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/lib/network/synchronizeable.cc (modified) the hybrid mode should work now in a very closed setup Tue, 25 Jul 2006 20:57:27 GMT patrick [9473] * branches/proxy/src/lib/network/handshake.cc (modified) * branches/proxy/src/lib/network/netdefs.h (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) letting proxys handshakes handling again Tue, 25 Jul 2006 20:44:54 GMT patrick [9472] * branches/proxy/src/lib/network/network_stream.cc (modified) switching to hybrind, so far so good Tue, 25 Jul 2006 20:35:06 GMT patrick [9471] * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) better now, a proxy server connected to the master server for the ... Tue, 25 Jul 2006 20:23:17 GMT patrick [9470] * branches/proxy/src/lib/collision_detection/aabb_tree_node.cc (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/peer_info.cc (modified) * branches/proxy/src/lib/network/shared_network_data.h (modified) * branches/proxy/src/util/game_rules.cc (modified) * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) * branches/proxy/src/world_entities/creatures/fps_player.cc (modified) * branches/proxy/src/world_entities/space_ships/space_ship.cc (modified) * branches/proxy/src/world_entities/world_entity.cc (modified) heavy permissions fight: no node was ever thought to be client and ... Tue, 25 Jul 2006 18:48:18 GMT patrick [9469] * branches/proxy/src/lib/network/synchronizeable.cc (modified) permission changed: proxy cannot override in the way the master ... Tue, 25 Jul 2006 18:45:18 GMT patrick [9468] * branches/proxy/src/lib/network/network_stream.cc (modified) assertion failure, becaus the proxy tried to accept the own connection Tue, 25 Jul 2006 18:37:01 GMT patrick [9467] * branches/proxy/src/lib/network/network_manager.cc (modified) not creating the network game manager, since it is created by the ... Tue, 25 Jul 2006 18:30:40 GMT patrick [9466] * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) testing around with permissions: proxy should be able to handle a ... Tue, 25 Jul 2006 18:17:29 GMT patrick [9465] * branches/proxy/src/lib/network/network_stream.cc (modified) added more secure implementation of connection update Tue, 25 Jul 2006 18:10:18 GMT patrick [9464] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) proxy server should now be accepted Tue, 25 Jul 2006 17:29:31 GMT patrick [9463] * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) * branches/proxy/src/lib/network/udp_server_socket.cc (modified) the proxy network interface is started Tue, 25 Jul 2006 16:01:47 GMT patrick [9462] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/server_socket.h (modified) * branches/proxy/src/lib/network/tcp_server_socket.cc (modified) * branches/proxy/src/lib/network/tcp_server_socket.h (modified) * branches/proxy/src/lib/network/udp_server_socket.cc (modified) * branches/proxy/src/lib/network/udp_server_socket.h (modified) * branches/proxy/src/subprojects/network/network_unit_test.cc (modified) proxy server connections: listening on a seperate server socket, ... Tue, 25 Jul 2006 15:39:49 GMT patrick [9461] * branches/proxy/src/lib/network/udp_server_socket.cc (modified) * branches/proxy/src/lib/network/udp_server_socket.h (modified) working on a dual connection server socket Tue, 25 Jul 2006 15:14:53 GMT patrick [9460] * branches/proxy/src/lib/network/tcp_server_socket.cc (modified) * branches/proxy/src/lib/network/tcp_server_socket.h (modified) * branches/proxy/src/lib/network/udp_server_socket.cc (modified) * branches/proxy/src/lib/network/udp_server_socket.h (modified) working on proxy server connection acception Tue, 25 Jul 2006 15:07:38 GMT patrick [9459] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) * branches/proxy/src/lib/network/server_socket.h (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) * branches/proxy/src/lib/network/tcp_server_socket.cc (modified) * branches/proxy/src/lib/network/tcp_server_socket.h (modified) * branches/proxy/src/lib/network/udp_server_socket.cc (modified) * branches/proxy/src/lib/network/udp_server_socket.h (modified) * branches/proxy/src/subprojects/network/network_unit_test.cc (modified) deep framework switch to enable differentiation of proxy/client ... Tue, 25 Jul 2006 14:28:08 GMT patrick [9458] * branches/proxy/src/lib/network/netdefs.h (modified) * branches/proxy/src/lib/network/nettypes.h (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_manager.h (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) * branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) switching to new permission system, first step Tue, 25 Jul 2006 13:56:30 GMT bensch [9457] * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) fixing pnode better now Tue, 25 Jul 2006 13:36:43 GMT bensch [9456] * branches/proxy/src/world_entities/space_ships/turbine_hover.cc (modified) TurbineHover Syncable... the camera was the evil force here Tue, 25 Jul 2006 12:16:40 GMT bensch [9455] * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) * branches/proxy/src/world_entities/spawning_point.h (modified) high dynamic loading of network entities improoved Tue, 25 Jul 2006 09:27:48 GMT bensch [9454] * branches/proxy/src/lib/network/handshake.h (modified) * branches/proxy/src/lib/network/message_manager.h (modified) * branches/proxy/src/lib/network/monitor/connection_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/connection_monitor.h (modified) * branches/proxy/src/lib/network/proxy/network_settings.h (modified) some consts added Tue, 25 Jul 2006 09:12:44 GMT patrick [9453] * branches/proxy/src/lib/network/network_stream.h (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) another framework switch Tue, 25 Jul 2006 08:52:37 GMT patrick [9452] * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/network_game_manager.cc (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) * branches/proxy/src/lib/network/peer_info.h (modified) * branches/proxy/src/lib/network/player_stats.cc (modified) * branches/proxy/src/lib/network/shared_network_data.h (modified) * branches/proxy/src/lib/network/synchronizeable.cc (modified) * branches/proxy/src/story_entities/multi_player_world_data.cc (modified) * branches/proxy/src/world_entities/creatures/fps_player.cc (modified) * branches/proxy/src/world_entities/space_ships/space_ship.cc (modified) * branches/proxy/src/world_entities/spawning_point.cc (modified) switched another interface funciton Tue, 25 Jul 2006 08:39:29 GMT bensch [9451] * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.h (modified) * branches/proxy/src/lib/network/monitor/network_node.cc (modified) * branches/proxy/src/lib/network/monitor/network_node.h (modified) consts Tue, 25 Jul 2006 08:34:28 GMT patrick [9450] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/netdefs.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/network_stream.h (modified) using the new id scheme Tue, 25 Jul 2006 08:15:18 GMT patrick [9449] * branches/proxy/src/lib/network/README.NETWORK (modified) * branches/proxy/src/lib/network/netdefs.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/network_stream.h (modified) making the node id system as consistant as possible Tue, 25 Jul 2006 07:42:01 GMT patrick [9448] * branches/proxy/src/lib/network/ip.cc (modified) * branches/proxy/src/lib/network/network_manager.cc (modified) now comes the synchronization process from master server to proxy ... Tue, 25 Jul 2006 07:35:22 GMT patrick [9447] * branches/proxy/src/lib/network/network_stream.cc (modified) yea finaly the redirection algorithm realy works (testedsvn diff) Tue, 25 Jul 2006 07:31:01 GMT patrick [9446] * branches/proxy/src/lib/network/network_stream.cc (modified) cleanup of the code Tue, 25 Jul 2006 06:24:21 GMT bensch [9445] * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.h (modified) * branches/proxy/src/lib/network/peer_info.cc (modified) * branches/proxy/src/lib/network/peer_info.h (modified) some more const's Tue, 25 Jul 2006 06:15:01 GMT bensch [9444] * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/peer_info.cc (modified) * branches/proxy/src/lib/network/peer_info.h (modified) * branches/proxy/src/lib/network/zip.h (modified) some cleanup Mon, 24 Jul 2006 15:47:06 GMT bensch [9443] * branches/proxy/src/lib/network/ip.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) ip-bug fixed Mon, 24 Jul 2006 15:42:16 GMT bensch [9442] * branches/proxy/src/lib/network/monitor/network_monitor.h (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) better checks Mon, 24 Jul 2006 15:39:17 GMT patrick [9441] * branches/proxy/src/lib/network/ip.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) reconnection does not segfault anymore now! betta Mon, 24 Jul 2006 15:28:15 GMT patrick [9440] * branches/proxy/src/lib/network/network_stream.cc (modified) peers get deleted correctly now Mon, 24 Jul 2006 15:26:34 GMT bensch [9439] * branches/proxy/src/lib/network/monitor/network_monitor.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 gui Mon, 24 Jul 2006 15:07:55 GMT bensch [9438] * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.h (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (modified) more gui Mon, 24 Jul 2006 14:55:41 GMT bensch [9437] * branches/proxy/src/lib/network/Makefile.am (modified) * branches/proxy/src/lib/network/monitor/network_stats_widget.cc (moved) * branches/proxy/src/lib/network/monitor/network_stats_widget.h (moved) * branches/proxy/src/util/Makefile.am (modified) movements Mon, 24 Jul 2006 14:50:38 GMT patrick [9436] * branches/proxy/src/lib/network/network_stream.cc (modified) the server does not segfault anymore on client disconnect, but the ... Mon, 24 Jul 2006 14:45:01 GMT bensch [9435] * branches/proxy/src/lib/network/peer_info.h (modified) * branches/proxy/src/util/network_stats_widget.cc (modified) * branches/proxy/src/util/network_stats_widget.h (modified) more about the widget Mon, 24 Jul 2006 14:38:38 GMT patrick [9434] * branches/proxy/src/lib/network/network_stream.cc (modified) the disconnect process works better, now comes the hard part: reinit ... Mon, 24 Jul 2006 14:36:28 GMT patrick [9433] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) new approach: the reconnection is handled from a different point in ... Mon, 24 Jul 2006 14:19:17 GMT bensch [9432] * branches/proxy/src/lib/network/peer_info.h (modified) more peer info Mon, 24 Jul 2006 14:13:04 GMT bensch [9431] * branches/proxy/src/lib/network/monitor/connection_monitor.h (modified) * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/monitor/network_monitor.h (modified) * branches/proxy/src/util/network_stats_widget.h (modified) getBandwidth's Mon, 24 Jul 2006 13:59:16 GMT patrick [9430] * branches/proxy/src/lib/network/network_stream.cc (modified) redirection stuck Mon, 24 Jul 2006 13:05:24 GMT bensch [9429] * branches/proxy/src/story_entities/game_world.cc (modified) fixed framerate to max 100 fps Mon, 24 Jul 2006 12:50:12 GMT bensch [9427] * branches/proxy/src/lib/network/proxy/network_settings.cc (modified) less useless debug Mon, 24 Jul 2006 12:49:33 GMT bensch [9426] * branches/proxy/src/lib/network/ip.cc (modified) * branches/proxy/src/lib/network/ip.h (modified) * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/proxy/network_settings.cc (modified) * branches/proxy/src/lib/network/proxy/network_settings.h (modified) cleaner ip inclusion Mon, 24 Jul 2006 12:48:23 GMT patrick [9425] * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) handshake server problems by reconnection Mon, 24 Jul 2006 12:05:16 GMT patrick [9422] * branches/proxy/src/lib/network/network_manager.cc (modified) * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) made the network stream interface more flexible in terms of ... Mon, 24 Jul 2006 11:42:23 GMT patrick [9420] * branches/proxy/src/lib/network/network_stream.cc (modified) reconnection setup switch Mon, 24 Jul 2006 11:27:05 GMT patrick [9419] * branches/proxy/src/lib/network/network_stream.cc (modified) * branches/proxy/src/lib/network/network_stream.h (modified) disconnection of nodes, redirection bug tracing Mon, 24 Jul 2006 11:00:01 GMT patrick [9416] * branches/proxy/src/lib/network/proxy/network_settings.cc (modified) * branches/proxy/src/util/multiplayer_team_deathmatch.cc (modified) now servers are not able to play anymore Mon, 24 Jul 2006 09:20:25 GMT patrick [9410] * branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) * branches/proxy/src/lib/network/proxy/network_settings.cc (modified) * branches/proxy/src/lib/network/proxy/network_settings.h (modified) some better debug and function call cleanup Mon, 24 Jul 2006 09:18:32 GMT patrick [9409] * branches/proxy/src/lib/network/proxy/network_settings.cc (modified) * branches/proxy/src/lib/network/proxy/network_settings.h (modified) * branches/proxy/src/lib/network/shared_network_data.cc (modified) saturation level for auto proxy server activation Mon, 24 Jul 2006 09:11:46 GMT bensch [9408] * branches/proxy (copied) new copy Mon, 24 Jul 2006 09:09:47 GMT bensch [9406] * trunk/AUTHORS (modified) * trunk/CODING-STANDARDS (modified) * trunk/ChangeLog (modified) * trunk/IDEAS (modified) * trunk/INSTALL (modified) * trunk/README (modified) * trunk/ToDo (modified) * trunk/configure.ac (modified) * trunk/src/ability.cc (modified) * trunk/src/ai/ai.cc (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/globals.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (modified) * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/collision_detection/bounding_sphere.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.cc (modified) * trunk/src/lib/collision_detection/bv_tree.cc (modified) * trunk/src/lib/collision_detection/bv_tree_node.cc (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_reaction/collision.cc (modified) * trunk/src/lib/collision_reaction/collision_event.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_reaction.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lightning_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/effects/sun_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/weather_effect.cc (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/grid.cc (modified) * trunk/src/lib/graphics/importer/interactive_model.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc (modified) * trunk/src/lib/graphics/importer/model.cc (modified) * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_frame.cc (modified) * trunk/src/lib/gui/gl/glgui_image.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_text.cc (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/lib/gui/gl/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl/glgui_textfield.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl/signal_connector.cc (deleted) * trunk/src/lib/gui/gl/signal_connector.h (deleted) * trunk/src/lib/gui/gtk (deleted) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/gui/qt/gui_video.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/math/line.cc (modified) * trunk/src/lib/math/plane.cc (modified) * trunk/src/lib/math/rotation_OBSOLETE.cc (modified) * trunk/src/lib/math/vector2D.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/README (deleted) * trunk/src/lib/network/README.NETWORK (copied) * trunk/src/lib/network/connection_monitor.cc (deleted) * trunk/src/lib/network/connection_monitor.h (deleted) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/data_stream.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/ip.cc (copied) * trunk/src/lib/network/ip.h (copied) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/monitor (copied) * trunk/src/lib/network/monitor/connection_monitor.cc (copied) * trunk/src/lib/network/monitor/connection_monitor.h (copied) * trunk/src/lib/network/monitor/network_monitor.cc (copied) * trunk/src/lib/network/monitor/network_monitor.h (copied) * trunk/src/lib/network/monitor/network_node.cc (copied) * trunk/src/lib/network/monitor/network_node.h (copied) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/netincl.h (copied) * trunk/src/lib/network/nettypes.h (copied) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_protocol.cc (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.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 (copied) * trunk/src/lib/network/peer_info.h (copied) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/proxy (copied) * trunk/src/lib/network/proxy/network_settings.cc (copied) * trunk/src/lib/network/proxy/network_settings.h (copied) * 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.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h (modified) * trunk/src/lib/network/tcp_server_socket.cc (modified) * trunk/src/lib/network/tcp_server_socket.h (modified) * trunk/src/lib/network/tcp_socket.h (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (modified) * trunk/src/lib/particles/box_emitter.cc (modified) * trunk/src/lib/particles/dot_emitter.cc (modified) * trunk/src/lib/particles/dot_particles.cc (modified) * trunk/src/lib/particles/engine/particle_engine.cc (modified) * trunk/src/lib/particles/model_particles.cc (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/plane_emitter.cc (modified) * trunk/src/lib/particles/quick_animation.cc (modified) * trunk/src/lib/particles/spark_particles.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/point_gravity.cc (modified) * trunk/src/lib/physics/fields/twirl.cc (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command_class.cc (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/executor/executor_functional.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/filesys/net_link.cc (copied) * trunk/src/lib/util/filesys/net_link.h (copied) * trunk/src/lib/util/helper_functions.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/resource.cc (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/sigslot (copied) * trunk/src/lib/util/sigslot/signal.h (copied) * trunk/src/lib/util/sigslot/slot.h (copied) * trunk/src/lib/util/substring.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/lib/util/threading.cc (modified) * trunk/src/lib/util/tokenizer.cc (deleted) * trunk/src/lib/util/tokenizer.h (deleted) * trunk/src/orxonox.cc (modified) * trunk/src/proto/proto_class.cc (modified) * trunk/src/proto/proto_singleton.cc (modified) * trunk/src/proto/proto_world_entity.cc (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/dedicated_server_world.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/menu/game_menu.cc (modified) * trunk/src/story_entities/menu/game_menu.h (modified) * trunk/src/story_entities/menu/glgui_imagebutton.cc (modified) * trunk/src/story_entities/menu/glgui_imagebutton.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (deleted) * trunk/src/story_entities/simple_game_menu.h (deleted) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/subprojects/benchmark.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/subprojects/recapture_mouse (copied) * trunk/src/subprojects/recapture_mouse/Makefile.am (copied) * trunk/src/subprojects/recapture_mouse/recapturer.cc (copied) * trunk/src/util/Makefile.am (modified) * trunk/src/util/animation/animation3d.cc (modified) * trunk/src/util/animation/animation_player.cc (modified) * trunk/src/util/fast_factory.cc (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/kill.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/mission_goal.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_stats_widget.cc (copied) * trunk/src/util/network_stats_widget.h (copied) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_node.cc (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/character_attributes.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/image_entity.cc (modified) * trunk/src/world_entities/elements/text_element.cc (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environments/building.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/items/item_container.cc (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (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/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/satellite.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/skysphere.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aiming_system.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: merged the proxy back merged with commandsvn merge ...