# # ChangeLog for trunk/src/util in orxonox.OLD # # Generated by Trac 1.0.9 # Nov 22, 2024, 3:10:36 PM 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 ... 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 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 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 ... 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 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 ... 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. 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 ... 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 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 ... Tue, 23 May 2006 20:04:17 GMT bensch [7779] * 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_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_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.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_colorselector.h (modified) * trunk/src/lib/gui/gl_gui/glgui_container.cc (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_cursor.h (modified) * trunk/src/lib/gui/gl_gui/glgui_element.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_element.h (modified) * trunk/src/lib/gui/gl_gui/glgui_frame.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_frame.h (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_mainwidget.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_mainwidget.h (modified) * trunk/src/lib/gui/gl_gui/glgui_menu.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_menu.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.cc (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_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/glgui_window.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_window.h (modified) * trunk/src/lib/gui/gl_gui/signal_connector.cc (copied) * trunk/src/lib/gui/gl_gui/signal_connector.h (copied) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) 3088 linews changed :): trunk: namespaces Tue, 02 May 2006 22:03:47 GMT patrick [7488] * 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/singleplayer_shootemup.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) orxonox: mission manager less verbose and more secure now 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:17:39 GMT patrick [7483] * trunk/src/util/game_rules.h (modified) orxonox: kill list work 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 20:43:09 GMT patrick [7466] * trunk/src/lib/graphics/importer/height_map.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/kill_target.cc (modified) orxonox: reformat of the height_map.h header file. Mon, 01 May 2006 14:52:33 GMT patrick [7464] * 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/singleplayer_shootemup.cc (modified) * trunk/src/util/singleplayer_shootemup.h (modified) orxonox: mission goals get checked now, verbose output. Mon, 01 May 2006 14:03:01 GMT patrick [7463] * 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) mission goals now get loaded correctly with all attributes Mon, 01 May 2006 13:21:40 GMT patrick [7462] * trunk/src/Makefile.am (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/kill_target.h (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) mission goals loadable 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 00:56:52 GMT bensch [7440] * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/signal_handler.cc (copied) * trunk/src/util/signal_handler.h (copied) orxonox/trunk: merged the Signal-Handler-Branche back to the TRUNK Thu, 27 Apr 2006 14:34:21 GMT patrick [7400] * trunk/src/util/game_rules.h (modified) * trunk/src/util/mission_goal.h (modified) worked on game rules and mission goals 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 Tue, 25 Apr 2006 23:31:01 GMT bensch [7370] * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/data/data_tank.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/campaign_data.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/story_entities/game_world_data.h (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/multi_player_world_data.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/single_player_world_data.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: drawLists/tickLists are used, and made some ... Tue, 25 Apr 2006 21:37:59 GMT bensch [7368] * trunk/src/lib/shell/shell_command.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.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) orxonox/trunk: some renamings, and GameWorldData now has lists for ... Wed, 15 Mar 2006 14:10:45 GMT bensch [7221] * 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/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/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/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/height_map.h (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/md2Model.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/lib/graphics/importer/objModel.cc (modified) * trunk/src/lib/graphics/importer/objModel.h (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.h (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/graphics/render2D/billboard.cc (modified) * trunk/src/lib/graphics/render2D/billboard.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/shader.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/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.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_menu.h (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/glmenu/glmenu_imagescreen.h (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.cc (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.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) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/parser/tinyxml/tinyxml.h (modified) * trunk/src/lib/particles/dot_particles.h (modified) * trunk/src/lib/particles/model_particles.cc (modified) * trunk/src/lib/particles/model_particles.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/spark_particles.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/lib/particles/sprite_particles.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/shell/shell.cc (modified) * trunk/src/lib/shell/shell.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_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/ogg_player.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) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_specials.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/helper_functions.cc (modified) * trunk/src/lib/util/helper_functions.h (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/factory.h (modified) * 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_description.cc (modified) * trunk/src/lib/util/loading/load_param_description.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/substring.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/orxonox.h (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/movie_loader.cc (modified) * trunk/src/story_entities/movie_loader.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/subprojects/others/TTFtoIMG.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/fast_factory.cc (modified) * trunk/src/util/fast_factory.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/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/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/planet.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/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/recorder.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/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/turbine_hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/terrain.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/crosshair.cc (modified) * trunk/src/world_entities/weapons/crosshair.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the std-branche back, it runs on windows and ... Wed, 08 Mar 2006 13:30:19 GMT bensch [7198] * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/particles/box_emitter.cc (modified) * trunk/src/lib/particles/dot_particles.cc (modified) * trunk/src/lib/particles/model_particles.cc (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/plane_emitter.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command.h (modified) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/load_param.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: new Default Values... they now too are in MultiType ... 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 Thu, 16 Feb 2006 13:29:21 GMT bensch [7151] * trunk/configure.ac (modified) * trunk/src/Makefile.am (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/subprojects/importer/Makefile.am (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (added) orxonox/trunk: new and more improved WE make process Mon, 13 Feb 2006 13:59:17 GMT bensch [7130] * trunk/src/lib/gui/gl_gui/glgui_box.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_box.h (modified) * trunk/src/lib/particles/engine/particle_engine.cc (modified) * trunk/src/lib/particles/engine/particle_engine.h (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/subprojects/collision_detection/collision_detection.cc (modified) * trunk/src/util/loading/load_param.cc (modified) * trunk/src/util/loading/load_param.h (modified) * trunk/src/util/loading/load_param_description.cc (modified) * trunk/src/util/loading/load_param_description.h (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) orxonox/trunk: removed some std::list Wed, 08 Feb 2006 08:59:21 GMT patrick [7118] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) trunk: mp explosion Wed, 08 Feb 2006 08:39:53 GMT rennerc [7116] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) terrain collision hack Tue, 07 Feb 2006 17:48:10 GMT patrick [7101] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) spaceship collides with arena Tue, 07 Feb 2006 16:22:21 GMT patrick [7089] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) trunk: game rules should work now Tue, 07 Feb 2006 16:19:50 GMT patrick [7088] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/playable.cc (modified) trunk: working on respawn bug Tue, 07 Feb 2006 15:32:14 GMT patrick [7082] * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/playable.cc (modified) trunk: respawn and death patch Tue, 07 Feb 2006 15:21:57 GMT patrick [7080] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) trunk: another game rules patch Tue, 07 Feb 2006 15:18:20 GMT patrick [7079] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/world_entities/playable.cc (modified) trunk: minor game rules change Mon, 06 Feb 2006 21:33:04 GMT bensch [7064] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/world_entity.h (modified) hud work Mon, 06 Feb 2006 20:55:04 GMT bensch [7062] * trunk/src/lib/gui/gl_gui/glgui_bar.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.cc (modified) * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) hud Mon, 06 Feb 2006 16:02:09 GMT bensch [7059] * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2Model.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) md2 model resource managed Mon, 06 Feb 2006 01:09:01 GMT patrick [7044] * 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/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) trunk: death screen now works Sun, 05 Feb 2006 23:49:15 GMT patrick [7040] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) trunk: game rules definitions added Sun, 05 Feb 2006 23:47:01 GMT patrick [7039] * 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/util/state.cc (modified) * trunk/src/util/state.h (modified) trunk: game rules definitions added Sun, 05 Feb 2006 23:05:23 GMT patrick [7037] * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) trunk: game rules definitions added 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 Sun, 05 Feb 2006 20:56:04 GMT patrick [7034] * 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/multiplayer_team_deathmatch.cc (added) * trunk/src/util/multiplayer_team_deathmatch.h (added) trunk: started working on the game rules and specificlay on the ... Sat, 04 Feb 2006 04:01:11 GMT bensch [7032] * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) testing 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 14:15:41 GMT patrick [7017] * trunk/src/util/game_rules.cc (added) * trunk/src/util/game_rules.h (added) trunk: adding game rules structure Fri, 03 Feb 2006 13:14:22 GMT bensch [7014] * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/playable.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) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) trunk: new algorithm for the Camera-Distance 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 Thu, 02 Feb 2006 13:45:07 GMT bensch [6981] * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/importer/height_map.h (modified) * trunk/src/lib/graphics/importer/media_container.h (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/gui/gtk_gui/gui.h (modified) * trunk/src/lib/gui/gtk_gui/gui_audio.h (modified) * trunk/src/lib/gui/gtk_gui/gui_banner.h (modified) * trunk/src/lib/gui/gtk_gui/gui_exec.h (modified) * trunk/src/lib/gui/gtk_gui/gui_flags.h (modified) * trunk/src/lib/gui/gtk_gui/gui_keys.h (modified) * trunk/src/lib/gui/gtk_gui/gui_update.h (modified) * trunk/src/lib/gui/gtk_gui/gui_video.h (modified) * trunk/src/lib/network/connection_monitor.h (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/data_stream.h (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_protocol.h (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/sound/ogg_player.h (modified) * trunk/src/lib/sound/sound_buffer.h (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/subprojects/framework.h (modified) * trunk/src/subprojects/network/network_unit_test.h (modified) * trunk/src/subprojects/network/read_sync.h (modified) * trunk/src/subprojects/network/simple_sync.h (modified) * trunk/src/subprojects/network/write_sync.h (modified) * trunk/src/util/loading/game_loader.h (modified) * trunk/src/util/loading/load_param.h (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.h (modified) * trunk/src/world_entities/recorder.h (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) trunk: some virtuals Mon, 30 Jan 2006 22:03:30 GMT patrick [6874] * 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/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/story_entities/story_def.h (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) trunk: the menu control better implemented Mon, 30 Jan 2006 10:22:25 GMT patrick [6862] * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/util/loading/game_loader.cc (modified) * trunk/src/util/loading/game_loader.h (modified) trunk: the game now always jumps back to the menu Mon, 30 Jan 2006 04:24:12 GMT bensch [6859] * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/util/loading/resource_manager.cc (modified) trunk: error-correction Mon, 30 Jan 2006 02:51:42 GMT patrick [6854] * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/loading/game_loader.cc (modified) trunk: the menu now works Thu, 26 Jan 2006 00:55:40 GMT bensch [6756] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/environments/water.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/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) trunk: Burst Particles 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 Tue, 24 Jan 2006 13:52:25 GMT bensch [6671] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/ammo_container.h (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) WeaponManger now handles Ammo. If a Weapon has NO ammo then the Ammo ... Tue, 24 Jan 2006 10:23:53 GMT bensch [6664] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) trunk: small fix in resource/ammos 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 Sun, 22 Jan 2006 13:22:48 GMT bensch [6651] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) orxonox/trunk: copy Resources from the ResourceManger (this is not as ... Sat, 21 Jan 2006 18:16:30 GMT bensch [6650] * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) trunk: cache bools Sat, 21 Jan 2006 18:13:13 GMT bensch [6649] * trunk/src/util/loading/resource_manager.h (modified) trunk: resourceManager::resourceCount(); Sat, 21 Jan 2006 18:09:02 GMT bensch [6648] * trunk/src/lib/util/substring.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) orxonox/trunk: built two new functions for the NETWORK precache ... Sat, 21 Jan 2006 17:01:43 GMT bensch [6647] * trunk/src/util/loading/resource_manager.cc (modified) trunk: doxygen Sat, 21 Jan 2006 16:48:00 GMT bensch [6646] * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) trunk: ResourceManeger names Sat, 21 Jan 2006 15:56:43 GMT bensch [6645] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/multi_type.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) * trunk/src/world_entities/environments/water.cc (modified) orxonox/trunk: totally remastered the ResourceManager. Now it takes ... Sat, 21 Jan 2006 13:32:04 GMT bensch [6642] * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) trunk: ResourceManager now has Vectors instead of Lists Sat, 21 Jan 2006 02:18:55 GMT bensch [6641] * trunk/src/util/loading/resource_manager.cc (modified) trunk: ResourceManager: caching should work Sat, 21 Jan 2006 02:13:27 GMT bensch [6640] * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) trunk: ResourceManager: make the ResourceManager more modular Sat, 21 Jan 2006 00:05:05 GMT bensch [6633] * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) trunk: some minors Thu, 19 Jan 2006 11:27:45 GMT bensch [6616] * 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/math/curve.h (modified) * trunk/src/lib/math/quaternion.cc (copied) * trunk/src/lib/math/quaternion.h (copied) * trunk/src/lib/math/vector.cc (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/math/vector2D.h (modified) * trunk/src/lib/physics/physics_interface.h (modified) * trunk/src/util/animation/animation3d.h (modified) orxonox/trunk: taken the quaternion outside of Vector.cc to ... Thu, 19 Jan 2006 00:51:00 GMT bensch [6613] * trunk/src/util/loading/load_param.cc (modified) * trunk/src/util/loading/load_param.h (modified) orxonox/trunk: better LoadParam Tue, 17 Jan 2006 21:01:07 GMT bensch [6512] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/light.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.h (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/lib/particles/particle_engine.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/physics/fields/field.h (modified) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/gravity.h (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_engine.h (modified) * trunk/src/proto/proto_world_entity.cc (modified) * trunk/src/proto/proto_world_entity.h (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign.h (modified) * trunk/src/story_entities/campaign_data.h (modified) * trunk/src/story_entities/dedicated_server_world.cc (modified) * trunk/src/story_entities/dedicated_server_world.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/story_entities/single_player_world.h (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environment.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.h (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.h (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.h (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/bomb.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.h (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/cannon.h (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/crosshair.h (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/test_gun.h (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/turret.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: loadParams is now virtual. ALL THE CLASSES HAVE TO ... Wed, 11 Jan 2006 20:58:22 GMT patrick [6498] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/multi_player_world_data.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the network branche into the trunk Wed, 11 Jan 2006 11:00:06 GMT bensch [6468] * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) trunk: added localPlayer and SkyBox to state Wed, 11 Jan 2006 10:46:52 GMT bensch [6467] * trunk/src/lib/graphics/importer/grid.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager ... Sun, 08 Jan 2006 23:05:57 GMT bensch [6446] * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/grid.cc (copied) * trunk/src/lib/graphics/importer/grid.h (copied) * trunk/src/util/hud.cc (modified) orxonox/trunk: added grid class Sun, 08 Jan 2006 21:59:21 GMT bensch [6445] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) trunk: bars are nicer now Sun, 08 Jan 2006 16:44:04 GMT bensch [6443] * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.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/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) huge pipeline Sun, 08 Jan 2006 16:19:39 GMT bensch [6442] * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.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/weapons/weapon_manager.h (modified) Gui Shows weapons (simple) Sun, 08 Jan 2006 15:02:30 GMT bensch [6441] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.h (modified) orxonox/trunk: the Hud now scales the Widgets itself Sun, 08 Jan 2006 14:20:00 GMT bensch [6440] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: now the Widgets are only rendered within the HUD Sun, 08 Jan 2006 12:51:55 GMT bensch [6438] * trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.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: widget war 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: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 ... 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 ... Sat, 17 Dec 2005 17:52:57 GMT bensch [6152] * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/story_entities/world.cc (modified) * trunk/src/story_entities/world.h (modified) * trunk/src/util/loading/game_loader.cc (modified) * trunk/src/util/loading/game_loader.h (modified) orxonox/trunk: some work in the loading process of worlds Sat, 17 Dec 2005 17:08:28 GMT bensch [6151] * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/story_entities/world.cc (modified) * trunk/src/story_entities/world.h (modified) * trunk/src/util/loading/game_loader.cc (modified) trunk: more world cleanup Sat, 17 Dec 2005 16:56:25 GMT bensch [6150] * trunk/src/story_entities/debug_world.cc (copied) * trunk/src/story_entities/debug_world.h (copied) * trunk/src/story_entities/world.cc (modified) * trunk/src/story_entities/world.h (modified) * trunk/src/util/loading/game_loader.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) orxonox/trunk: cleanup of the world begin 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 ...