# # ChangeLog for trunk/src/defs in orxonox.OLD # # Generated by Trac 1.0.9 # Dec 21, 2024, 10:32:45 AM Thu, 25 Jan 2007 23:17:26 GMT patrick [10376] * trunk/configure.ac (modified) * trunk/src/Makefile.am (modified) * trunk/src/ai/Makefile.am (copied) * trunk/src/ai/ai_engine.cc (copied) * trunk/src/ai/ai_engine.h (copied) * trunk/src/ai/ai_module.cc (copied) * trunk/src/ai/ai_module.h (copied) * trunk/src/ai/ai_swarm.cc (copied) * trunk/src/ai/ai_swarm.h (copied) * trunk/src/ai/ai_team.cc (copied) * trunk/src/ai/ai_team.h (copied) * trunk/src/ai/ai_team_member.cc (copied) * trunk/src/ai/ai_team_member.h (copied) * trunk/src/ai/attack_module.cc (copied) * trunk/src/ai/attack_module.h (copied) * trunk/src/ai/movement_module.cc (copied) * trunk/src/ai/movement_module.h (copied) * trunk/src/ai/shooting_module.cc (copied) * trunk/src/ai/shooting_module.h (copied) * trunk/src/ai/swarm_attack.cc (copied) * trunk/src/ai/swarm_attack.h (copied) * trunk/src/ai/swarm_gorel.cc (copied) * trunk/src/ai/swarm_gorel.h (copied) * trunk/src/ai/swarm_module.cc (copied) * trunk/src/ai/swarm_module.h (copied) * trunk/src/ai/swarm_wait.cc (copied) * trunk/src/ai/swarm_wait.h (copied) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/util/debug.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) merged branche ai to trunk Tue, 19 Dec 2006 22:55:26 GMT patrick [10114] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id_DEPRECATED.h (deleted) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/resource_md2.cc (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/shader_data.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/object_list.cc (modified) * trunk/src/lib/lang/object_list.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/peer_info.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid_list.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid_list.h (copied) * 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/orxonox.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (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/single_player_world.cc (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/md2_creature.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/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/movie_entity.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/network_turret.cc (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/particles/box_emitter.cc (modified) * trunk/src/world_entities/particles/dot_emitter.cc (modified) * trunk/src/world_entities/particles/dot_particles.cc (modified) * trunk/src/world_entities/particles/model_particles.cc (modified) * trunk/src/world_entities/particles/plane_emitter.cc (modified) * trunk/src/world_entities/particles/spark_particles.cc (modified) * trunk/src/world_entities/particles/sprite_particles.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/param_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/bomb.cc (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/cruizer.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/hover.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/space_ships/turbine_hover.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/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/boomerang_gun.cc (modified) * trunk/src/world_entities/weapons/cannon.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/laser_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/weather_effects/cloud_effect.cc (modified) * trunk/src/world_entities/weather_effects/fog_effect.cc (modified) * trunk/src/world_entities/weather_effects/lense_flare.cc (modified) * trunk/src/world_entities/weather_effects/lightning_effect.cc (modified) * trunk/src/world_entities/weather_effects/rain_effect.cc (modified) * trunk/src/world_entities/weather_effects/snow_effect.cc (modified) * trunk/src/world_entities/weather_effects/volfog_effect.cc (modified) merged network back to trunk Mon, 02 Oct 2006 22:19:30 GMT bensch [9869] * trunk/ChangeLog (modified) * trunk/IDEAS (modified) * trunk/MakeMakefile (deleted) * trunk/configure.ac (modified) * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (deleted) * trunk/src/defs/class_id_DEPRECATED.h (copied) * trunk/src/defs/debug.h (deleted) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (modified) * trunk/src/lib/collision_detection/aabb.h (modified) * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/collision_detection/aabb_tree_node.h (modified) * trunk/src/lib/collision_detection/bounding_sphere.cc (modified) * trunk/src/lib/collision_detection/bounding_sphere.h (modified) * trunk/src/lib/collision_detection/bounding_volume.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.h (modified) * trunk/src/lib/collision_detection/bv_tree.cc (modified) * trunk/src/lib/collision_detection/bv_tree.h (modified) * trunk/src/lib/collision_detection/bv_tree_node.cc (modified) * trunk/src/lib/collision_detection/bv_tree_node.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/cd_engine.h (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/collision_detection/obb.h (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.h (modified) * trunk/src/lib/collision_reaction/collision.cc (modified) * trunk/src/lib/collision_reaction/collision.h (modified) * trunk/src/lib/collision_reaction/collision_event.cc (modified) * trunk/src/lib/collision_reaction/collision_event.h (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.h (modified) * trunk/src/lib/collision_reaction/collision_reaction.cc (modified) * trunk/src/lib/collision_reaction/collision_reaction.h (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.h (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.h (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (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/event_handler.h (modified) * trunk/src/lib/event/event_listener.cc (modified) * trunk/src/lib/event/event_listener.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects (deleted) * trunk/src/lib/graphics/graphics_effect.cc (copied) * trunk/src/lib/graphics/graphics_effect.h (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/graphics/importer/height_map.h (modified) * trunk/src/lib/graphics/importer/interactive_model.cc (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/graphics/importer/md2/resource_md2.cc (copied) * trunk/src/lib/graphics/importer/md2/resource_md2.h (copied) * trunk/src/lib/graphics/importer/md3/md3_model.h (modified) * trunk/src/lib/graphics/importer/media_container.cc (modified) * trunk/src/lib/graphics/importer/media_container.h (modified) * trunk/src/lib/graphics/importer/model.cc (modified) * trunk/src/lib/graphics/importer/model.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/lib/graphics/importer/objModel.cc (modified) * trunk/src/lib/graphics/importer/objModel.h (modified) * trunk/src/lib/graphics/importer/resource_obj.cc (copied) * trunk/src/lib/graphics/importer/resource_obj.h (copied) * trunk/src/lib/graphics/importer/resource_texture.cc (copied) * trunk/src/lib/graphics/importer/resource_texture.h (copied) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.h (modified) * trunk/src/lib/graphics/importer/static_model_data.cc (copied) * trunk/src/lib/graphics/importer/static_model_data.h (copied) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_data.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.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/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.h (modified) * trunk/src/lib/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/render2D/render_2d.h (modified) * trunk/src/lib/graphics/resource_shader.cc (copied) * trunk/src/lib/graphics/resource_shader.h (copied) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/shader.h (modified) * trunk/src/lib/graphics/shader_data.cc (copied) * trunk/src/lib/graphics/shader_data.h (copied) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.h (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.h (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.cc (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.h (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.h (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.h (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.h (modified) * trunk/src/lib/graphics/text_engine/resource_font.cc (copied) * trunk/src/lib/graphics/text_engine/resource_font.h (copied) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/graphics/text_engine/text_engine.h (modified) * trunk/src/lib/gui/gl/glgui_bar.cc (modified) * trunk/src/lib/gui/gl/glgui_bar.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_box.h (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_colorselector.h (modified) * trunk/src/lib/gui/gl/glgui_container.cc (modified) * trunk/src/lib/gui/gl/glgui_container.h (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.h (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.h (modified) * trunk/src/lib/gui/gl/glgui_frame.cc (modified) * trunk/src/lib/gui/gl/glgui_frame.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_image.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_mainwidget.cc (modified) * trunk/src/lib/gui/gl/glgui_mainwidget.h (modified) * trunk/src/lib/gui/gl/glgui_menu.cc (modified) * trunk/src/lib/gui/gl/glgui_menu.h (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.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_table.cc (modified) * trunk/src/lib/gui/gl/glgui_table.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/glgui_window.cc (modified) * trunk/src/lib/gui/gl/glgui_window.h (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified) * trunk/src/lib/gui/gui.cc (modified) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/lang/Makefile.am (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/class_id.cc (copied) * trunk/src/lib/lang/class_id.h (copied) * trunk/src/lib/lang/class_list.cc (deleted) * trunk/src/lib/lang/class_list.h (deleted) * trunk/src/lib/lang/new_class_id.cc (deleted) * trunk/src/lib/lang/new_class_id.h (deleted) * trunk/src/lib/lang/new_object_list.cc (deleted) * trunk/src/lib/lang/new_object_list.h (deleted) * trunk/src/lib/lang/object_list.cc (copied) * trunk/src/lib/lang/object_list.h (copied) * trunk/src/lib/lang/test_object_list.cc (deleted) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/data_stream.cc (modified) * trunk/src/lib/network/data_stream.h (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.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_stats_widget.cc (modified) * trunk/src/lib/network/monitor/network_stats_widget.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_log.cc (modified) * trunk/src/lib/network/network_log.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_protocol.h (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/player_stats.cc (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/network_settings.h (modified) * trunk/src/lib/network/proxy/proxy_control.cc (modified) * trunk/src/lib/network/proxy/proxy_control.h (modified) * trunk/src/lib/network/server_socket.cc (modified) * trunk/src/lib/network/server_socket.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.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.cc (modified) * trunk/src/lib/network/tcp_socket.h (modified) * trunk/src/lib/network/udp_broadcast.cc (modified) * trunk/src/lib/network/udp_broadcast.h (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.h (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/parser/Makefile.am (modified) * trunk/src/lib/parser/cmdline_parser/Makefile.am (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.h (modified) * trunk/src/lib/parser/ini_parser/Makefile.am (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/parser/preferences/Makefile.am (modified) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h (modified) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.h (modified) * trunk/src/lib/parser/preferences/preferences.cc (copied) * trunk/src/lib/parser/preferences/preferences.h (copied) * trunk/src/lib/particles (deleted) * 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/fields/point_gravity.cc (modified) * trunk/src/lib/physics/fields/point_gravity.h (modified) * trunk/src/lib/physics/fields/twirl.cc (modified) * trunk/src/lib/physics/fields/twirl.h (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_connection.h (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/physics/physics_engine.h (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/physics/physics_interface.h (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/executor_lua_state.cc (copied) * trunk/src/lib/script_engine/executor_lua_state.h (copied) * trunk/src/lib/script_engine/lunar.h (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.cc (modified) * trunk/src/lib/script_engine/script_class.h (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/script_engine/script_manager.h (modified) * trunk/src/lib/script_engine/script_method.cc (modified) * trunk/src/lib/script_engine/script_method.h (modified) * trunk/src/lib/shell/Makefile.am (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell.h (modified) * trunk/src/lib/shell/shell_buffer.cc (deleted) * trunk/src/lib/shell/shell_buffer.h (deleted) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command.h (modified) * trunk/src/lib/shell/shell_command_class.cc (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/shell/shell_completion.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) * trunk/src/lib/shell/some_shell_commands.cc (modified) * trunk/src/lib/sound/Makefile.am (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/ogg_player.h (modified) * trunk/src/lib/sound/resource_sound_buffer.cc (copied) * trunk/src/lib/sound/resource_sound_buffer.h (copied) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/sound/sound_buffer.h (modified) * trunk/src/lib/sound/sound_buffer_data.cc (copied) * trunk/src/lib/sound/sound_buffer_data.h (copied) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_engine.h (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/lib/util/count_pointer.h (modified) * trunk/src/lib/util/debug.h (copied) * trunk/src/lib/util/debug_buffer.cc (copied) * trunk/src/lib/util/debug_buffer.h (copied) * trunk/src/lib/util/executor/executor.cc (deleted) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_const_member.h (copied) * trunk/src/lib/util/executor/executor_functional.cc (deleted) * trunk/src/lib/util/executor/executor_functional.h (deleted) * trunk/src/lib/util/executor/executor_generic.h (copied) * trunk/src/lib/util/executor/executor_lua.cc (deleted) * trunk/src/lib/util/executor/executor_lua.h (deleted) * trunk/src/lib/util/executor/executor_member.h (copied) * trunk/src/lib/util/executor/executor_static.h (copied) * trunk/src/lib/util/executor/executor_substring.cc (copied) * trunk/src/lib/util/executor/executor_substring.h (copied) * trunk/src/lib/util/executor/executor_xml.h (modified) * trunk/src/lib/util/executor/functor_const_member.h (copied) * trunk/src/lib/util/executor/functor_generic.h (copied) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/executor/functor_member.h (copied) * trunk/src/lib/util/executor/functor_static.h (copied) * trunk/src/lib/util/filesys/directory.cc (modified) * trunk/src/lib/util/filesys/directory.h (modified) * trunk/src/lib/util/filesys/file.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.h (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/factory.h (modified) * trunk/src/lib/util/loading/fast_factory.cc (copied) * trunk/src/lib/util/loading/fast_factory.h (copied) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/lib/util/loading/game_loader.h (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/load_param.h (modified) * trunk/src/lib/util/loading/load_param_class_description.cc (copied) * trunk/src/lib/util/loading/load_param_class_description.h (copied) * trunk/src/lib/util/loading/load_param_description.cc (modified) * trunk/src/lib/util/loading/load_param_description.h (modified) * trunk/src/lib/util/loading/load_param_xml.h (copied) * trunk/src/lib/util/loading/resource.cc (modified) * trunk/src/lib/util/loading/resource.h (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/multi_type.h (modified) * trunk/src/lib/util/preferences.cc (deleted) * trunk/src/lib/util/preferences.h (deleted) * trunk/src/lib/util/sigslot/signal.h (modified) * trunk/src/lib/util/substring.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/orxonox.h (modified) * trunk/src/proto/proto_class.cc (modified) * trunk/src/proto/proto_class.h (modified) * trunk/src/proto/proto_singleton.cc (modified) * trunk/src/proto/proto_singleton.h (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign.h (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/campaign_data.h (modified) * trunk/src/story_entities/dedicated_server_world.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (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/movie_loader.cc (modified) * trunk/src/story_entities/movie_loader.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/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/network/simple_sync.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/animation/animation.cc (modified) * trunk/src/util/animation/animation.h (modified) * trunk/src/util/animation/animation_player.cc (modified) * trunk/src/util/animation/animation_player.h (modified) * trunk/src/util/fast_factory.cc (deleted) * trunk/src/util/fast_factory.h (deleted) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/kill_target.h (modified) * trunk/src/util/mission_goal.cc (modified) * trunk/src/util/mission_goal.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/util/singleplayer_shootemup.h (modified) * trunk/src/util/track/pilot_node.cc (modified) * trunk/src/util/track/pilot_node.h (modified) * trunk/src/util/track/track_node.cc (modified) * trunk/src/util/track/track_node.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/bsp_entity.h (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/character_attributes.cc (modified) * trunk/src/world_entities/character_attributes.h (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/billboard.h (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/effects/explosion.h (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.h (modified) * trunk/src/world_entities/elements/image_entity.cc (modified) * trunk/src/world_entities/elements/image_entity.h (modified) * trunk/src/world_entities/elements/text_element.cc (modified) * trunk/src/world_entities/elements/text_element.h (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environment.h (modified) * trunk/src/world_entities/environments/building.cc (modified) * trunk/src/world_entities/environments/building.h (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/model_entity.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/extendable.cc (copied) * trunk/src/world_entities/extendable.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.h (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/door.h (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/gate.h (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/network_turret.cc (modified) * trunk/src/world_entities/npcs/network_turret.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/npcs/npc_test1.h (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/npcs/repair_station.h (modified) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/npcs/space_turret.h (modified) * trunk/src/world_entities/particles (copied) * trunk/src/world_entities/particles/box_emitter.cc (copied) * trunk/src/world_entities/particles/box_emitter.h (copied) * trunk/src/world_entities/particles/dot_emitter.cc (copied) * trunk/src/world_entities/particles/dot_emitter.h (copied) * trunk/src/world_entities/particles/dot_particles.cc (copied) * trunk/src/world_entities/particles/dot_particles.h (copied) * trunk/src/world_entities/particles/engine (copied) * trunk/src/world_entities/particles/engine/particle_engine.cc (copied) * trunk/src/world_entities/particles/engine/particle_engine.h (copied) * trunk/src/world_entities/particles/model_particles.cc (copied) * trunk/src/world_entities/particles/model_particles.h (copied) * trunk/src/world_entities/particles/particle_emitter.cc (copied) * trunk/src/world_entities/particles/particle_emitter.h (copied) * trunk/src/world_entities/particles/particle_system.cc (copied) * trunk/src/world_entities/particles/particle_system.h (copied) * trunk/src/world_entities/particles/plane_emitter.cc (copied) * trunk/src/world_entities/particles/plane_emitter.h (copied) * trunk/src/world_entities/particles/quick_animation.cc (copied) * trunk/src/world_entities/particles/quick_animation.h (copied) * trunk/src/world_entities/particles/spark_particles.cc (copied) * trunk/src/world_entities/particles/spark_particles.h (copied) * trunk/src/world_entities/particles/sprite_particles.cc (copied) * trunk/src/world_entities/particles/sprite_particles.h (copied) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/planet.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.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/projectiles/boomerang_projectile.cc (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.h (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/laser.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.h (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/rocket.h (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/recorder.h (modified) * trunk/src/world_entities/satellite.cc (modified) * trunk/src/world_entities/satellite.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/skydome.h (modified) * trunk/src/world_entities/skysphere.cc (modified) * trunk/src/world_entities/skysphere.h (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.h (modified) * trunk/src/world_entities/space_ships/cruizer.cc (modified) * trunk/src/world_entities/space_ships/cruizer.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/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.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/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/spectator.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_system.cc (modified) * trunk/src/world_entities/weapons/aiming_system.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/ammo_container.cc (modified) * trunk/src/world_entities/weapons/ammo_container.h (modified) * trunk/src/world_entities/weapons/boomerang_gun.cc (modified) * trunk/src/world_entities/weapons/boomerang_gun.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/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.h (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.h (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (modified) * trunk/src/world_entities/weapons/laser_cannon.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/weather_effects (copied) * trunk/src/world_entities/weather_effects/atmospheric_engine.cc (copied) * trunk/src/world_entities/weather_effects/atmospheric_engine.h (copied) * trunk/src/world_entities/weather_effects/cloud_effect.cc (copied) * trunk/src/world_entities/weather_effects/cloud_effect.h (copied) * trunk/src/world_entities/weather_effects/fog_effect.cc (copied) * trunk/src/world_entities/weather_effects/fog_effect.h (copied) * trunk/src/world_entities/weather_effects/lense_flare.cc (copied) * trunk/src/world_entities/weather_effects/lense_flare.h (copied) * trunk/src/world_entities/weather_effects/lightning_effect.cc (copied) * trunk/src/world_entities/weather_effects/lightning_effect.h (copied) * trunk/src/world_entities/weather_effects/rain_effect.cc (copied) * trunk/src/world_entities/weather_effects/rain_effect.h (copied) * trunk/src/world_entities/weather_effects/snow_effect.cc (copied) * trunk/src/world_entities/weather_effects/snow_effect.h (copied) * trunk/src/world_entities/weather_effects/sun_effect.cc (copied) * trunk/src/world_entities/weather_effects/sun_effect.h (copied) * trunk/src/world_entities/weather_effects/volfog_effect.cc (copied) * trunk/src/world_entities/weather_effects/volfog_effect.h (copied) * trunk/src/world_entities/weather_effects/weather_effect.cc (copied) * trunk/src/world_entities/weather_effects/weather_effect.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the new_class_id branche back to the trunk. ... Fri, 04 Aug 2006 21:01:28 GMT bensch [9656] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_box.h (modified) * trunk/src/lib/gui/gl/glgui_container.cc (modified) * trunk/src/lib/gui/gl/glgui_container.h (modified) * trunk/src/lib/gui/gl/glgui_defs.h (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.cc (copied) * trunk/src/lib/gui/gl/glgui_fixedposition_box.h (copied) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.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_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (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/message_manager.cc (modified) * trunk/src/lib/network/message_manager.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 (modified) * trunk/src/lib/network/monitor/network_stats_widget.h (modified) * trunk/src/lib/network/nettypes.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_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/player_stats.h (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/proxy_control.cc (copied) * trunk/src/lib/network/proxy/proxy_control.h (copied) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h (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.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/particles/quick_animation.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/network_turret.cc (copied) * trunk/src/world_entities/npcs/network_turret.h (copied) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/npcs/space_turret.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/hover.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/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.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/laser_cannon.cc (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/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the proxy bache back with no conflicts 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 ... Wed, 05 Jul 2006 14:39:02 GMT bensch [9235] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.h (modified) * trunk/src/lib/collision_reaction/Makefile.am (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (copied) * trunk/src/lib/collision_reaction/cr_physics_full_walk.h (copied) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/coord/p_node.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/fog_effect.h (modified) * trunk/src/lib/graphics/effects/lightning_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.h (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (copied) * trunk/src/world_entities/npcs/attractor_mine.h (copied) * trunk/src/world_entities/npcs/gate.cc (copied) * trunk/src/world_entities/npcs/gate.h (copied) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/npcs/space_turret.cc (copied) * trunk/src/world_entities/npcs/space_turret.h (copied) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.cc (copied) * trunk/src/world_entities/projectiles/boomerang_projectile.h (copied) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/laser.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (copied) * trunk/src/world_entities/projectiles/rail_projectile.h (copied) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/rocket.h (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/space_ships/cruizer.cc (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/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.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/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/weapons/aiming_system.cc (copied) * trunk/src/world_entities/weapons/aiming_system.h (copied) * trunk/src/world_entities/weapons/boomerang_gun.cc (copied) * trunk/src/world_entities/weapons/boomerang_gun.h (copied) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (copied) * trunk/src/world_entities/weapons/laser_cannon.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the presentation back Mon, 03 Jul 2006 16:39:10 GMT patrick [9061] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_reaction/cr_defs.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/space_ships/cruizer.cc (copied) * trunk/src/world_entities/space_ships/cruizer.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (copied) * trunk/src/world_entities/space_ships/spacecraft_2d.h (copied) * trunk/src/world_entities/world_entity.cc (modified) merged the single_player branche to trunk Sun, 02 Jul 2006 12:11:59 GMT bensch [9006] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.h (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lightening_effect.cc (deleted) * trunk/src/lib/graphics/effects/lightening_effect.h (deleted) * trunk/src/lib/graphics/effects/lightning_effect.cc (copied) * trunk/src/lib/graphics/effects/lightning_effect.h (copied) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.h (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/skydome.h (modified) orxonox/trunk: merged the mountain_lake branche back to the trunk ... Sun, 02 Jul 2006 11:36:13 GMT bensch [9003] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.h (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.h (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/door.cc (deleted) * trunk/src/world_entities/door.h (deleted) * trunk/src/world_entities/elements/glgui_radar.cc (modified) * trunk/src/world_entities/npcs/door.cc (copied) * trunk/src/world_entities/npcs/door.h (copied) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (copied) * trunk/src/world_entities/npcs/repair_station.h (copied) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the single_player_map branche back merged with ... Sat, 01 Jul 2006 09:37:42 GMT bensch [8973] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_text.cc (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.h (modified) trunk: gui: full functionality of Text Wed, 28 Jun 2006 22:19:48 GMT patrick [8894] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_reaction/collision_event.h (modified) * trunk/src/lib/collision_reaction/cr_defs.h (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/script_engine/script_manager.h (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_functional.cc (modified) * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/door.cc (copied) * trunk/src/world_entities/door.h (copied) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (copied) * trunk/src/world_entities/weapons/fps_sniper_rifle.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the branche single_player_map with the trunk Mon, 26 Jun 2006 13:36:16 GMT patrick [8793] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.h (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/lightening_effect.cc (modified) * trunk/src/lib/graphics/effects/lightening_effect.h (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.h (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/sun_effect.cc (modified) * trunk/src/lib/graphics/effects/sun_effect.h (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/skydome.cc (copied) * trunk/src/world_entities/skydome.h (copied) trunk: merged the weather engine branche to the trunk Mon, 26 Jun 2006 12:00:31 GMT patrick [8783] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) merged the script engine branche back to trunk Sat, 24 Jun 2006 00:16:12 GMT bensch [8761] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_data.h (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.cc (modified) * trunk/src/lib/graphics/text_engine/font_data.h (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.h (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/util/count_pointer.h (modified) merged the new Font-Implementation back here merged with svn merge ... Thu, 22 Jun 2006 13:14:58 GMT bensch [8724] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (copied) * trunk/src/lib/collision_detection/aabb.h (copied) * trunk/src/lib/collision_detection/aabb_tree_node.cc (copied) * trunk/src/lib/collision_detection/aabb_tree_node.h (copied) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/graphics/importer/md3/md3_animation.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_animation.h (modified) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.h (copied) * trunk/src/lib/graphics/importer/md3/md3_bone_frame.h (modified) * trunk/src/lib/graphics/importer/md3/md3_data.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_data.h (modified) * trunk/src/lib/graphics/importer/md3/md3_mesh.h (modified) * trunk/src/lib/graphics/importer/md3/md3_model.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_model.h (modified) * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/lib/util/tokenizer.cc (copied) * trunk/src/lib/util/tokenizer.h (copied) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/creatures/fps_player.cc (copied) * trunk/src/world_entities/creatures/fps_player.h (copied) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/npcs/generic_npc.cc (copied) * trunk/src/world_entities/npcs/generic_npc.h (copied) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the bsp-model-stuff back here Thu, 22 Jun 2006 12:04:28 GMT bensch [8717] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/error.h (modified) * trunk/src/lib/data/data_tank.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_box.cc (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_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.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_table.cc (modified) * trunk/src/lib/gui/gl/glgui_table.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu (copied) * trunk/src/story_entities/menu/game_menu.cc (copied) * trunk/src/story_entities/menu/game_menu.h (copied) * trunk/src/story_entities/menu/glgui_imagebutton.cc (copied) * trunk/src/story_entities/menu/glgui_imagebutton.h (copied) * 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 (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) merged the gui back Thu, 22 Jun 2006 11:09:20 GMT bensch [8711] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/lunartest.lua (deleted) * trunk/src/lib/script_engine/lunartest2.lua (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.cc (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/script_engine/script_manager.h (modified) * trunk/src/lib/script_engine/script_method.cc (modified) * trunk/src/lib/script_engine/script_method.h (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) merged the script_engine back here Tue, 20 Jun 2006 11:24:11 GMT bensch [8619] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (copied) * trunk/src/lib/graphics/text_engine/limited_width_text.h (copied) * 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.h (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (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_container.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_defs.h (modified) * trunk/src/lib/gui/gl/glgui_image.cc (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_style.cc (deleted) * trunk/src/lib/gui/gl/glgui_style.h (deleted) * trunk/src/lib/gui/gl/glgui_table.cc (copied) * trunk/src/lib/gui/gl/glgui_table.h (copied) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified) * trunk/src/lib/math/rect2D.cc (modified) * trunk/src/lib/math/rect2D.h (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/filesys/file.cc (modified) * trunk/src/lib/util/filesys/file.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/skybox.h (modified) trunk: merged the gui-branche back. merged with command: svn merge ... Fri, 16 Jun 2006 08:23:05 GMT bensch [8518] * trunk/scripts/tardis-scratch-checkout.pl (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/gui/gl/Makefile.am (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_style.cc (modified) * trunk/src/lib/gui/gl/glgui_style.h (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/specials (copied) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (copied) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (copied) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) merged the gui back to the trunk Thu, 15 Jun 2006 19:34:48 GMT patrick [8490] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_reaction/Makefile.am (modified) * trunk/src/lib/collision_reaction/collision.h (modified) * trunk/src/lib/collision_reaction/collision_event.h (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.h (modified) * trunk/src/lib/collision_reaction/collision_reaction.h (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_ground_walk.cc (copied) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (copied) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.h (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/interactive_model.cc (copied) * trunk/src/lib/graphics/importer/interactive_model.h (copied) * trunk/src/lib/graphics/importer/md2 (copied) * trunk/src/lib/graphics/importer/md2/md2Model.cc (copied) * trunk/src/lib/graphics/importer/md2/md2Model.h (copied) * trunk/src/lib/graphics/importer/md2Model.cc (deleted) * trunk/src/lib/graphics/importer/md2Model.h (deleted) * trunk/src/lib/graphics/importer/md3 (copied) * trunk/src/lib/graphics/importer/md3/md3_animation.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_animation.h (copied) * trunk/src/lib/graphics/importer/md3/md3_bone_frame.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_bone_frame.h (copied) * trunk/src/lib/graphics/importer/md3/md3_data.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_data.h (copied) * trunk/src/lib/graphics/importer/md3/md3_mesh.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_mesh.h (copied) * trunk/src/lib/graphics/importer/md3/md3_model.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_model.h (copied) * trunk/src/lib/graphics/importer/md3/md3_tag.cc (copied) * trunk/src/lib/graphics/importer/md3/md3_tag.h (copied) * trunk/src/lib/graphics/importer/md_model_structure.cc (copied) * trunk/src/lib/graphics/importer/md_model_structure.h (copied) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * 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/subprojects/collision_detection/collision_detection.cc (modified) * trunk/src/subprojects/importer/importer.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/bsp_entity.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (copied) * trunk/src/world_entities/space_ships/collision_probe.h (copied) * trunk/src/world_entities/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the bsp branche back to trunk Thu, 08 Jun 2006 15:25:05 GMT bensch [8282] * trunk/src/defs/debug.h (modified) debug better Thu, 08 Jun 2006 14:50:50 GMT bensch [8271] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/gui/gl/signal_connector.cc (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/lang/class_list.h (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/OLD (deleted) * trunk/src/lib/script_engine/Script.cc (deleted) * trunk/src/lib/script_engine/Script.h (deleted) * trunk/src/lib/script_engine/account.cc (copied) * trunk/src/lib/script_engine/example.cc (copied) * trunk/src/lib/script_engine/luna (deleted) * trunk/src/lib/script_engine/lunar.h (modified) * trunk/src/lib/script_engine/lunartest2.lua (modified) * trunk/src/lib/script_engine/object.cc (copied) * trunk/src/lib/script_engine/script.cc (copied) * trunk/src/lib/script_engine/script.h (copied) * trunk/src/lib/script_engine/script_class.cc (copied) * trunk/src/lib/script_engine/script_class.h (copied) * trunk/src/lib/script_engine/script_manager.cc (copied) * trunk/src/lib/script_engine/script_manager.h (copied) * trunk/src/lib/scripting (deleted) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_functional.h (modified) * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/lib/util/executor/executor_xml.h (modified) * trunk/src/lib/util/loading/resource.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/script_trigger.cc (copied) * trunk/src/world_entities/script_trigger.h (copied) merge Wed, 07 Jun 2006 13:00:01 GMT patrick [8190] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/collision_detection/Makefile.am (modified) * trunk/src/lib/collision_detection/collision.cc (deleted) * trunk/src/lib/collision_detection/collision.h (deleted) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_reaction/Makefile.am (modified) * trunk/src/lib/collision_reaction/collision.cc (copied) * trunk/src/lib/collision_reaction/collision.h (copied) * trunk/src/lib/collision_reaction/collision_event.cc (copied) * trunk/src/lib/collision_reaction/collision_event.h (copied) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.h (modified) * trunk/src/lib/collision_reaction/collision_reaction.cc (copied) * trunk/src/lib/collision_reaction/collision_reaction.h (copied) * trunk/src/lib/collision_reaction/cr_defs.h (copied) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (copied) * trunk/src/lib/collision_reaction/cr_object_damage.h (copied) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified) * trunk/src/lib/physics/physics_interface.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the cr branche to trunk Wed, 07 Jun 2006 12:40:46 GMT bensch [8186] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/cd_engine.h (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (copied) * trunk/src/lib/graphics/importer/bsp_file.h (copied) * trunk/src/lib/graphics/importer/bsp_manager.cc (copied) * trunk/src/lib/graphics/importer/bsp_manager.h (copied) * trunk/src/lib/graphics/importer/bsp_tree_leaf.cc (copied) * trunk/src/lib/graphics/importer/bsp_tree_leaf.h (copied) * trunk/src/lib/graphics/importer/bsp_tree_node.cc (copied) * trunk/src/lib/graphics/importer/bsp_tree_node.h (copied) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (copied) * trunk/src/world_entities/bsp_entity.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the branche bsp_model back here Mon, 05 Jun 2006 09:49:26 GMT bensch [8145] * trunk/configure.ac (modified) * trunk/src/defs/debug.h (modified) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/gui/Makefile.am (modified) * trunk/src/lib/gui/gl (copied) * trunk/src/lib/gui/gl/Makefile.am (copied) * trunk/src/lib/gui/gl/glgui.h (copied) * trunk/src/lib/gui/gl/glgui_bar.cc (copied) * trunk/src/lib/gui/gl/glgui_bar.h (copied) * trunk/src/lib/gui/gl/glgui_box.cc (copied) * trunk/src/lib/gui/gl/glgui_box.h (copied) * trunk/src/lib/gui/gl/glgui_button.cc (copied) * trunk/src/lib/gui/gl/glgui_button.h (copied) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (copied) * trunk/src/lib/gui/gl/glgui_checkbutton.h (copied) * trunk/src/lib/gui/gl/glgui_colorselector.cc (copied) * trunk/src/lib/gui/gl/glgui_colorselector.h (copied) * trunk/src/lib/gui/gl/glgui_container.cc (copied) * trunk/src/lib/gui/gl/glgui_container.h (copied) * trunk/src/lib/gui/gl/glgui_cursor.cc (copied) * trunk/src/lib/gui/gl/glgui_cursor.h (copied) * trunk/src/lib/gui/gl/glgui_defs.h (copied) * trunk/src/lib/gui/gl/glgui_element.cc (copied) * trunk/src/lib/gui/gl/glgui_element.h (copied) * trunk/src/lib/gui/gl/glgui_frame.cc (copied) * trunk/src/lib/gui/gl/glgui_frame.h (copied) * trunk/src/lib/gui/gl/glgui_handler.cc (copied) * trunk/src/lib/gui/gl/glgui_handler.h (copied) * trunk/src/lib/gui/gl/glgui_image.cc (copied) * trunk/src/lib/gui/gl/glgui_image.h (copied) * trunk/src/lib/gui/gl/glgui_inputline.cc (copied) * trunk/src/lib/gui/gl/glgui_inputline.h (copied) * trunk/src/lib/gui/gl/glgui_mainwidget.cc (copied) * trunk/src/lib/gui/gl/glgui_mainwidget.h (copied) * trunk/src/lib/gui/gl/glgui_menu.cc (copied) * trunk/src/lib/gui/gl/glgui_menu.h (copied) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (copied) * trunk/src/lib/gui/gl/glgui_pushbutton.h (copied) * trunk/src/lib/gui/gl/glgui_slider.cc (copied) * trunk/src/lib/gui/gl/glgui_slider.h (copied) * trunk/src/lib/gui/gl/glgui_style.cc (copied) * trunk/src/lib/gui/gl/glgui_style.h (copied) * trunk/src/lib/gui/gl/glgui_text.cc (copied) * trunk/src/lib/gui/gl/glgui_text.h (copied) * trunk/src/lib/gui/gl/glgui_textfield.cc (copied) * trunk/src/lib/gui/gl/glgui_textfield.h (copied) * trunk/src/lib/gui/gl/glgui_widget.cc (copied) * trunk/src/lib/gui/gl/glgui_widget.h (copied) * trunk/src/lib/gui/gl/glgui_window.cc (copied) * trunk/src/lib/gui/gl/glgui_window.h (copied) * trunk/src/lib/gui/gl/glmenu (copied) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (copied) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h (copied) * trunk/src/lib/gui/gl/signal_connector.cc (copied) * trunk/src/lib/gui/gl/signal_connector.h (copied) * trunk/src/lib/gui/gl_gui (deleted) * trunk/src/lib/gui/gtk (copied) * trunk/src/lib/gui/gtk/Makefile.am (copied) * trunk/src/lib/gui/gtk/banner.xpm (copied) * trunk/src/lib/gui/gtk/gui.cc (copied) * trunk/src/lib/gui/gtk/gui.h (copied) * trunk/src/lib/gui/gtk/gui_audio.cc (copied) * trunk/src/lib/gui/gtk/gui_audio.h (copied) * trunk/src/lib/gui/gtk/gui_banner.cc (copied) * trunk/src/lib/gui/gtk/gui_banner.h (copied) * trunk/src/lib/gui/gtk/gui_element.cc (copied) * trunk/src/lib/gui/gtk/gui_element.h (copied) * trunk/src/lib/gui/gtk/gui_exec.cc (copied) * trunk/src/lib/gui/gtk/gui_exec.h (copied) * trunk/src/lib/gui/gtk/gui_flags.cc (copied) * trunk/src/lib/gui/gtk/gui_flags.h (copied) * trunk/src/lib/gui/gtk/gui_gtk.cc (copied) * trunk/src/lib/gui/gtk/gui_gtk.h (copied) * trunk/src/lib/gui/gtk/gui_keys.cc (copied) * trunk/src/lib/gui/gtk/gui_keys.h (copied) * trunk/src/lib/gui/gtk/gui_update.cc (copied) * trunk/src/lib/gui/gtk/gui_update.h (copied) * trunk/src/lib/gui/gtk/gui_video.cc (copied) * trunk/src/lib/gui/gtk/gui_video.h (copied) * trunk/src/lib/gui/gtk/logo.xpm (copied) * trunk/src/lib/gui/gtk/rc (copied) * trunk/src/lib/gui/gtk_gui (deleted) * trunk/src/lib/gui/qt (copied) * trunk/src/lib/gui/qt/Makefile.am (copied) * trunk/src/lib/gui/qt/banner.xpm (copied) * trunk/src/lib/gui/qt/gui_audio.cc (copied) * trunk/src/lib/gui/qt/gui_audio.h (copied) * trunk/src/lib/gui/qt/gui_control.cc (copied) * trunk/src/lib/gui/qt/gui_control.h (copied) * trunk/src/lib/gui/qt/gui_general.cc (copied) * trunk/src/lib/gui/qt/gui_general.h (copied) * trunk/src/lib/gui/qt/gui_video.cc (copied) * trunk/src/lib/gui/qt/gui_video.h (copied) * trunk/src/lib/gui/qt/q_image_widget.cc (copied) * trunk/src/lib/gui/qt/q_image_widget.h (copied) * trunk/src/lib/gui/qt/qt_gui.cc (copied) * trunk/src/lib/gui/qt/qt_gui.h (copied) * trunk/src/lib/gui/qt/qt_gui_elements.cc (copied) * trunk/src/lib/gui/qt/qt_gui_elements.h (copied) * trunk/src/lib/gui/qt_gui (deleted) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/math/rect2D.cc (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_buffer.h (modified) * trunk/src/lib/shell/shell_command.h (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/lib/util/count_pointer.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/animation/t_animation.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/player.cc (modified) trunk: merged the gui back merged with command: svn merge ... Thu, 01 Jun 2006 12:28:16 GMT patrick [8068] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/connection_monitor.cc (modified) * trunk/src/lib/network/connection_monitor.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.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_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/player_stats.cc (copied) * trunk/src/lib/network/player_stats.h (copied) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.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/util/Makefile.am (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (copied) * trunk/src/util/network_game_rules.h (copied) * trunk/src/util/object_manager.h (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/spectator.cc (copied) * trunk/src/world_entities/spectator.h (copied) trunk: merged the network branche back to trunk Wed, 31 May 2006 14:20:51 GMT bensch [8035] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/model.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/Makefile.am (modified) * trunk/src/lib/gui/gl_gui/glgui.h (modified) * trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_box.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_box.h (modified) * trunk/src/lib/gui/gl_gui/glgui_button.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_button.h (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl_gui/glgui_container.h (modified) * trunk/src/lib/gui/gl_gui/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_handler.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_handler.h (modified) * trunk/src/lib/gui/gl_gui/glgui_image.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_image.h (modified) * trunk/src/lib/gui/gl_gui/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_inputline.h (modified) * trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_pushbutton.h (modified) * trunk/src/lib/gui/gl_gui/glgui_slider.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_slider.h (modified) * trunk/src/lib/gui/gl_gui/glgui_text.h (modified) * trunk/src/lib/gui/gl_gui/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/lib/gui/gl_gui/signal_connector.cc (modified) * trunk/src/lib/gui/gl_gui/signal_connector.h (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/math/rect2D.h (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/math/vector2D.h (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_functional.cc (modified) * trunk/src/lib/util/executor/executor_functional.h (modified) * trunk/src/lib/util/executor/executor_specials.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/multi_type.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) gui: merged the gui back to the trunk Mon, 29 May 2006 13:28:41 GMT patrick [7954] * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/connection_monitor.cc (modified) * trunk/src/lib/network/connection_monitor.h (modified) * 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/message_manager.cc (copied) * trunk/src/lib/network/message_manager.h (copied) * trunk/src/lib/network/netdefs.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_log.cc (copied) * trunk/src/lib/network/network_log.h (copied) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (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/server_socket.cc (modified) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/lib/network/synchronizeable_var (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h (copied) * trunk/src/lib/network/tcp_server_socket.cc (copied) * trunk/src/lib/network/tcp_server_socket.h (copied) * trunk/src/lib/network/tcp_socket.cc (copied) * trunk/src/lib/network/tcp_socket.h (copied) * trunk/src/lib/network/udp_server_socket.cc (copied) * trunk/src/lib/network/udp_server_socket.h (copied) * trunk/src/lib/network/udp_socket.cc (copied) * trunk/src/lib/network/udp_socket.h (copied) * trunk/src/lib/network/zip.cc (copied) * trunk/src/lib/network/zip.h (copied) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/subprojects/network/Makefile.am (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/subprojects/network/simple_sync.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (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/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/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/space_ships/hover.cc (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/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the network branche back to trunk. Sun, 28 May 2006 16:46:33 GMT patrick [7927] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/collision_reaction/Makefile.am (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.h (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: added more cr framework, i will branche soon with this stuff ... Sun, 28 May 2006 13:48:13 GMT bensch [7919] * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/event/event_def.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (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.h (modified) * trunk/src/lib/gui/gl_gui/Makefile.am (modified) * trunk/src/lib/gui/gl_gui/glgui.h (modified) * trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_button.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_button.h (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl_gui/glgui_colorselector.h (modified) * trunk/src/lib/gui/gl_gui/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_cursor.h (modified) * trunk/src/lib/gui/gl_gui/glgui_defs.h (copied) * trunk/src/lib/gui/gl_gui/glgui_handler.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_handler.h (modified) * trunk/src/lib/gui/gl_gui/glgui_inputline.cc (copied) * trunk/src/lib/gui/gl_gui/glgui_inputline.h (copied) * trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_pushbutton.h (modified) * trunk/src/lib/gui/gl_gui/glgui_slider.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_slider.h (modified) * trunk/src/lib/gui/gl_gui/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_textfield.h (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl_gui/signal_connector.h (modified) * trunk/src/lib/math/Makefile.am (modified) * trunk/src/lib/math/rect2D.cc (copied) * trunk/src/lib/math/rect2D.h (copied) * trunk/src/lib/math/vector2D.h (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/timer.cc (copied) * trunk/src/lib/util/timer.h (copied) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/skybox.cc (modified) orxonox/trunk: merged the gui branche back merged with command: ... Wed, 24 May 2006 20:05:32 GMT bensch [7836] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified) * trunk/src/lib/graphics/effects/sun_effect.cc (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) trunk: merged the Atmos back again, because a ClassID was wrong Wed, 24 May 2006 15:39:17 GMT patrick [7819] * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/debug.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_reaction (added) * trunk/src/lib/collision_reaction/Makefile.am (added) * trunk/src/lib/collision_reaction/cr_engine.cc (added) * trunk/src/lib/collision_reaction/cr_engine.h (added) trunk: added a collision reaction lib. starting implementation Wed, 24 May 2006 13:57:04 GMT bensch [7810] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (copied) * trunk/src/lib/graphics/effects/atmospheric_engine.h (copied) * trunk/src/lib/graphics/effects/cloud_effect.cc (copied) * trunk/src/lib/graphics/effects/cloud_effect.h (copied) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/effects/lightening_effect.cc (copied) * trunk/src/lib/graphics/effects/lightening_effect.h (copied) * trunk/src/lib/graphics/effects/rain_effect.cc (copied) * trunk/src/lib/graphics/effects/rain_effect.h (copied) * trunk/src/lib/graphics/effects/snow_effect.cc (copied) * trunk/src/lib/graphics/effects/snow_effect.h (copied) * trunk/src/lib/graphics/effects/sun_effect.cc (copied) * trunk/src/lib/graphics/effects/sun_effect.h (copied) * trunk/src/lib/graphics/effects/volfog_effect.cc (copied) * trunk/src/lib/graphics/effects/volfog_effect.h (copied) * trunk/src/lib/graphics/effects/weather_effect.cc (copied) * trunk/src/lib/graphics/effects/weather_effect.h (copied) * trunk/src/lib/graphics/render2D/billboard.cc (deleted) * trunk/src/lib/graphics/render2D/billboard.h (deleted) * trunk/src/lib/graphics/render2D/image_plane.cc (copied) * trunk/src/lib/graphics/render2D/image_plane.h (copied) * trunk/src/lib/sound/sound_source.cc (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/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/world_entities/effects/billboard.cc (copied) * trunk/src/world_entities/effects/billboard.h (copied) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) orxonox/trunk: merged the Weather effects back here Wed, 24 May 2006 01:17:19 GMT bensch [7785] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/shader.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) orxonox/trunk: merged the Changes from the water branche back to the ... Fri, 19 May 2006 13:07:09 GMT bensch [7729] * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/defs/debug.h (modified) * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) orxonox/trunk: better debug names As DEBUG and ERROR are already ... Thu, 18 May 2006 21:44:21 GMT patrick [7711] * trunk/src/defs/debug.h (modified) * trunk/src/lib/collision_detection/bounding_sphere.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.h (modified) * trunk/src/lib/collision_detection/bv_tree.cc (modified) * trunk/src/lib/collision_detection/bv_tree.h (modified) * trunk/src/lib/collision_detection/bv_tree_node.cc (modified) * trunk/src/lib/collision_detection/bv_tree_node.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/cd_engine.h (modified) * trunk/src/lib/collision_detection/collision.cc (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/collision_detection/obb.h (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.h (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/math/matrix.cc (modified) * trunk/src/lib/math/plane.cc (modified) * trunk/src/lib/math/plane.h (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/util/executor/executor_specials.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/subprojects/collision_detection/collision_detection.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.h (modified) * trunk/src/subprojects/framework.cc (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the cd branche back to trunk Wed, 17 May 2006 22:55:34 GMT bensch [7661] * trunk/acinclude.m4 (modified) * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/debug.h (modified) * trunk/src/defs/globals.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/event/key_names.cc (modified) * trunk/src/lib/event/key_names.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/gui/Makefile.am (modified) * trunk/src/lib/gui/gtk_gui/Makefile.am (modified) * trunk/src/lib/gui/gtk_gui/gui_element.h (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.cc (modified) * trunk/src/lib/gui/gtk_gui/gui_update.cc (modified) * trunk/src/lib/gui/gui.cc (copied) * trunk/src/lib/gui/gui.h (copied) * trunk/src/lib/gui/gui_element.cc (copied) * trunk/src/lib/gui/gui_element.h (copied) * trunk/src/lib/gui/gui_saveable.cc (copied) * trunk/src/lib/gui/gui_saveable.h (copied) * trunk/src/lib/gui/qt_gui (copied) * trunk/src/lib/gui/qt_gui/Makefile.am (copied) * trunk/src/lib/gui/qt_gui/banner.xpm (copied) * trunk/src/lib/gui/qt_gui/gui_audio.cc (copied) * trunk/src/lib/gui/qt_gui/gui_audio.h (copied) * trunk/src/lib/gui/qt_gui/gui_control.cc (copied) * trunk/src/lib/gui/qt_gui/gui_control.h (copied) * trunk/src/lib/gui/qt_gui/gui_general.cc (copied) * trunk/src/lib/gui/qt_gui/gui_general.h (copied) * trunk/src/lib/gui/qt_gui/gui_video.cc (copied) * trunk/src/lib/gui/qt_gui/gui_video.h (copied) * trunk/src/lib/gui/qt_gui/q_image_widget.cc (copied) * trunk/src/lib/gui/qt_gui/q_image_widget.h (copied) * trunk/src/lib/gui/qt_gui/qt_gui.cc (copied) * trunk/src/lib/gui/qt_gui/qt_gui.h (copied) * trunk/src/lib/gui/qt_gui/qt_gui_elements.cc (copied) * trunk/src/lib/gui/qt_gui/qt_gui_elements.h (copied) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (modified) * trunk/src/lib/particles/dot_emitter.cc (modified) * trunk/src/lib/shell/shell_buffer.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (modified) * trunk/src/lib/util/directory.cc (copied) * trunk/src/lib/util/directory.h (copied) * trunk/src/lib/util/file.cc (copied) * trunk/src/lib/util/file.h (copied) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/lib/util/osdir.h (deleted) * trunk/src/lib/util/preferences.cc (modified) * trunk/src/lib/util/preferences.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) orxonox/trunk: merged the QT_GUI back to the trunk merged with ... Tue, 02 May 2006 21:44:10 GMT patrick [7486] * trunk/src/defs/class_id.h (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/kill.cc (modified) * trunk/src/util/kill.h (modified) orxonox: kill event redesigned Tue, 02 May 2006 21:08:45 GMT patrick [7482] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/kill.cc (added) * trunk/src/util/kill.h (added) * trunk/src/world_entities/playable.cc (modified) orxonox: working on kill event processing (game rule specific) Mon, 01 May 2006 11:47:53 GMT patrick [7461] * trunk/src/defs/class_id.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/kill_target.cc (added) * trunk/src/util/kill_target.h (added) * trunk/src/util/mission_goal.cc (modified) * trunk/src/util/mission_goal.h (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) orxonox: the mission goal framework is nearly completed Sat, 29 Apr 2006 19:38:44 GMT bensch [7450] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (copied) * trunk/src/lib/graphics/text_engine/multi_line_text.h (copied) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) orxonox/trunk: added MultiLineText a Text for multiple line-input, ... Thu, 27 Apr 2006 11:05:17 GMT bensch [7393] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/shell/shell_completion.h (modified) * trunk/src/lib/shell/shell_input.h (modified) orxonox/trunk: ClassList better, and some shell-commands Wed, 26 Apr 2006 22:52:35 GMT patrick [7391] * trunk/src/defs/class_id.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/mission_goal.cc (added) * trunk/src/util/mission_goal.h (added) * trunk/src/util/singleplayer_shootemup.cc (added) * trunk/src/util/singleplayer_shootemup.h (added) orxonox: working on mission goals and mission manager Wed, 26 Apr 2006 01:28:55 GMT bensch [7374] * trunk/src/defs/debug.h (modified) * trunk/src/lib/shell/Makefile.am (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell.h (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_buffer.h (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command.h (modified) * trunk/src/lib/shell/shell_command_class.cc (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/shell/shell_completion.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (copied) * trunk/src/lib/shell/shell_completion_plugin.h (copied) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) orxonox/trunk: added new Files shell_completion_plugin for the new ... Thu, 30 Mar 2006 09:45:31 GMT bensch [7256] * trunk/AUTHORS (modified) * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/globals.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/parser/Makefile.am (modified) * trunk/src/lib/parser/cmdline_parser (copied) * trunk/src/lib/parser/cmdline_parser/Makefile.am (copied) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (copied) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.h (copied) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/parser/preferences (copied) * trunk/src/lib/parser/preferences/Makefile.am (copied) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc (copied) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h (copied) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (copied) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.h (copied) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_engine.h (modified) * trunk/src/lib/util/preferences.cc (copied) * trunk/src/lib/util/preferences.h (copied) * trunk/src/orxonox.cc (modified) * trunk/src/orxonox.h (modified) * trunk/src/subprojects/framework.cc (modified) orxonox/trunk: merged the preferences back to the trunk merged with ... Tue, 07 Mar 2006 16:05:50 GMT bensch [7193] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/coord/p_node.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/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/media_container.cc (modified) * trunk/src/lib/graphics/importer/model.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/render2D/billboard.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/shader.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_gui/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/network_game_manager.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/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/physics_connection.cc (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/util/loading (moved) * trunk/src/lib/util/loading/dynamic_loader.h (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/resource.cc (copied) * trunk/src/lib/util/loading/resource.h (copied) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/orxonox.cc (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/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 (modified) * 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/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/framework.cc (modified) * trunk/src/subprojects/importer/importer.cc (modified) * trunk/src/subprojects/particles/particle_fun.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/track/track_manager.cc (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.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/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (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/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/satellite.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/hover.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/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_turret.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.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) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: new style for resources (prework/movement) Sun, 19 Feb 2006 14:18:08 GMT bensch [7167] * trunk/src/defs/class_id.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/loading/dynamic_loader.cc (copied) * trunk/src/util/loading/dynamic_loader.h (copied) * trunk/src/util/loading/factory.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) trunk: dynamic library loading test Sat, 18 Feb 2006 16:38:37 GMT bensch [7165] * trunk/src/defs/debug.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/lang/class_list.h (modified) * trunk/src/subprojects/importer/importer.cc (modified) reverted the Vector usage, as it lead to a non-predicate segfault Sat, 18 Feb 2006 14:58:03 GMT bensch [7162] * trunk/src/defs/debug.h (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/lang/class_list.h (modified) * trunk/src/subprojects/importer/importer.cc (modified) using vector instead of list in classList Sat, 18 Feb 2006 14:34:57 GMT bensch [7161] * trunk/src/defs/debug.h (modified) trunk: one should again be able to use cout << Sat, 11 Feb 2006 19:57:26 GMT bensch [7123] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2Model.h (modified) * trunk/src/lib/graphics/importer/model.h (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: some cleanup before the new tag 1. BaseObject isA was ... Tue, 07 Feb 2006 23:56:19 GMT patrick [7110] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) trunk: a first very primitive lightning Mon, 06 Feb 2006 12:29:09 GMT bensch [7047] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/effects (added) * trunk/src/world_entities/effects/explosion.cc (copied) * trunk/src/world_entities/effects/explosion.h (copied) trunk: added class Explosion Mon, 06 Feb 2006 00:29:20 GMT bensch [7041] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/environments/building.cc (copied) * trunk/src/world_entities/environments/building.h (copied) trunk: added new worldEntity Building 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 15:34:44 GMT patrick [7020] * trunk/src/defs/debug.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/game_world_data.h (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) trunk: added the game rules Fri, 03 Feb 2006 15:33:45 GMT bensch [7019] * trunk/src/defs/class_id.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/elements/text_element.cc (copied) * trunk/src/world_entities/elements/text_element.h (copied) orxonox/trunk: Using TextEngine in the Menu Fri, 03 Feb 2006 01:21:54 GMT bensch [7002] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) orxonox/trunk: forgot to commit these two :) Thu, 02 Feb 2006 23:29:57 GMT bensch [6998] * trunk/src/defs/globals.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/gui/gtk_gui/gui_keys.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: more button definitions Thu, 02 Feb 2006 23:04:51 GMT bensch [6997] * trunk/src/defs/globals.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/gui/gtk_gui/gui_keys.cc (modified) * trunk/src/util/track/pilot_node.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: UP is FORWARD, DOWN is BACKWARD Wed, 01 Feb 2006 18:43:13 GMT bensch [6969] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/environments/model_entity.cc (moved) * trunk/src/world_entities/environments/model_entity.h (moved) orxonox/trunk: new ModelEntity (renamed) Mon, 30 Jan 2006 21:43:00 GMT bensch [6873] * trunk/src/Makefile.am (modified) * 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/effects/graphics_effect.cc (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/plane_emitter.cc (copied) * trunk/src/lib/particles/plane_emitter.h (copied) orxonox/trunk: Emitter is emitting correctly Mon, 30 Jan 2006 15:41:19 GMT bensch [6868] * trunk/src/defs/debug.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) orxonox/trunk: merged the Network back to the trunk. merged with ... Sun, 29 Jan 2006 23:26:32 GMT bensch [6836] * trunk/src/defs/alincl.h (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/sound/sound_buffer.h (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_engine.h (modified) orxonox/trunk: no more alut Sun, 29 Jan 2006 20:30:43 GMT bensch [6834] * trunk/src/defs/debug.h (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) trunk: less debug Sun, 29 Jan 2006 14:13:28 GMT bensch [6832] * trunk/src/defs/class_id.h (modified) trunk: small naming fix Sun, 29 Jan 2006 14:11:25 GMT bensch [6831] * trunk/src/defs/class_id.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) trunk: ClassID (classList) cleanup Sun, 29 Jan 2006 00:57:03 GMT bensch [6822] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/dot_emitter.cc (copied) * trunk/src/lib/particles/dot_emitter.h (copied) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.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) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: ParticleEmitters now splitted into SubClasses. Also fixed a ... Sat, 28 Jan 2006 22:02:21 GMT bensch [6818] * trunk/src/defs/class_id.h (modified) trunk: classID-cleanup Sat, 28 Jan 2006 16:11:51 GMT bensch [6815] * 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/Makefile.am (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (copied) * trunk/src/lib/graphics/effects/lense_flare.h (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/render2D/billboard.cc (copied) * trunk/src/lib/graphics/render2D/billboard.h (copied) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/image_entity.cc (modified) * trunk/src/world_entities/image_entity.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (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/skybox.cc (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/terrain.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: merged branches/network back to the trunk. merged ... Sat, 28 Jan 2006 14:30:54 GMT bensch [6810] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (copied) * trunk/src/world_entities/projectiles/hyperblast.h (copied) * trunk/src/world_entities/weapons/hyperblaster.cc (copied) * trunk/src/world_entities/weapons/hyperblaster.h (copied) trunk: added hyperblaster Thu, 26 Jan 2006 13:44:26 GMT bensch [6772] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/skybox.cc (modified) orxonox/trunk: merged the branche network back merged with command ... Wed, 25 Jan 2006 17:46:06 GMT bensch [6731] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/media_container.cc (modified) * trunk/src/lib/graphics/importer/media_container.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/recorder.cc (copied) * trunk/src/world_entities/recorder.h (copied) merged avi_play back to the trunk. command ... Wed, 25 Jan 2006 13:39:53 GMT patrick [6695] * 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/importer/vertex_array_model.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/netdefs.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_manager.cc (modified) * trunk/src/lib/network/network_manager.h (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/shared_network_data.cc (copied) * trunk/src/lib/network/shared_network_data.h (copied) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/param_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/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the network branche to the trunk Mon, 23 Jan 2006 13:02:22 GMT bensch [6655] * trunk/src/defs/class_id.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/items (added) * trunk/src/world_entities/items/item_container.cc (copied) * trunk/src/world_entities/items/item_container.h (copied) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (copied) * trunk/src/world_entities/weapons/ammo_container.h (copied) orxonox/trunk: ammoContainer added Sat, 21 Jan 2006 00:27:29 GMT bensch [6637] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (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/hover.cc (copied) * trunk/src/world_entities/space_ships/hover.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.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/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) orxonox/trunk: merged the SpaceShipControl branche 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 23:54:48 GMT bensch [6624] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) orxonox/trunk: Some missing stuff Thu, 19 Jan 2006 22:46:28 GMT bensch [6621] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/particles/sprite_particles.cc (copied) * trunk/src/lib/particles/sprite_particles.h (copied) * 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: particle derivate... still working on this Wed, 18 Jan 2006 16:25:48 GMT bensch [6600] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/movie_loader.cc (copied) * trunk/src/story_entities/movie_loader.h (copied) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) TRUNK: merged the avi_play branche again Wed, 18 Jan 2006 12:20:02 GMT bensch [6532] * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/media_container.cc (copied) * trunk/src/lib/graphics/importer/media_container.h (copied) * trunk/src/lib/graphics/importer/movie_player.cc (copied) * trunk/src/lib/graphics/importer/movie_player.h (copied) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/subprojects/importer/Makefile.am (modified) * trunk/src/subprojects/importer/movie_player_test.cc (copied) * trunk/src/subprojects/importer/multitex.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/movie_entity.cc (copied) * trunk/src/world_entities/movie_entity.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, ... Mon, 09 Jan 2006 22:53:53 GMT bensch [6455] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/tc.c (deleted) * trunk/src/lib/graphics/importer/tc.cc (added) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/environments (added) * trunk/src/world_entities/environments/water.cc (copied) * trunk/src/world_entities/environments/water.h (copied) trunk: Simple water surface WE Sun, 08 Jan 2006 12:12:38 GMT bensch [6437] * trunk/src/defs/class_id.h (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/hud.cc (copied) * trunk/src/util/hud.h (copied) * trunk/src/util/user_control.cc (deleted) * trunk/src/util/user_control.h (deleted) trunk: added HUD definition and removed user_control Sat, 07 Jan 2006 22:17:51 GMT bensch [6426] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/world_entities/camera.cc (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/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/guided_missile.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (copied) * trunk/src/world_entities/weapons/targeting_turret.h (copied) orxonox/trunk: merged the spaceshipcontrol branche back to the trunk ... 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, 30 Dec 2005 00:57:12 GMT bensch [6341] * 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/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/data_stream.h (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.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_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_protocol.cc (modified) * trunk/src/lib/network/network_protocol.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/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/story_entities/network_world.cc (modified) * trunk/src/subprojects/network/Makefile.am (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/subprojects/network/read_sync.cc (modified) * trunk/src/subprojects/network/read_sync.h (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/subprojects/network/simple_sync.h (modified) * trunk/src/subprojects/network/write_sync.cc (modified) * trunk/src/subprojects/network/write_sync.h (modified) * trunk/src/util/loading/factory.cc (modified) * trunk/src/util/loading/factory.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * 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/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) * trunk/src/world_entities/weapons/ground_turret.cc (modified) * trunk/src/world_entities/weapons/ground_turret.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the network branche back to the trunk, so we do ... Sun, 25 Dec 2005 16:32:21 GMT bensch [6287] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/gui/gl_gui/Makefile.am (modified) * trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_bar.h (modified) * trunk/src/lib/gui/gl_gui/glgui_box.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_box.h (modified) * trunk/src/lib/gui/gl_gui/glgui_button.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/lib/gui/gl_gui/glgui_window.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_window.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) orxonox/trunk: some gui-work Sun, 25 Dec 2005 13:46:33 GMT bensch [6280] * trunk/src/defs/class_id.h (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/lang/class_list.h (modified) orxonox/trunk: ClassList now supports getLeafID() to retriefe the ID ... Sat, 24 Dec 2005 23:52:23 GMT bensch [6279] * trunk/src/defs/class_id.h (modified) orxonox/trunk: descriptions Sat, 24 Dec 2005 18:14:06 GMT bensch [6278] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/lang/class_list.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) trunk: christmas commit.... fixed baseObject Sat, 24 Dec 2005 13:28:00 GMT bensch [6276] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/lang/base_object.cc (modified) orxonox/trunk: cleaner base_object-stuff Wed, 21 Dec 2005 14:41:11 GMT bensch [6243] * trunk/src/defs/class_id.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/weapon_power_up.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) orxonox/trunk: merged the power-ups to the tunk again Wed, 21 Dec 2005 12:49:06 GMT bensch [6222] * trunk (modified) * trunk/src (modified) * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib (modified) * trunk/src/lib/collision_detection (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/event (modified) * trunk/src/lib/graphics (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2Model.h (modified) * trunk/src/lib/graphics/importer/model.h (modified) * trunk/src/lib/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/spatial_separation (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/gui (modified) * trunk/src/lib/gui/gl_gui (modified) * trunk/src/lib/gui/gtk_gui (modified) * trunk/src/lib/network (modified) * trunk/src/lib/parser (modified) * trunk/src/lib/parser/ini_parser (modified) * trunk/src/lib/parser/tinyxml (modified) * trunk/src/lib/particles (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/physics (modified) * trunk/src/lib/shell (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/sound (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/story_entities/debug_world.cc (modified) * trunk/src/story_entities/network_world.cc (modified) * trunk/src/story_entities/world.cc (modified) * trunk/src/subprojects (modified) * trunk/src/subprojects/collision_detection (modified) * trunk/src/subprojects/importer (modified) * trunk/src/subprojects/importer/Makefile.am (modified) * trunk/src/subprojects/importer/importer.cc (modified) * trunk/src/subprojects/network (modified) * trunk/src/subprojects/particles (modified) * trunk/src/subprojects/testmain (modified) * trunk/src/util (modified) * trunk/src/util/animation/animation.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/creatures (copied) * trunk/src/world_entities/creatures/md2_creature.cc (copied) * trunk/src/world_entities/creatures/md2_creature.h (copied) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.cc (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/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/satellite.cc (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/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/bomb.cc (modified) * trunk/src/world_entities/weapons/guided_missile.cc (modified) * trunk/src/world_entities/weapons/laser.cc (modified) * trunk/src/world_entities/weapons/rocket.cc (modified) * trunk/src/world_entities/weapons/test_bullet.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the christmas branche to the trunk merged with ... Mon, 19 Dec 2005 15:52:01 GMT bensch [6162] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/model.cc (modified) * trunk/src/lib/graphics/importer/objModel.cc (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/world_entities/playable.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/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/guided_missile.cc (modified) * trunk/src/world_entities/weapons/guided_missile.h (modified) * trunk/src/world_entities/weapons/laser.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) orxonox/trunk: merged the spaceshipcontroll branche into the trunk ... Fri, 16 Dec 2005 18:13:57 GMT bensch [6142] * trunk/src/defs/debug.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/cd_engine.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/graphics_engine.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/network_world.cc (modified) * trunk/src/story_entities/network_world.h (modified) * trunk/src/story_entities/world.cc (modified) * trunk/src/story_entities/world.h (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/garbage_collector.cc (deleted) * trunk/src/util/garbage_collector.h (deleted) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/laser_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/skysphere.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/bomb.cc (modified) * trunk/src/world_entities/weapons/ground_turret.cc (modified) * trunk/src/world_entities/weapons/guided_missile.cc (modified) * trunk/src/world_entities/weapons/laser.cc (modified) * trunk/src/world_entities/weapons/projectile.cc (modified) * trunk/src/world_entities/weapons/rocket.cc (modified) * trunk/src/world_entities/weapons/test_bullet.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (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: merge the ObjectManager to the trunk merged with ... Fri, 16 Dec 2005 17:45:32 GMT patrick [6139] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/converter.cc (copied) * trunk/src/lib/network/converter.h (copied) * trunk/src/lib/network/handshake.cc (copied) * trunk/src/lib/network/handshake.h (copied) * trunk/src/lib/network/network_game_manager.cc (copied) * trunk/src/lib/network/network_game_manager.h (copied) * 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_protocol.h (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/server_socket.cc (modified) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/network_world.cc (added) * trunk/src/story_entities/network_world.h (added) * trunk/src/subprojects/network/Makefile.am (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/subprojects/network/read_sync.cc (modified) * trunk/src/subprojects/network/read_sync.h (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/subprojects/network/simple_sync.h (modified) * trunk/src/subprojects/network/write_sync.cc (modified) * trunk/src/subprojects/network/write_sync.h (modified) * trunk/src/util/loading/game_loader.cc (modified) * trunk/src/util/loading/game_loader.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/spawning_point.cc (copied) * trunk/src/world_entities/spawning_point.h (copied) trunk: merged branche network with trunk using command: svn merge ... Wed, 14 Dec 2005 15:44:13 GMT bensch [6113] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/extendable.h (copied) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (added) * trunk/src/world_entities/power_ups/param_power_up.h (added) * 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/weapon_power_up.cc (added) * trunk/src/world_entities/power_ups/weapon_power_up.h (added) trunk: copied new power-ups Wed, 14 Dec 2005 12:46:12 GMT bensch [6100] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/height_map.cc (copied) * trunk/src/lib/graphics/importer/height_map.h (copied) orxonox/trunk: copied the heightMap to the trunk, and adapted to ... Sat, 10 Dec 2005 16:10:32 GMT bensch [6010] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.h (modified) orxonox/trunk: vertex_array_model implemented Fri, 09 Dec 2005 22:12:04 GMT bensch [6004] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/npcs/npc_test1.h (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: new algorithm to rotate entities for drawing works ...