# # ChangeLog for trunk in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 30, 2024, 1:18:28 AM Fri, 23 Jun 2006 15:28:13 GMT bensch [8750] * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (modified) * trunk/src/orxonox.cc (modified) orxonox/trunk: now one can also close orxonox when the datadir is not ... Fri, 23 Jun 2006 15:08:04 GMT bensch [8749] * trunk/src/lib/gui/qt/Makefile.am (modified) * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.cc (copied) * trunk/src/lib/gui/qt/qt_gui_datadir_fallback.h (copied) * trunk/src/orxonox.cc (modified) orxonox/trunk: fallback test for ORXONOX-data-directory Fri, 23 Jun 2006 13:17:15 GMT bensch [8743] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) gui: event-handler now supports retrieving key-states Fri, 23 Jun 2006 12:55:59 GMT bensch [8742] * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) gui: better switch with keys Fri, 23 Jun 2006 09:22:37 GMT bensch [8740] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/menu/glgui_imagebutton.cc (modified) * trunk/src/story_entities/menu/glgui_imagebutton.h (modified) orxonox/trunk: now the elements are draw correctly Thu, 22 Jun 2006 14:28:18 GMT bensch [8731] * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) new player 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:13:18 GMT bensch [8719] * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) merged the water branche back. conflicts resolved in favour of the trunk 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 Thu, 22 Jun 2006 10:48:01 GMT bensch [8708] * 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_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/spectator.cc (modified) merged network back merged with command: svn merge -r8625:HEAD ... Thu, 22 Jun 2006 10:46:29 GMT bensch [8707] * trunk/acinclude.m4 (modified) merged the lua-download-script back Tue, 20 Jun 2006 11:39:01 GMT bensch [8623] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.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/data_stream.cc (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 (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/udp_broadcast.cc (copied) * trunk/src/lib/network/udp_broadcast.h (copied) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/network/zip.h (modified) * trunk/src/lib/shell/some_shell_commands.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/subprojects/network/network_unit_test.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/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) orxonox/trunk: merged the network branche back here merged with ... 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 11:50:21 GMT bensch [8527] * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) compiles again Fri, 16 Jun 2006 09:16:38 GMT bensch [8523] * trunk/acinclude.m4 (modified) * trunk/configure.ac (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/util/filesys/directory.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/signal_handler.h (modified) trunk: compiles on Windows: DANGER: THE LINUX PORT MAY BE COMPROMISED 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:50:56 GMT bensch [8495] * trunk/src/lib/collision_reaction/collision_handle.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/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/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_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 (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/sglmodel.h (deleted) * trunk/src/lib/graphics/effects/sky.sgl (deleted) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.h (modified) * trunk/src/lib/graphics/effects/weather_effect.cc (modified) * trunk/src/lib/graphics/effects/weather_effect.h (modified) * trunk/src/lib/gui/qt/gui_control.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/subprojects/benchmark.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) merged the branche atmos back. no conflicts 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, 15 Jun 2006 10:56:03 GMT bensch [8450] * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_style.cc (modified) orxonox/trunk: fixed compile errors Thu, 15 Jun 2006 10:48:26 GMT bensch [8448] * trunk/Makefile.am (modified) * trunk/configure.ac (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/material.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/glgui_bar.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_defs.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (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_pushbutton.cc (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_style.cc (modified) * trunk/src/lib/gui/gl/glgui_style.h (modified) * trunk/src/lib/gui/gl/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/rect2D.cc (modified) * trunk/src/lib/math/rect2D.h (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) merged gui back to the trunk merged with command merge -r8377:HEAD ... Wed, 14 Jun 2006 16:03:16 GMT bensch [8413] * trunk/src/lib/script_engine/script_method.cc (added) * trunk/src/lib/script_engine/script_method.h (added) added strangely missing files Wed, 14 Jun 2006 15:50:18 GMT bensch [8408] * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/account.cc (modified) * trunk/src/lib/script_engine/lunar.h (modified) * trunk/src/lib/script_engine/lunartest2.lua (modified) * trunk/src/lib/script_engine/object.cc (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/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/loading/load_param.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/util/state.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) trunk: merged the script_engine branche back here merged with ... Wed, 14 Jun 2006 10:13:16 GMT bensch [8376] * 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/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) orxonox/trunk: no more seg-fault when copying a Texture Wed, 14 Jun 2006 09:12:52 GMT bensch [8370] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) doxy Wed, 14 Jun 2006 09:04:24 GMT bensch [8369] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/objModel.cc (modified) * trunk/src/lib/graphics/importer/objModel.h (modified) orxonox/trunk: finaly moved the *#\!3i^& chars out of Material Wed, 14 Jun 2006 08:51:50 GMT bensch [8368] * trunk/src/lib/BuildLibs.am (modified) trunk: lins again Wed, 14 Jun 2006 08:49:48 GMT bensch [8367] * trunk/configure.ac (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/util/Makefile.am (copied) trunk: libORXlibutil is built Wed, 14 Jun 2006 08:42:53 GMT bensch [8366] * trunk/src/lib/graphics/importer/texture.cc (modified) orxonox/trunk: some doxytags in Texture. Wed, 14 Jun 2006 08:37:08 GMT bensch [8363] * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_data.cc (copied) * trunk/src/lib/graphics/importer/texture_data.h (copied) * trunk/src/orxonox.cc (modified) trunk: splitted Texture and TextureData into two files. Also fixed ... Wed, 14 Jun 2006 08:08:41 GMT bensch [8362] * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.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/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/gui/qt/gui_video.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/network/connection_monitor.h (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/util/executor/executor_xml.h (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_description.cc (modified) * trunk/src/lib/util/preferences.cc (modified) * trunk/src/lib/util/preferences.h (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/player.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/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.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/turbine_hover.cc (modified) orxonox/trunk: removed stupid included in base_object.h this should ... Wed, 14 Jun 2006 07:49:56 GMT bensch [8361] * trunk/src/lib/lang/class_list.h (modified) trunk: ClassList is a friend of BaseObject, so that the ... Wed, 14 Jun 2006 07:46:00 GMT bensch [8360] * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) orxonox/trunk: more performant Element2D'drawer Tue, 13 Jun 2006 20:01:55 GMT bensch [8350] * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_command.cc (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/util/fast_factory.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) fixed out some warnings Tue, 13 Jun 2006 09:14:25 GMT bensch [8340] * trunk/src/lib/event/event_handler.cc (modified) event: less debug Tue, 13 Jun 2006 09:10:02 GMT bensch [8339] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) trunk: shell receives events again Mon, 12 Jun 2006 22:22:37 GMT bensch [8335] * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) draw better gui Mon, 12 Jun 2006 21:47:50 GMT bensch [8333] * trunk/src/lib/util/filesys/directory.h (modified) * trunk/src/lib/util/filesys/file.cc (modified) * trunk/src/lib/util/filesys/file.h (modified) trunk: some nicer updates Mon, 12 Jun 2006 20:51:14 GMT bensch [8332] * trunk/src/lib/util/filesys/directory.cc (modified) * trunk/src/lib/util/filesys/directory.h (modified) * trunk/src/lib/util/filesys/file.h (modified) trunk: some more functionality Mon, 12 Jun 2006 20:44:26 GMT bensch [8330] * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/parser/ini_parser/Makefile.am (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (modified) * trunk/src/lib/util/filesys (added) * trunk/src/lib/util/filesys/directory.cc (moved) * trunk/src/lib/util/filesys/directory.h (moved) * trunk/src/lib/util/filesys/file.cc (moved) * trunk/src/lib/util/filesys/file.h (moved) * 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/simple_game_menu.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) moved the File-Classes Sun, 11 Jun 2006 22:40:57 GMT bensch [8324] * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.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_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) trunk: Texture-Sequence is initialized smoothly now in the GLGuiCursor Sun, 11 Jun 2006 11:57:27 GMT bensch [8316] * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/event/event_handler.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/lightening_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/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/height_map.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/media_container.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/tc.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl/signal_connector.cc (modified) * trunk/src/lib/gui/qt/gui_control.cc (modified) * trunk/src/lib/lang/class_list.cc (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/preferences/cmd_line_prefs_reader.cc (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/load_param_description.cc (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/player.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/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) trunk: fixed most -Wall warnings... but there are still many missing :/ Sun, 11 Jun 2006 11:01:26 GMT bensch [8315] * trunk/src/util/animation/t_animation.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: fixed a nasty seg-fault, when unloading the WeaponManager ... Sun, 11 Jun 2006 10:49:25 GMT bensch [8312] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) trunk: merged the water-branche back here removed the HACK in ... Sun, 11 Jun 2006 10:41:26 GMT bensch [8311] * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) trunk: improoved debug Sun, 11 Jun 2006 10:33:19 GMT bensch [8310] * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) orxonox/trunk: impooved TextureSequence Sun, 11 Jun 2006 10:24:11 GMT bensch [8309] * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/world_entities/movie_entity.cc (modified) trunk: better texture-sequence Fri, 09 Jun 2006 01:17:28 GMT bensch [8299] * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.h (modified) gui: YEAH. the cursor works quite cool :) Fri, 09 Jun 2006 01:03:55 GMT bensch [8298] * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) should work Fri, 09 Jun 2006 00:56:50 GMT bensch [8297] * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) trunk: new ImageLoading algo Thu, 08 Jun 2006 21:11:37 GMT bensch [8293] * trunk/acinclude.m4 (modified) * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/util/file.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/signal_handler.h (modified) orxonox/trunk: merged the osX-branche back here merged with command: ... Thu, 08 Jun 2006 15:25:05 GMT bensch [8282] * trunk/src/defs/debug.h (modified) debug better Thu, 08 Jun 2006 15:22:49 GMT bensch [8278] * trunk/src/lib/script_engine/script_manager.cc (modified) merge Thu, 08 Jun 2006 15:21:29 GMT bensch [8276] * trunk/src/lib/gui/gl/glgui_style.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (modified) * trunk/src/lib/util/directory.cc (modified) * trunk/src/lib/util/directory.h (modified) * trunk/src/lib/util/file.cc (modified) merged new GUI 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 Thu, 08 Jun 2006 14:49:18 GMT bensch [8270] * trunk/src/lib/script_engine/account.cc (deleted) delete shit Thu, 08 Jun 2006 13:44:12 GMT bensch [8255] * 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/sglmodel.h (copied) * trunk/src/lib/graphics/effects/sky.sgl (copied) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/effects/weather_effect.cc (modified) * trunk/src/lib/graphics/light.h (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/shader.h (modified) * 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/world_entities/Makefile.am (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/billboard.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) merged the atmos back with command: ... Thu, 08 Jun 2006 09:19:08 GMT patrick [8228] * trunk/src/lib/event/event_handler.cc (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_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/spectator.h (modified) trunk: merged the network branche back to trunk with command: svn ... 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 10:46:02 GMT bensch [8148] * 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/event/key_names.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/vector2D.h (modified) * trunk/src/lib/particles/quick_animation.h (modified) * trunk/src/lib/util/file.h (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/factory.h (modified) * trunk/src/util/state.h (modified) trunk: output of EventListener Nicer Mon, 05 Jun 2006 10:09:15 GMT bensch [8147] * trunk/configure.ac (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_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.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/playable.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/spectator.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) orxonox/trunk: merged the network branche back here merged with ... 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 Thu, 01 Jun 2006 11:59:42 GMT bensch [8061] * trunk/acinclude.m4 (modified) * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/script_engine (copied) * trunk/src/lib/script_engine/Makefile.am (copied) * trunk/src/lib/script_engine/OLD (copied) * trunk/src/lib/script_engine/OLD/LuaCallback.cc (copied) * trunk/src/lib/script_engine/OLD/LuaCallback.h (copied) * trunk/src/lib/script_engine/OLD/RestoreStack.cc (copied) * trunk/src/lib/script_engine/OLD/RestoreStack.h (copied) * trunk/src/lib/script_engine/OLD/Script.cc (copied) * trunk/src/lib/script_engine/OLD/Script.h (copied) * trunk/src/lib/script_engine/OLD/This.cc (copied) * trunk/src/lib/script_engine/OLD/This.h (copied) * trunk/src/lib/script_engine/OLD/VirtualMachine.cc (copied) * trunk/src/lib/script_engine/OLD/VirtualMachine.h (copied) * trunk/src/lib/script_engine/OLD/main.cc (copied) * trunk/src/lib/script_engine/OLD/scriptable.cc (copied) * trunk/src/lib/script_engine/OLD/scriptable.h (copied) * trunk/src/lib/script_engine/Script.cc (copied) * trunk/src/lib/script_engine/Script.h (copied) * trunk/src/lib/script_engine/account.cc (copied) * trunk/src/lib/script_engine/config.h (copied) * trunk/src/lib/script_engine/luaincl.h (copied) * trunk/src/lib/script_engine/luna (copied) * trunk/src/lib/script_engine/luna/account.cc (copied) * trunk/src/lib/script_engine/luna/account.lua (copied) * trunk/src/lib/script_engine/luna/luna.h (copied) * trunk/src/lib/script_engine/lunar.h (copied) * trunk/src/lib/script_engine/lunartest.lua (copied) * trunk/src/lib/script_engine/lunartest2.lua (copied) * trunk/src/lib/scripting (copied) merged the scriptengine back to the trunk Thu, 01 Jun 2006 11:31:37 GMT bensch [8059] * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) multi-line-text-fix-hack Thu, 01 Jun 2006 11:30:11 GMT bensch [8057] * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) trunk: some lua-stuff Thu, 01 Jun 2006 11:10:46 GMT bensch [8055] * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) trunk: new Playmode FirstPerson Wed, 31 May 2006 22:57:57 GMT bensch [8051] * trunk/src/lib/util/executor/executor_lua.cc (copied) * trunk/src/lib/util/executor/executor_lua.h (copied) * trunk/src/lib/util/executor/executor_xml.h (modified) lua: new Executor for lua-interpretation Wed, 31 May 2006 21:10:17 GMT bensch [8048] * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/gui/gl_gui/signal_connector.cc (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_functional.h (modified) * trunk/src/lib/util/executor/executor_xml.h (moved) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/loading/load_param.h (modified) trunk: prepare for the new Executor Wed, 31 May 2006 16:29:34 GMT bensch [8042] * trunk/acinclude.m4 (modified) trunk: qt should compile on UBUNTU Wed, 31 May 2006 14:52:34 GMT bensch [8037] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/shader.h (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the water back merged with command svn merge ... 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 14:02:16 GMT bensch [7922] * trunk/src/lib/graphics/importer/material.cc (modified) trunk: reverted change Sun, 28 May 2006 13:59:13 GMT bensch [7921] * trunk/src/lib/graphics/importer/material.cc (modified) trunk: test if work 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: ... Fri, 26 May 2006 11:39:33 GMT bensch [7871] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/story_entities/game_world.cc (modified) orxonox/trunk: Element2D is better updated (after PNode :) Fri, 26 May 2006 11:21:32 GMT bensch [7868] * 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/event/event_listener.cc (modified) * trunk/src/lib/event/event_listener.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_handler.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/lib/util/loading/game_loader.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/track/pilot_node.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/player.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/weapons/crosshair.cc (modified) trunk: merge Check in the Event-changes: r7867 | bensch | 2006-05-26 ... Thu, 25 May 2006 21:29:55 GMT patrick [7865] * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) trunk: removed compiler error Thu, 25 May 2006 16:02:27 GMT bensch [7863] * trunk/src/lib/gui/qt_gui/gui_control.cc (modified) * trunk/src/lib/gui/qt_gui/gui_control.h (modified) orxonox/trunk: also catching mouse-events Thu, 25 May 2006 15:34:44 GMT bensch [7862] * trunk/src/lib/gui/qt_gui/gui_control.cc (modified) * trunk/src/lib/gui/qt_gui/gui_control.h (modified) orxonox/trunk: OK the Keys are grabbed, as they should Thu, 25 May 2006 14:47:24 GMT bensch [7861] * trunk/src/lib/gui/qt_gui/gui_control.cc (modified) * trunk/src/lib/gui/qt_gui/gui_control.h (modified) test control Thu, 25 May 2006 13:59:34 GMT bensch [7858] * trunk/src/lib/gui/qt_gui/gui_audio.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) orxonox/trunk: fixed auto-repeat Thu, 25 May 2006 13:49:16 GMT bensch [7856] * trunk/src/lib/gui/qt_gui/gui_audio.cc (modified) trunk: qt_gui: more as sugested by patrick Thu, 25 May 2006 13:42:18 GMT bensch [7855] * 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_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/gui/qt_gui/gui_audio.cc (modified) * trunk/src/lib/gui/qt_gui/gui_general.cc (modified) * trunk/src/lib/gui/qt_gui/qt_gui.cc (modified) qtgui: cleanup as patrick sugested Thu, 25 May 2006 10:48:25 GMT bensch [7849] * trunk/src/lib/sound/ogg_player.cc (modified) trunk: Sound is not lost, if the MusicEngine does not get his time in ... Thu, 25 May 2006 09:42:03 GMT bensch [7848] * trunk/src/lib/graphics/importer/material.cc (modified) Temprarily fixed the Missing File-bug Wed, 24 May 2006 23:12:30 GMT bensch [7847] * trunk/src/lib/sound/sound_engine.h (modified) * trunk/src/lib/util/threading.cc (modified) * trunk/src/lib/util/threading.h (modified) trunk: some minor fixes Wed, 24 May 2006 21:45:28 GMT bensch [7846] * trunk/src/lib/graphics/render2D/element_2d.cc (modified) orxonox/trunk: doxygen Wed, 24 May 2006 21:44:13 GMT bensch [7845] * trunk/src/lib/graphics/render2D/element_2d.cc (modified) hmm... does not help Wed, 24 May 2006 21:34:22 GMT bensch [7844] * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) orxonox/trunk: Ok the Element2D-renderer works, and hides Elements, ... Wed, 24 May 2006 21:17:59 GMT bensch [7843] * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (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) compiles Wed, 24 May 2006 21:09:58 GMT patrick [7842] * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) trunk: can't compile on this computer, commented out and syntax check ... Wed, 24 May 2006 21:07:38 GMT patrick [7841] * trunk/src/lib/collision_reaction/collision_handle.cc (added) * trunk/src/lib/collision_reaction/collision_handle.h (added) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/subprojects/collision_detection/collision_detection.cc (modified) trunk: collision handle introduced and other stuff Wed, 24 May 2006 20:38:51 GMT bensch [7840] * trunk/src/lib/graphics/effects/lense_flare.cc (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/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/render2D/render_2d.h (modified) * trunk/src/lib/gui/gl_gui/glgui_handler.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skysphere.cc (modified) trunk: Elements that are supposed to be on the Background stay there: ... Wed, 24 May 2006 20:35:26 GMT patrick [7839] * trunk/src/lib/collision_reaction/cr_engine.h (modified) trunk: collision reaction main structure 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