# # ChangeLog for trunk/src/util in orxonox.OLD # # Generated by Trac 1.0.9 # Dec 27, 2024, 9:57:17 PM Sun, 29 Apr 2007 16:51:28 GMT bknecht [10643] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/bsp/bsp_manager.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/environments/rotor.cc (modified) * trunk/src/world_entities/npcs/mover.cc (modified) * trunk/src/world_entities/npcs/mover.h (modified) improvements by landauf on bsp, rotor and wireframe (does build, ... Wed, 04 Apr 2007 10:13:53 GMT bknecht [10618] * trunk (modified) * trunk/src/Makefile.am (modified) * trunk/src/ability.cc (deleted) * trunk/src/ability.h (deleted) * trunk/src/ai (modified) * trunk/src/ai/swarm_attack.cc (modified) * trunk/src/ai/swarm_gorel.cc (modified) * trunk/src/ai/swarm_module.h (modified) * trunk/src/ai/swarm_wait.cc (modified) * trunk/src/defs/alincl.h (deleted) * trunk/src/defs/comincl.h (deleted) * trunk/src/defs/glincl.h (deleted) * trunk/src/defs/globals.h (deleted) * trunk/src/defs/message_structures.h (deleted) * trunk/src/defs/orxonox_globals.h (copied) * trunk/src/defs/stdincl.h (deleted) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_reaction (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/glincl.h (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/bsp/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp/bsp_manager.h (modified) * trunk/src/lib/graphics/light.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/gui/qt/gui_audio.cc (modified) * trunk/src/lib/gui/qt/gui_control.cc (modified) * trunk/src/lib/gui/qt/gui_general.cc (modified) * trunk/src/lib/gui/qt/gui_video.cc (modified) * trunk/src/lib/lang (modified) * trunk/src/lib/math/curve.h (modified) * trunk/src/lib/parser/cmdline_parser (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/script_engine (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/account.cc (deleted) * trunk/src/lib/script_engine/example.cc (deleted) * trunk/src/lib/script_engine/lunartest2.lua (deleted) * trunk/src/lib/script_engine/object.cc (deleted) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/sound/Makefile.am (modified) * trunk/src/lib/sound/alincl.h (copied) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/ogg_player.h (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_engine.h (modified) * trunk/src/lib/util (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/debug_buffer.cc (modified) * trunk/src/lib/util/filesys/net_link.cc (modified) * trunk/src/lib/util/filesys/net_link.h (modified) * trunk/src/lib/util/list.h (deleted) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/lib/util/loading/game_loader.h (modified) * trunk/src/lib/util/threading.cc (deleted) * trunk/src/lib/util/threading.h (deleted) * trunk/src/lib/util/threads (copied) * trunk/src/lib/util/threads/mutex.h (copied) * trunk/src/lib/util/threads/mutex_locker.h (copied) * trunk/src/lib/util/threads/thread.cc (copied) * trunk/src/lib/util/threads/thread.h (copied) * trunk/src/lib/util/threads/threadincl.h (copied) * trunk/src/lib/util/threads/threading.cc (copied) * trunk/src/lib/util/threads/threading.h (copied) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/subprojects/benchmark.cc (deleted) * trunk/src/subprojects/benchmark.h (deleted) * trunk/src/subprojects/collision_detection/collision_detection.cc (modified) * trunk/src/subprojects/particles/Makefile.am (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/animation/animation.h (modified) * trunk/src/util/animation/animation3d.cc (modified) * trunk/src/util/animation/animation3d.h (modified) * trunk/src/util/animation/t_animation.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/track/pilot_node.cc (deleted) * trunk/src/util/track/pilot_node.h (deleted) * trunk/src/util/track/track.cc (modified) * trunk/src/util/track/track_manager.cc (deleted) * trunk/src/util/track/track_manager.h (deleted) * trunk/src/util/track/track_node.cc (deleted) * trunk/src/util/track/track_node.h (deleted) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/blackscreen.cc (deleted) * trunk/src/world_entities/blackscreen.h (deleted) * trunk/src/world_entities/bsp_entity.cc (deleted) * trunk/src/world_entities/bsp_entity.h (deleted) * trunk/src/world_entities/camera.cc (deleted) * trunk/src/world_entities/camera.h (deleted) * trunk/src/world_entities/cameraman.cc (deleted) * trunk/src/world_entities/cameraman.h (deleted) * trunk/src/world_entities/character_attributes.cc (deleted) * trunk/src/world_entities/character_attributes.h (deleted) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/blink.cc (modified) * trunk/src/world_entities/effects/trail.cc (modified) * trunk/src/world_entities/effects/wobblegrid.cc (modified) * trunk/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * trunk/src/world_entities/environment.cc (deleted) * trunk/src/world_entities/environment.h (deleted) * trunk/src/world_entities/environments/bsp_entity.cc (copied) * trunk/src/world_entities/environments/bsp_entity.h (copied) * trunk/src/world_entities/environments/environment.cc (copied) * trunk/src/world_entities/environments/environment.h (copied) * trunk/src/world_entities/environments/planet.cc (copied) * trunk/src/world_entities/environments/planet.h (copied) * trunk/src/world_entities/environments/skybox.cc (copied) * trunk/src/world_entities/environments/skybox.h (copied) * trunk/src/world_entities/environments/skydome.cc (copied) * trunk/src/world_entities/environments/skydome.h (copied) * trunk/src/world_entities/environments/skysphere.cc (copied) * trunk/src/world_entities/environments/skysphere.h (copied) * trunk/src/world_entities/environments/terrain.cc (copied) * trunk/src/world_entities/environments/terrain.h (copied) * trunk/src/world_entities/extendable.h (modified) * trunk/src/world_entities/items/power_ups (copied) * trunk/src/world_entities/items/power_ups/laser_power_up.cc (copied) * trunk/src/world_entities/items/power_ups/laser_power_up.h (copied) * trunk/src/world_entities/items/power_ups/param_power_up.cc (copied) * trunk/src/world_entities/items/power_ups/param_power_up.h (copied) * trunk/src/world_entities/items/power_ups/power_up.cc (copied) * trunk/src/world_entities/items/power_ups/power_up.h (copied) * trunk/src/world_entities/items/power_ups/turret_power_up.cc (copied) * trunk/src/world_entities/items/power_ups/turret_power_up.h (copied) * trunk/src/world_entities/items/power_ups/weapon_power_up.cc (copied) * trunk/src/world_entities/items/power_ups/weapon_power_up.h (copied) * trunk/src/world_entities/mount_point.cc (deleted) * trunk/src/world_entities/mount_point.h (deleted) * trunk/src/world_entities/movie_entity.cc (deleted) * trunk/src/world_entities/movie_entity.h (deleted) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/mover.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/particles/sprite_particles.cc (modified) * trunk/src/world_entities/planet.cc (deleted) * trunk/src/world_entities/planet.h (deleted) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups (deleted) * trunk/src/world_entities/projectiles/hbolt.cc (modified) * trunk/src/world_entities/projectiles/hbolt.h (modified) * trunk/src/world_entities/projectiles/lbolt.cc (modified) * trunk/src/world_entities/projectiles/lbolt.h (modified) * trunk/src/world_entities/projectiles/mbolt.cc (modified) * trunk/src/world_entities/projectiles/projectile_weapon.h (modified) * trunk/src/world_entities/projectiles/swarm_projectile.cc (modified) * trunk/src/world_entities/projectiles/swarm_projectile.h (modified) * trunk/src/world_entities/questGUI/quest.cc (modified) * trunk/src/world_entities/questGUI/quest.h (modified) * trunk/src/world_entities/questGUI/quest_gui.cc (modified) * trunk/src/world_entities/questGUI/quest_gui.h (modified) * trunk/src/world_entities/recorder.cc (deleted) * trunk/src/world_entities/recorder.h (deleted) * trunk/src/world_entities/satellite.cc (deleted) * trunk/src/world_entities/satellite.h (deleted) * trunk/src/world_entities/script_trigger.cc (deleted) * trunk/src/world_entities/script_trigger.h (deleted) * trunk/src/world_entities/scrolling_screen.cc (deleted) * trunk/src/world_entities/scrolling_screen.h (deleted) * trunk/src/world_entities/skybox.cc (deleted) * trunk/src/world_entities/skybox.h (deleted) * trunk/src/world_entities/skydome.cc (deleted) * trunk/src/world_entities/skydome.h (deleted) * trunk/src/world_entities/skysphere.cc (deleted) * trunk/src/world_entities/skysphere.h (deleted) * trunk/src/world_entities/sound_entity.cc (deleted) * trunk/src/world_entities/sound_entity.h (deleted) * trunk/src/world_entities/space_ships/human_scout.cc (deleted) * trunk/src/world_entities/space_ships/human_scout.h (deleted) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/spawning_point.cc (deleted) * trunk/src/world_entities/spawning_point.h (deleted) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/spectator.h (modified) * trunk/src/world_entities/terrain.cc (deleted) * trunk/src/world_entities/terrain.h (deleted) * trunk/src/world_entities/test_entity.cc (deleted) * trunk/src/world_entities/test_entity2.cc (deleted) * trunk/src/world_entities/test_entity2.h (deleted) * trunk/src/world_entities/tools (copied) * trunk/src/world_entities/tools/blackscreen.cc (copied) * trunk/src/world_entities/tools/blackscreen.h (copied) * trunk/src/world_entities/tools/camera.cc (copied) * trunk/src/world_entities/tools/camera.h (copied) * trunk/src/world_entities/tools/cameraman.cc (copied) * trunk/src/world_entities/tools/cameraman.h (copied) * trunk/src/world_entities/tools/mount_point.cc (copied) * trunk/src/world_entities/tools/mount_point.h (copied) * trunk/src/world_entities/tools/movie_entity.cc (copied) * trunk/src/world_entities/tools/movie_entity.h (copied) * trunk/src/world_entities/tools/recorder.cc (copied) * trunk/src/world_entities/tools/recorder.h (copied) * trunk/src/world_entities/tools/script_trigger.cc (copied) * trunk/src/world_entities/tools/script_trigger.h (copied) * trunk/src/world_entities/tools/scrolling_screen.cc (copied) * trunk/src/world_entities/tools/scrolling_screen.h (copied) * trunk/src/world_entities/tools/sound_entity.cc (copied) * trunk/src/world_entities/tools/sound_entity.h (copied) * trunk/src/world_entities/tools/spawning_point.cc (copied) * trunk/src/world_entities/tools/spawning_point.h (copied) * trunk/src/world_entities/weapons/acid_launcher.cc (modified) * trunk/src/world_entities/weapons/acid_launcher.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/boomerang_gun.cc (modified) * trunk/src/world_entities/weapons/heavy_blaster.cc (modified) * trunk/src/world_entities/weapons/light_blaster.cc (modified) * trunk/src/world_entities/weapons/medium_blaster.cc (modified) * trunk/src/world_entities/weapons/spike_launcher.cc (deleted) * trunk/src/world_entities/weapons/spike_launcher.h (deleted) * trunk/src/world_entities/weapons/spike_thrower.cc (modified) * trunk/src/world_entities/weapons/swarm_launcher.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weather_effects/cloud_effect.h (modified) * trunk/src/world_entities/weather_effects/lense_flare.cc (modified) * trunk/src/world_entities/weather_effects/lightning_effect.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) merged cleanup into trunk (only improvements) Tue, 30 Jan 2007 20:17:21 GMT patrick [10516] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) * trunk/src/world_entities/particles/particle_system.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/space_ships/human_scout.cc (copied) * trunk/src/world_entities/space_ships/human_scout.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/weapons/acid_launcher.cc (modified) * trunk/src/world_entities/weapons/heavy_blaster.cc (modified) * trunk/src/world_entities/weapons/heavy_blaster.h (modified) * trunk/src/world_entities/weapons/light_blaster.cc (modified) * trunk/src/world_entities/weapons/light_blaster.h (modified) * trunk/src/world_entities/weapons/medium_blaster.cc (modified) * trunk/src/world_entities/weapons/medium_blaster.h (modified) * trunk/src/world_entities/weapons/spike_thrower.cc (modified) * trunk/src/world_entities/weapons/swarm_launcher.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) merged playability back to trunk Tue, 30 Jan 2007 19:01:19 GMT bknecht [10512] * trunk/src/util/track/track.cc (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) some changes so the vertical scroller will work better Tue, 30 Jan 2007 10:47:37 GMT snellen [10500] * trunk/src/util/track/track.cc (modified) fixed initalisation of pause in track... spaceships arbitrarily ... Tue, 30 Jan 2007 10:10:09 GMT bknecht [10498] * trunk/src/util/track/track.cc (modified) * trunk/src/util/track/track.h (modified) * trunk/src/world_entities/cameraman.cc (modified) * trunk/src/world_entities/cameraman.h (modified) * trunk/src/world_entities/npcs/npc.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) use pauseCamera in scripts to pause the track of the camera. this ... Sun, 28 Jan 2007 17:35:43 GMT patrick [10454] * trunk/src/util/track/track.cc (modified) * trunk/src/util/track/track.h (modified) track now got constant speed Sun, 28 Jan 2007 16:46:16 GMT patrick [10449] * trunk/src/util/hud.cc (modified) * trunk/src/util/track/track.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/npcs/npc.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) drawing track is now loadable, merge from branche playability Sun, 28 Jan 2007 00:03:34 GMT patrick [10424] * trunk/src/util/track/track.cc (modified) * trunk/src/world_entities/blackscreen.cc (modified) * trunk/src/world_entities/blackscreen.h (modified) * trunk/src/world_entities/cameraman.cc (modified) * trunk/src/world_entities/cameraman.h (modified) * trunk/src/world_entities/planet.cc (modified) more on planet atmos, fading and track Sat, 27 Jan 2007 22:38:50 GMT patrick [10420] * trunk/src/lib/network/monitor/network_stats_widget.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * trunk/src/world_entities/projectiles/acid_splash.cc (modified) * trunk/src/world_entities/projectiles/mbolt.cc (modified) * trunk/src/world_entities/projectiles/swarm_projectile.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/test_entity2.cc (modified) maps => textures Sat, 27 Jan 2007 18:48:48 GMT patrick [10412] * trunk/src/util/track/track.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) fixed the translation bug and space ship drawing Sat, 27 Jan 2007 18:30:45 GMT patrick [10410] * trunk/src/util/track/track.cc (modified) * trunk/src/util/track/track.h (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) the track now is been drawn for the camera Fri, 26 Jan 2007 21:23:35 GMT bknecht [10397] * trunk/src/util/track/track.cc (modified) changed a minor mistake. track should work now Fri, 26 Jan 2007 17:06:04 GMT bknecht [10385] * trunk/src/util/track/track.cc (modified) * trunk/src/util/track/track.h (modified) you're now able to set the track's mode Fri, 26 Jan 2007 09:58:31 GMT patrick [10379] * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/game_world_data.h (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/blackscreen.cc (copied) * trunk/src/world_entities/blackscreen.h (copied) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/cameraman.cc (copied) * trunk/src/world_entities/cameraman.h (copied) * trunk/src/world_entities/targets.h (copied) * trunk/src/world_entities/test_entity.h (modified) merged branche camera to trunk. resolved many conflicts as in the ... Thu, 25 Jan 2007 13:18:07 GMT patrick [10368] * trunk (modified) * trunk/ChangeLog (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/gui/gl/glgui_bar.cc (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/curve.cc (modified) * trunk/src/lib/math/curve.h (modified) * trunk/src/lib/math/spline.cc (copied) * trunk/src/lib/math/spline.h (copied) * trunk/src/lib/util/loading/fast_factory.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/state.h (modified) * trunk/src/util/track/track.cc (copied) * trunk/src/util/track/track.h (copied) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/util/track/track_node.cc (modified) * trunk/src/util/track/track_node.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/effects/trail.cc (copied) * trunk/src/world_entities/effects/trail.h (copied) * trunk/src/world_entities/effects/wobblegrid.cc (copied) * trunk/src/world_entities/effects/wobblegrid.h (copied) * trunk/src/world_entities/elements/glgui_energywidget.h (modified) * trunk/src/world_entities/elements/glgui_energywidgetvertical.cc (copied) * trunk/src/world_entities/elements/glgui_energywidgetvertical.h (copied) * trunk/src/world_entities/elements/glgui_radar.cc (modified) * trunk/src/world_entities/particles/emitter_node.cc (copied) * trunk/src/world_entities/particles/emitter_node.h (copied) * trunk/src/world_entities/particles/particle_emitter.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/projectiles/acid_splash.cc (copied) * trunk/src/world_entities/projectiles/acid_splash.h (copied) * trunk/src/world_entities/projectiles/hbolt.cc (copied) * trunk/src/world_entities/projectiles/hbolt.h (copied) * trunk/src/world_entities/projectiles/lbolt.cc (copied) * trunk/src/world_entities/projectiles/lbolt.h (copied) * trunk/src/world_entities/projectiles/mbolt.cc (copied) * trunk/src/world_entities/projectiles/mbolt.h (copied) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/projectile_weapon.cc (copied) * trunk/src/world_entities/projectiles/projectile_weapon.h (copied) * trunk/src/world_entities/projectiles/spike.cc (copied) * trunk/src/world_entities/projectiles/spike.h (copied) * trunk/src/world_entities/projectiles/spike_ball.cc (copied) * trunk/src/world_entities/projectiles/spike_ball.h (copied) * trunk/src/world_entities/projectiles/swarm_projectile.cc (copied) * trunk/src/world_entities/projectiles/swarm_projectile.h (copied) * trunk/src/world_entities/sound_entity.cc (modified) * trunk/src/world_entities/sound_entity.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity2.cc (copied) * trunk/src/world_entities/test_entity2.h (copied) * trunk/src/world_entities/weapons/acid_launcher.cc (copied) * trunk/src/world_entities/weapons/acid_launcher.h (copied) * trunk/src/world_entities/weapons/heavy_blaster.cc (copied) * trunk/src/world_entities/weapons/heavy_blaster.h (copied) * trunk/src/world_entities/weapons/light_blaster.cc (copied) * trunk/src/world_entities/weapons/light_blaster.h (copied) * trunk/src/world_entities/weapons/medium_blaster.cc (copied) * trunk/src/world_entities/weapons/medium_blaster.h (copied) * trunk/src/world_entities/weapons/spike_launcher.cc (copied) * trunk/src/world_entities/weapons/spike_launcher.h (copied) * trunk/src/world_entities/weapons/spike_thrower.cc (copied) * trunk/src/world_entities/weapons/spike_thrower.h (copied) * trunk/src/world_entities/weapons/swarm_launcher.cc (copied) * trunk/src/world_entities/weapons/swarm_launcher.h (copied) * 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) merged the branche playability into the trunk Wed, 24 Jan 2007 01:34:09 GMT patrick [10320] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/network/monitor/network_stats_widget.cc (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/world_entities/elements/text_element.cc (modified) fixed some more problems with the new repos Tue, 19 Dec 2006 22:55:26 GMT patrick [10114] * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id_DEPRECATED.h (deleted) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/resource_md2.cc (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/shader_data.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/object_list.cc (modified) * trunk/src/lib/lang/object_list.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/peer_info.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid_list.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_classid_list.h (copied) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/point_gravity.cc (modified) * trunk/src/lib/physics/fields/twirl.cc (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/elements/image_entity.cc (modified) * trunk/src/world_entities/elements/text_element.cc (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environments/building.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/network_turret.cc (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/particles/box_emitter.cc (modified) * trunk/src/world_entities/particles/dot_emitter.cc (modified) * trunk/src/world_entities/particles/dot_particles.cc (modified) * trunk/src/world_entities/particles/model_particles.cc (modified) * trunk/src/world_entities/particles/plane_emitter.cc (modified) * trunk/src/world_entities/particles/spark_particles.cc (modified) * trunk/src/world_entities/particles/sprite_particles.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/cruizer.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/boomerang_gun.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weather_effects/cloud_effect.cc (modified) * trunk/src/world_entities/weather_effects/fog_effect.cc (modified) * trunk/src/world_entities/weather_effects/lense_flare.cc (modified) * trunk/src/world_entities/weather_effects/lightning_effect.cc (modified) * trunk/src/world_entities/weather_effects/rain_effect.cc (modified) * trunk/src/world_entities/weather_effects/snow_effect.cc (modified) * trunk/src/world_entities/weather_effects/volfog_effect.cc (modified) merged network back to trunk Tue, 03 Oct 2006 13:23:56 GMT bensch [9877] * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/network/network_log.cc (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/world_entities/terrain.cc (modified) orxonox compiles in Windows again... but it does not run anymore Mon, 02 Oct 2006 22:19:30 GMT bensch [9869] * trunk/ChangeLog (modified) * trunk/IDEAS (modified) * trunk/MakeMakefile (deleted) * trunk/configure.ac (modified) * trunk/src/Makefile.am (modified) * trunk/src/defs/class_id.h (deleted) * trunk/src/defs/class_id_DEPRECATED.h (copied) * trunk/src/defs/debug.h (deleted) * trunk/src/defs/include_paths.am (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (modified) * trunk/src/lib/collision_detection/aabb.h (modified) * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/collision_detection/aabb_tree_node.h (modified) * trunk/src/lib/collision_detection/bounding_sphere.cc (modified) * trunk/src/lib/collision_detection/bounding_sphere.h (modified) * trunk/src/lib/collision_detection/bounding_volume.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.h (modified) * trunk/src/lib/collision_detection/bv_tree.cc (modified) * trunk/src/lib/collision_detection/bv_tree.h (modified) * trunk/src/lib/collision_detection/bv_tree_node.cc (modified) * trunk/src/lib/collision_detection/bv_tree_node.h (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/cd_engine.h (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/collision_detection/obb.h (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.h (modified) * trunk/src/lib/collision_reaction/collision.cc (modified) * trunk/src/lib/collision_reaction/collision.h (modified) * trunk/src/lib/collision_reaction/collision_event.cc (modified) * trunk/src/lib/collision_reaction/collision_event.h (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.h (modified) * trunk/src/lib/collision_reaction/collision_reaction.cc (modified) * trunk/src/lib/collision_reaction/collision_reaction.h (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.h (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.h (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/event/event_listener.cc (modified) * trunk/src/lib/event/event_listener.h (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/event/key_mapper.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects (deleted) * trunk/src/lib/graphics/graphics_effect.cc (copied) * trunk/src/lib/graphics/graphics_effect.h (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/graphics/importer/height_map.h (modified) * trunk/src/lib/graphics/importer/interactive_model.cc (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/graphics/importer/md2/resource_md2.cc (copied) * trunk/src/lib/graphics/importer/md2/resource_md2.h (copied) * trunk/src/lib/graphics/importer/md3/md3_model.h (modified) * trunk/src/lib/graphics/importer/media_container.cc (modified) * trunk/src/lib/graphics/importer/media_container.h (modified) * trunk/src/lib/graphics/importer/model.cc (modified) * trunk/src/lib/graphics/importer/model.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/lib/graphics/importer/objModel.cc (modified) * trunk/src/lib/graphics/importer/objModel.h (modified) * trunk/src/lib/graphics/importer/resource_obj.cc (copied) * trunk/src/lib/graphics/importer/resource_obj.h (copied) * trunk/src/lib/graphics/importer/resource_texture.cc (copied) * trunk/src/lib/graphics/importer/resource_texture.h (copied) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.h (modified) * trunk/src/lib/graphics/importer/static_model_data.cc (copied) * trunk/src/lib/graphics/importer/static_model_data.h (copied) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture.h (modified) * trunk/src/lib/graphics/importer/texture_data.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.h (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/light.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/lib/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.h (modified) * trunk/src/lib/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/render2D/render_2d.h (modified) * trunk/src/lib/graphics/resource_shader.cc (copied) * trunk/src/lib/graphics/resource_shader.h (copied) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/shader.h (modified) * trunk/src/lib/graphics/shader_data.cc (copied) * trunk/src/lib/graphics/shader_data.h (copied) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.h (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.h (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.cc (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.h (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/graphics/text_engine/font.h (modified) * trunk/src/lib/graphics/text_engine/font_data.h (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.h (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.h (modified) * trunk/src/lib/graphics/text_engine/resource_font.cc (copied) * trunk/src/lib/graphics/text_engine/resource_font.h (copied) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/graphics/text_engine/text_engine.h (modified) * trunk/src/lib/gui/gl/glgui_bar.cc (modified) * trunk/src/lib/gui/gl/glgui_bar.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_box.h (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_colorselector.h (modified) * trunk/src/lib/gui/gl/glgui_container.cc (modified) * trunk/src/lib/gui/gl/glgui_container.h (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.h (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.cc (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.h (modified) * trunk/src/lib/gui/gl/glgui_frame.cc (modified) * trunk/src/lib/gui/gl/glgui_frame.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_image.cc (modified) * trunk/src/lib/gui/gl/glgui_image.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_mainwidget.cc (modified) * trunk/src/lib/gui/gl/glgui_mainwidget.h (modified) * trunk/src/lib/gui/gl/glgui_menu.cc (modified) * trunk/src/lib/gui/gl/glgui_menu.h (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_table.cc (modified) * trunk/src/lib/gui/gl/glgui_table.h (modified) * trunk/src/lib/gui/gl/glgui_text.cc (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/lib/gui/gl/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl/glgui_textfield.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/glgui_window.cc (modified) * trunk/src/lib/gui/gl/glgui_window.h (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified) * trunk/src/lib/gui/gui.cc (modified) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/lang/Makefile.am (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/class_id.cc (copied) * trunk/src/lib/lang/class_id.h (copied) * trunk/src/lib/lang/class_list.cc (deleted) * trunk/src/lib/lang/class_list.h (deleted) * trunk/src/lib/lang/new_class_id.cc (deleted) * trunk/src/lib/lang/new_class_id.h (deleted) * trunk/src/lib/lang/new_object_list.cc (deleted) * trunk/src/lib/lang/new_object_list.h (deleted) * trunk/src/lib/lang/object_list.cc (copied) * trunk/src/lib/lang/object_list.h (copied) * trunk/src/lib/lang/test_object_list.cc (deleted) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/data_stream.cc (modified) * trunk/src/lib/network/data_stream.h (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/monitor/connection_monitor.cc (modified) * trunk/src/lib/network/monitor/connection_monitor.h (modified) * trunk/src/lib/network/monitor/network_monitor.cc (modified) * trunk/src/lib/network/monitor/network_monitor.h (modified) * trunk/src/lib/network/monitor/network_stats_widget.cc (modified) * trunk/src/lib/network/monitor/network_stats_widget.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_log.cc (modified) * trunk/src/lib/network/network_log.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_protocol.cc (modified) * trunk/src/lib/network/network_protocol.h (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/network_settings.h (modified) * trunk/src/lib/network/proxy/proxy_control.cc (modified) * trunk/src/lib/network/proxy/proxy_control.h (modified) * trunk/src/lib/network/server_socket.cc (modified) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/lib/network/tcp_server_socket.cc (modified) * trunk/src/lib/network/tcp_server_socket.h (modified) * trunk/src/lib/network/tcp_socket.cc (modified) * trunk/src/lib/network/tcp_socket.h (modified) * trunk/src/lib/network/udp_broadcast.cc (modified) * trunk/src/lib/network/udp_broadcast.h (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.h (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/parser/Makefile.am (modified) * trunk/src/lib/parser/cmdline_parser/Makefile.am (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.h (modified) * trunk/src/lib/parser/ini_parser/Makefile.am (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.h (modified) * trunk/src/lib/parser/preferences/Makefile.am (modified) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h (modified) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.h (modified) * trunk/src/lib/parser/preferences/preferences.cc (copied) * trunk/src/lib/parser/preferences/preferences.h (copied) * trunk/src/lib/particles (deleted) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/physics/fields/field.h (modified) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/gravity.h (modified) * trunk/src/lib/physics/fields/point_gravity.cc (modified) * trunk/src/lib/physics/fields/point_gravity.h (modified) * trunk/src/lib/physics/fields/twirl.cc (modified) * trunk/src/lib/physics/fields/twirl.h (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_connection.h (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/physics/physics_engine.h (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/physics/physics_interface.h (modified) * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/executor_lua_state.cc (copied) * trunk/src/lib/script_engine/executor_lua_state.h (copied) * trunk/src/lib/script_engine/lunar.h (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.cc (modified) * trunk/src/lib/script_engine/script_class.h (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/script_engine/script_manager.h (modified) * trunk/src/lib/script_engine/script_method.cc (modified) * trunk/src/lib/script_engine/script_method.h (modified) * trunk/src/lib/shell/Makefile.am (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell.h (modified) * trunk/src/lib/shell/shell_buffer.cc (deleted) * trunk/src/lib/shell/shell_buffer.h (deleted) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command.h (modified) * trunk/src/lib/shell/shell_command_class.cc (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/shell/shell_completion.h (modified) * trunk/src/lib/shell/shell_completion_plugin.cc (modified) * trunk/src/lib/shell/shell_input.cc (modified) * trunk/src/lib/shell/shell_input.h (modified) * trunk/src/lib/shell/some_shell_commands.cc (modified) * trunk/src/lib/sound/Makefile.am (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/ogg_player.h (modified) * trunk/src/lib/sound/resource_sound_buffer.cc (copied) * trunk/src/lib/sound/resource_sound_buffer.h (copied) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/sound/sound_buffer.h (modified) * trunk/src/lib/sound/sound_buffer_data.cc (copied) * trunk/src/lib/sound/sound_buffer_data.h (copied) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_engine.h (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/lib/util/count_pointer.h (modified) * trunk/src/lib/util/debug.h (copied) * trunk/src/lib/util/debug_buffer.cc (copied) * trunk/src/lib/util/debug_buffer.h (copied) * trunk/src/lib/util/executor/executor.cc (deleted) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_const_member.h (copied) * trunk/src/lib/util/executor/executor_functional.cc (deleted) * trunk/src/lib/util/executor/executor_functional.h (deleted) * trunk/src/lib/util/executor/executor_generic.h (copied) * trunk/src/lib/util/executor/executor_lua.cc (deleted) * trunk/src/lib/util/executor/executor_lua.h (deleted) * trunk/src/lib/util/executor/executor_member.h (copied) * trunk/src/lib/util/executor/executor_static.h (copied) * trunk/src/lib/util/executor/executor_substring.cc (copied) * trunk/src/lib/util/executor/executor_substring.h (copied) * trunk/src/lib/util/executor/executor_xml.h (modified) * trunk/src/lib/util/executor/functor_const_member.h (copied) * trunk/src/lib/util/executor/functor_generic.h (copied) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/executor/functor_member.h (copied) * trunk/src/lib/util/executor/functor_static.h (copied) * trunk/src/lib/util/filesys/directory.cc (modified) * trunk/src/lib/util/filesys/directory.h (modified) * trunk/src/lib/util/filesys/file.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.h (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/factory.h (modified) * trunk/src/lib/util/loading/fast_factory.cc (copied) * trunk/src/lib/util/loading/fast_factory.h (copied) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/lib/util/loading/game_loader.h (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/load_param.h (modified) * trunk/src/lib/util/loading/load_param_class_description.cc (copied) * trunk/src/lib/util/loading/load_param_class_description.h (copied) * trunk/src/lib/util/loading/load_param_description.cc (modified) * trunk/src/lib/util/loading/load_param_description.h (modified) * trunk/src/lib/util/loading/load_param_xml.h (copied) * trunk/src/lib/util/loading/resource.cc (modified) * trunk/src/lib/util/loading/resource.h (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/loading/resource_manager.h (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/multi_type.h (modified) * trunk/src/lib/util/preferences.cc (deleted) * trunk/src/lib/util/preferences.h (deleted) * trunk/src/lib/util/sigslot/signal.h (modified) * trunk/src/lib/util/substring.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/orxonox.h (modified) * trunk/src/proto/proto_class.cc (modified) * trunk/src/proto/proto_class.h (modified) * trunk/src/proto/proto_singleton.cc (modified) * trunk/src/proto/proto_singleton.h (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign.h (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/campaign_data.h (modified) * trunk/src/story_entities/dedicated_server_world.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/game_world_data.h (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/menu/game_menu.h (modified) * trunk/src/story_entities/menu/glgui_imagebutton.cc (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/movie_loader.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/story_entities/single_player_world.h (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/animation/animation.cc (modified) * trunk/src/util/animation/animation.h (modified) * trunk/src/util/animation/animation_player.cc (modified) * trunk/src/util/animation/animation_player.h (modified) * trunk/src/util/fast_factory.cc (deleted) * trunk/src/util/fast_factory.h (deleted) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/kill_target.h (modified) * trunk/src/util/mission_goal.cc (modified) * trunk/src/util/mission_goal.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/util/singleplayer_shootemup.h (modified) * trunk/src/util/track/pilot_node.cc (modified) * trunk/src/util/track/pilot_node.h (modified) * trunk/src/util/track/track_node.cc (modified) * trunk/src/util/track/track_node.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/bsp_entity.h (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/camera.h (modified) * trunk/src/world_entities/character_attributes.cc (modified) * trunk/src/world_entities/character_attributes.h (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/billboard.h (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/effects/explosion.h (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.h (modified) * trunk/src/world_entities/elements/image_entity.cc (modified) * trunk/src/world_entities/elements/image_entity.h (modified) * trunk/src/world_entities/elements/text_element.cc (modified) * trunk/src/world_entities/elements/text_element.h (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environment.h (modified) * trunk/src/world_entities/environments/building.cc (modified) * trunk/src/world_entities/environments/building.h (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/mapped_water.h (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/model_entity.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/extendable.cc (copied) * trunk/src/world_entities/extendable.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.h (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/door.h (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/gate.h (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/network_turret.cc (modified) * trunk/src/world_entities/npcs/network_turret.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc.h (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/npcs/npc_test1.h (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/npcs/repair_station.h (modified) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/npcs/space_turret.h (modified) * trunk/src/world_entities/particles (copied) * trunk/src/world_entities/particles/box_emitter.cc (copied) * trunk/src/world_entities/particles/box_emitter.h (copied) * trunk/src/world_entities/particles/dot_emitter.cc (copied) * trunk/src/world_entities/particles/dot_emitter.h (copied) * trunk/src/world_entities/particles/dot_particles.cc (copied) * trunk/src/world_entities/particles/dot_particles.h (copied) * trunk/src/world_entities/particles/engine (copied) * trunk/src/world_entities/particles/engine/particle_engine.cc (copied) * trunk/src/world_entities/particles/engine/particle_engine.h (copied) * trunk/src/world_entities/particles/model_particles.cc (copied) * trunk/src/world_entities/particles/model_particles.h (copied) * trunk/src/world_entities/particles/particle_emitter.cc (copied) * trunk/src/world_entities/particles/particle_emitter.h (copied) * trunk/src/world_entities/particles/particle_system.cc (copied) * trunk/src/world_entities/particles/particle_system.h (copied) * trunk/src/world_entities/particles/plane_emitter.cc (copied) * trunk/src/world_entities/particles/plane_emitter.h (copied) * trunk/src/world_entities/particles/quick_animation.cc (copied) * trunk/src/world_entities/particles/quick_animation.h (copied) * trunk/src/world_entities/particles/spark_particles.cc (copied) * trunk/src/world_entities/particles/spark_particles.h (copied) * trunk/src/world_entities/particles/sprite_particles.cc (copied) * trunk/src/world_entities/particles/sprite_particles.h (copied) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/planet.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.h (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.h (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.h (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/bomb.h (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.cc (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.h (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/laser.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.h (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/rocket.h (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/recorder.h (modified) * trunk/src/world_entities/satellite.cc (modified) * trunk/src/world_entities/satellite.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/skydome.h (modified) * trunk/src/world_entities/skysphere.cc (modified) * trunk/src/world_entities/skysphere.h (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.h (modified) * trunk/src/world_entities/space_ships/cruizer.cc (modified) * trunk/src/world_entities/space_ships/cruizer.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/spectator.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_system.cc (modified) * trunk/src/world_entities/weapons/aiming_system.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.h (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) * trunk/src/world_entities/weapons/ammo_container.h (modified) * trunk/src/world_entities/weapons/boomerang_gun.cc (modified) * trunk/src/world_entities/weapons/boomerang_gun.h (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/cannon.h (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/crosshair.h (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.h (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.h (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (modified) * trunk/src/world_entities/weapons/laser_cannon.h (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/test_gun.h (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/turret.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) * trunk/src/world_entities/weather_effects (copied) * trunk/src/world_entities/weather_effects/atmospheric_engine.cc (copied) * trunk/src/world_entities/weather_effects/atmospheric_engine.h (copied) * trunk/src/world_entities/weather_effects/cloud_effect.cc (copied) * trunk/src/world_entities/weather_effects/cloud_effect.h (copied) * trunk/src/world_entities/weather_effects/fog_effect.cc (copied) * trunk/src/world_entities/weather_effects/fog_effect.h (copied) * trunk/src/world_entities/weather_effects/lense_flare.cc (copied) * trunk/src/world_entities/weather_effects/lense_flare.h (copied) * trunk/src/world_entities/weather_effects/lightning_effect.cc (copied) * trunk/src/world_entities/weather_effects/lightning_effect.h (copied) * trunk/src/world_entities/weather_effects/rain_effect.cc (copied) * trunk/src/world_entities/weather_effects/rain_effect.h (copied) * trunk/src/world_entities/weather_effects/snow_effect.cc (copied) * trunk/src/world_entities/weather_effects/snow_effect.h (copied) * trunk/src/world_entities/weather_effects/sun_effect.cc (copied) * trunk/src/world_entities/weather_effects/sun_effect.h (copied) * trunk/src/world_entities/weather_effects/volfog_effect.cc (copied) * trunk/src/world_entities/weather_effects/volfog_effect.h (copied) * trunk/src/world_entities/weather_effects/weather_effect.cc (copied) * trunk/src/world_entities/weather_effects/weather_effect.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the new_class_id branche back to the trunk. ... Fri, 04 Aug 2006 21:01:28 GMT bensch [9656] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/BuildLibs.am (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_box.h (modified) * trunk/src/lib/gui/gl/glgui_container.cc (modified) * trunk/src/lib/gui/gl/glgui_container.h (modified) * trunk/src/lib/gui/gl/glgui_defs.h (modified) * trunk/src/lib/gui/gl/glgui_fixedposition_box.cc (copied) * trunk/src/lib/gui/gl/glgui_fixedposition_box.h (copied) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_text.cc (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/README.NETWORK (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/monitor/network_monitor.cc (modified) * trunk/src/lib/network/monitor/network_monitor.h (modified) * trunk/src/lib/network/monitor/network_node.cc (modified) * trunk/src/lib/network/monitor/network_node.h (modified) * trunk/src/lib/network/monitor/network_stats_widget.cc (modified) * trunk/src/lib/network/monitor/network_stats_widget.h (modified) * trunk/src/lib/network/nettypes.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/peer_info.cc (modified) * trunk/src/lib/network/peer_info.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/proxy_control.cc (copied) * trunk/src/lib/network/proxy/proxy_control.h (copied) * trunk/src/lib/network/server_socket.h (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/particles/quick_animation.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/object_manager.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/network_turret.cc (copied) * trunk/src/world_entities/npcs/network_turret.h (copied) * trunk/src/world_entities/npcs/space_turret.cc (modified) * trunk/src/world_entities/npcs/space_turret.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.h (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the proxy bache back with no conflicts Thu, 27 Jul 2006 08:44:28 GMT bensch [9494] * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/README.NETWORK (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/ip.cc (modified) * trunk/src/lib/network/ip.h (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/monitor/connection_monitor.cc (modified) * trunk/src/lib/network/monitor/connection_monitor.h (modified) * trunk/src/lib/network/monitor/network_monitor.cc (modified) * trunk/src/lib/network/monitor/network_monitor.h (modified) * trunk/src/lib/network/monitor/network_node.cc (modified) * trunk/src/lib/network/monitor/network_node.h (modified) * trunk/src/lib/network/monitor/network_stats_widget.cc (copied) * trunk/src/lib/network/monitor/network_stats_widget.h (copied) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/nettypes.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/peer_info.cc (modified) * trunk/src/lib/network/peer_info.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/proxy/network_settings.cc (modified) * trunk/src/lib/network/proxy/network_settings.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) * trunk/src/lib/network/tcp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.h (modified) * trunk/src/lib/network/zip.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/Makefile.am (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/network_stats_widget.cc (deleted) * trunk/src/util/network_stats_widget.h (deleted) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/world_entity.cc (modified) merged the proxy back Mon, 24 Jul 2006 09:09:47 GMT bensch [9406] * trunk/AUTHORS (modified) * trunk/CODING-STANDARDS (modified) * trunk/ChangeLog (modified) * trunk/IDEAS (modified) * trunk/INSTALL (modified) * trunk/README (modified) * trunk/ToDo (modified) * trunk/configure.ac (modified) * trunk/src/ability.cc (modified) * trunk/src/ai/ai.cc (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/defs/globals.h (modified) * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_detection/aabb.cc (modified) * trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) * trunk/src/lib/collision_detection/bounding_sphere.cc (modified) * trunk/src/lib/collision_detection/bounding_volume.cc (modified) * trunk/src/lib/collision_detection/bv_tree.cc (modified) * trunk/src/lib/collision_detection/bv_tree_node.cc (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_detection/obb.cc (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_reaction/collision.cc (modified) * trunk/src/lib/collision_reaction/collision_event.cc (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/collision_reaction.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/key_mapper.cc (modified) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lightning_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/effects/sun_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/weather_effect.cc (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/grid.cc (modified) * trunk/src/lib/graphics/importer/interactive_model.cc (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md3/md3_animation_cfg.cc (modified) * trunk/src/lib/graphics/importer/model.cc (modified) * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/image_plane.cc (modified) * trunk/src/lib/graphics/render2D/render_2d.cc (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) * trunk/src/lib/graphics/spatial_separation/spatial_separation.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text_engine.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_frame.cc (modified) * trunk/src/lib/gui/gl/glgui_image.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_text.cc (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/lib/gui/gl/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl/glgui_textfield.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc (modified) * trunk/src/lib/gui/gl/signal_connector.cc (deleted) * trunk/src/lib/gui/gl/signal_connector.h (deleted) * trunk/src/lib/gui/gtk (deleted) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/gui/qt/gui_video.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/lang/class_list.cc (modified) * trunk/src/lib/math/line.cc (modified) * trunk/src/lib/math/plane.cc (modified) * trunk/src/lib/math/rotation_OBSOLETE.cc (modified) * trunk/src/lib/math/vector2D.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/README (deleted) * trunk/src/lib/network/README.NETWORK (copied) * trunk/src/lib/network/connection_monitor.cc (deleted) * trunk/src/lib/network/connection_monitor.h (deleted) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/data_stream.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/ip.cc (copied) * trunk/src/lib/network/ip.h (copied) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/monitor (copied) * trunk/src/lib/network/monitor/connection_monitor.cc (copied) * trunk/src/lib/network/monitor/connection_monitor.h (copied) * trunk/src/lib/network/monitor/network_monitor.cc (copied) * trunk/src/lib/network/monitor/network_monitor.h (copied) * trunk/src/lib/network/monitor/network_node.cc (copied) * trunk/src/lib/network/monitor/network_node.h (copied) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/netincl.h (copied) * trunk/src/lib/network/nettypes.h (copied) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_protocol.cc (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/peer_info.cc (copied) * trunk/src/lib/network/peer_info.h (copied) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/proxy (copied) * trunk/src/lib/network/proxy/network_settings.cc (copied) * trunk/src/lib/network/proxy/network_settings.h (copied) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/network/shared_network_data.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.cc (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.h (copied) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_string.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.cc (modified) * trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h (modified) * trunk/src/lib/network/tcp_server_socket.cc (modified) * trunk/src/lib/network/tcp_server_socket.h (modified) * trunk/src/lib/network/tcp_socket.h (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (modified) * trunk/src/lib/parser/ini_parser/ini_parser.cc (modified) * trunk/src/lib/parser/preferences/cmd_line_prefs_reader.cc (modified) * trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc (modified) * trunk/src/lib/particles/box_emitter.cc (modified) * trunk/src/lib/particles/dot_emitter.cc (modified) * trunk/src/lib/particles/dot_particles.cc (modified) * trunk/src/lib/particles/engine/particle_engine.cc (modified) * trunk/src/lib/particles/model_particles.cc (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/plane_emitter.cc (modified) * trunk/src/lib/particles/quick_animation.cc (modified) * trunk/src/lib/particles/spark_particles.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/point_gravity.cc (modified) * trunk/src/lib/physics/fields/twirl.cc (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_engine.cc (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/shell/shell_command_class.cc (modified) * trunk/src/lib/shell/shell_completion.cc (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/util/Makefile.am (modified) * trunk/src/lib/util/executor/executor_functional.h (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/filesys/net_link.cc (copied) * trunk/src/lib/util/filesys/net_link.h (copied) * trunk/src/lib/util/helper_functions.cc (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/loading/resource.cc (modified) * trunk/src/lib/util/loading/resource_manager.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/sigslot (copied) * trunk/src/lib/util/sigslot/signal.h (copied) * trunk/src/lib/util/sigslot/slot.h (copied) * trunk/src/lib/util/substring.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/lib/util/threading.cc (modified) * trunk/src/lib/util/tokenizer.cc (deleted) * trunk/src/lib/util/tokenizer.h (deleted) * trunk/src/orxonox.cc (modified) * trunk/src/proto/proto_class.cc (modified) * trunk/src/proto/proto_singleton.cc (modified) * trunk/src/proto/proto_world_entity.cc (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/dedicated_server_world.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/game_world_data.h (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/menu/game_menu.h (modified) * trunk/src/story_entities/menu/glgui_imagebutton.cc (modified) * trunk/src/story_entities/menu/glgui_imagebutton.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (deleted) * trunk/src/story_entities/simple_game_menu.h (deleted) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/subprojects/benchmark.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/subprojects/recapture_mouse (copied) * trunk/src/subprojects/recapture_mouse/Makefile.am (copied) * trunk/src/subprojects/recapture_mouse/recapturer.cc (copied) * trunk/src/util/Makefile.am (modified) * trunk/src/util/animation/animation3d.cc (modified) * trunk/src/util/animation/animation_player.cc (modified) * trunk/src/util/fast_factory.cc (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/kill.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/util/mission_goal.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_stats_widget.cc (copied) * trunk/src/util/network_stats_widget.h (copied) * trunk/src/util/object_manager.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/util/singleplayer_shootemup.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_node.cc (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/character_attributes.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/effects/lightning_bolt.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/image_entity.cc (modified) * trunk/src/world_entities/elements/text_element.cc (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environments/building.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/items/item_container.cc (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/gate.cc (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (modified) * trunk/src/world_entities/recorder.cc (modified) * trunk/src/world_entities/satellite.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/skysphere.cc (modified) * trunk/src/world_entities/space_ships/collision_probe.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spectator.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aiming_system.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: merged the proxy back merged with commandsvn merge ... Thu, 06 Jul 2006 10:25:44 GMT bensch [9240] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/signal_handler.cc (modified) * trunk/src/util/signal_handler.h (modified) orxonox/trunk: better signal handler. patched by chrigi Wed, 05 Jul 2006 14:39:02 GMT bensch [9235] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_detection/obb_tree.cc (modified) * trunk/src/lib/collision_detection/obb_tree.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_detection/obb_tree_node.h (modified) * trunk/src/lib/collision_reaction/Makefile.am (modified) * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.h (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_full_walk.cc (copied) * trunk/src/lib/collision_reaction/cr_physics_full_walk.h (copied) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/lightning_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.h (modified) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/handshake.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/effects/explosion.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/environments/model_entity.cc (modified) * trunk/src/world_entities/npcs/attractor_mine.cc (copied) * trunk/src/world_entities/npcs/attractor_mine.h (copied) * trunk/src/world_entities/npcs/gate.cc (copied) * trunk/src/world_entities/npcs/gate.h (copied) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/npc_test.cc (modified) * trunk/src/world_entities/npcs/npc_test.h (modified) * trunk/src/world_entities/npcs/npc_test1.cc (modified) * trunk/src/world_entities/npcs/space_turret.cc (copied) * trunk/src/world_entities/npcs/space_turret.h (copied) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/projectiles/boomerang_projectile.cc (copied) * trunk/src/world_entities/projectiles/boomerang_projectile.h (copied) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.h (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/laser.h (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/projectile.h (modified) * trunk/src/world_entities/projectiles/rail_projectile.cc (copied) * trunk/src/world_entities/projectiles/rail_projectile.h (copied) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/rocket.h (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/skydome.cc (modified) * trunk/src/world_entities/space_ships/cruizer.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/weapons/aiming_system.cc (copied) * trunk/src/world_entities/weapons/aiming_system.h (copied) * trunk/src/world_entities/weapons/boomerang_gun.cc (copied) * trunk/src/world_entities/weapons/boomerang_gun.h (copied) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/laser_cannon.cc (copied) * trunk/src/world_entities/weapons/laser_cannon.h (copied) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the presentation back Tue, 04 Jul 2006 09:18:41 GMT bensch [9110] * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/lib/collision_detection/cd_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/md3/md3_model.cc (modified) * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gtk/gui_gtk.cc (modified) * trunk/src/lib/math/curve.cc (modified) * trunk/src/lib/math/line.h (modified) * trunk/src/lib/math/matrix.cc (modified) * trunk/src/lib/math/matrix.h (modified) * trunk/src/lib/math/plane.h (modified) * trunk/src/lib/math/quaternion.cc (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/math/vector.cc (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/subprojects/framework.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/util/signal_handler.h (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/npcs/door.cc (modified) * trunk/src/world_entities/npcs/door.h (modified) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) * trunk/src/world_entities/space_ships/spacecraft_2d.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the Presentation back Mon, 03 Jul 2006 16:30:42 GMT patrick [9059] * trunk/src/lib/network/message_manager.cc (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/story_entities/menu/game_menu.cc (modified) * trunk/src/story_entities/menu/game_menu.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/bsp_entity.h (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/world_entity.cc (modified) merged the network branche with the trunk Sun, 02 Jul 2006 12:50:47 GMT bensch [9014] * trunk/src/story_entities/menu/game_menu.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) orxonox/trunk: autoselect first entries in the Menu Sun, 02 Jul 2006 12:22:19 GMT bensch [9008] * trunk/src/lib/collision_detection/bounding_volume.h (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_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/src/util/object_manager.cc (modified) * trunk/src/world_entities/playable.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/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the network bak to the trunk merged with ... Sun, 02 Jul 2006 11:36:13 GMT bensch [9003] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.cc (modified) * trunk/src/lib/graphics/importer/bsp_file.h (modified) * trunk/src/lib/graphics/importer/bsp_manager.cc (modified) * trunk/src/lib/graphics/importer/bsp_manager.h (modified) * trunk/src/lib/graphics/importer/interactive_model.h (modified) * trunk/src/lib/graphics/importer/md2/md2Model.cc (modified) * trunk/src/lib/graphics/importer/md2/md2Model.h (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.h (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/bsp_entity.cc (modified) * trunk/src/world_entities/creatures/fps_player.cc (modified) * trunk/src/world_entities/creatures/fps_player.h (modified) * trunk/src/world_entities/door.cc (deleted) * trunk/src/world_entities/door.h (deleted) * trunk/src/world_entities/elements/glgui_radar.cc (modified) * trunk/src/world_entities/npcs/door.cc (copied) * trunk/src/world_entities/npcs/door.h (copied) * trunk/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/npcs/npc.cc (modified) * trunk/src/world_entities/npcs/repair_station.cc (copied) * trunk/src/world_entities/npcs/repair_station.h (copied) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.cc (modified) * trunk/src/world_entities/weapons/fps_sniper_rifle.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: merged the single_player_map branche back merged with ... Sun, 02 Jul 2006 04:57:09 GMT bensch [9001] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) orxonox/trunk: The Radar is now displayed with the radar-pic ... Sun, 02 Jul 2006 04:43:15 GMT bensch [9000] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) nicer, better radar Sun, 02 Jul 2006 04:25:54 GMT bensch [8996] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) * trunk/src/world_entities/elements/glgui_radar.h (modified) orxonox/trunk: RADAR RENDERS Sun, 02 Jul 2006 03:43:28 GMT bensch [8995] * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) hud: radar shown inside of the HUD Sun, 02 Jul 2006 03:38:44 GMT bensch [8994] * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/WorldEntities.am (modified) * trunk/src/world_entities/elements/glgui_radar.cc (modified) compiling radar Sat, 01 Jul 2006 16:09:30 GMT bensch [8990] * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) orxonox/trunk: new Functionality to widget, so one can set a ... Sat, 01 Jul 2006 15:32:45 GMT bensch [8989] * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/text_engine/font.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/util/hud.cc (modified) orxonox/trunk: notifier notifies Sat, 01 Jul 2006 15:13:19 GMT bensch [8988] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.h (modified) orxonox/trunk: much nicer rendering. The Bar is now behind the Value Sat, 01 Jul 2006 15:08:20 GMT bensch [8987] * trunk/src/util/hud.cc (modified) orxonox/trunk: multi-lined the weapon-alignment, man, it looks real ... Sat, 01 Jul 2006 14:57:07 GMT bensch [8986] * trunk/src/lib/gui/gl/glgui_bar.h (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) trunk: slerping colors in HSV-space works Sat, 01 Jul 2006 11:05:38 GMT bensch [8976] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) orxonox/trunk: the hud displays Energy and WeaponEnergy Sat, 01 Jul 2006 10:12:48 GMT bensch [8975] * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (modified) * trunk/src/world_entities/elements/glgui_energywidget.h (modified) trunk: widget displayed Sat, 01 Jul 2006 09:26:00 GMT bensch [8972] * trunk/src/lib/gui/gl/glgui_bar.cc (modified) * trunk/src/lib/gui/gl/glgui_bar.h (modified) * trunk/src/lib/gui/gl/glgui_text.h (modified) * trunk/src/util/hud.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/elements/glgui_energywidget.cc (copied) * trunk/src/world_entities/elements/glgui_energywidget.h (copied) * trunk/src/world_entities/world_entity.cc (modified) added glgui_energywidget, the new Widget to display Energy and a Value Mon, 26 Jun 2006 14:46:25 GMT patrick [8802] * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_server_socket.h (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/udp_socket.h (modified) * trunk/src/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/src/world_entities/npcs/generic_npc.cc (modified) * trunk/src/world_entities/npcs/generic_npc.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) merged the network branche back to trunk Thu, 22 Jun 2006 12:04:28 GMT bensch [8717] * trunk/src/defs/class_id.h (modified) * trunk/src/defs/error.h (modified) * trunk/src/lib/data/data_tank.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_handler.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_table.cc (modified) * trunk/src/lib/gui/gl/glgui_table.h (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/util/loading/game_loader.cc (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/menu (copied) * trunk/src/story_entities/menu/game_menu.cc (copied) * trunk/src/story_entities/menu/game_menu.h (copied) * trunk/src/story_entities/menu/glgui_imagebutton.cc (copied) * trunk/src/story_entities/menu/glgui_imagebutton.h (copied) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/single_player_world_data.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) merged the gui back Thu, 22 Jun 2006 10:48:01 GMT bensch [8708] * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/spectator.cc (modified) merged network back merged with command: svn merge -r8625:HEAD ... Tue, 20 Jun 2006 11:39:01 GMT bensch [8623] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/event/event_handler.h (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/connection_monitor.cc (modified) * trunk/src/lib/network/connection_monitor.h (modified) * trunk/src/lib/network/data_stream.cc (modified) * trunk/src/lib/network/message_manager.cc (modified) * trunk/src/lib/network/message_manager.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/player_stats.h (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/udp_broadcast.cc (copied) * trunk/src/lib/network/udp_broadcast.h (copied) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/network/zip.h (modified) * trunk/src/lib/shell/some_shell_commands.cc (modified) * trunk/src/orxonox.cc (modified) * trunk/src/subprojects/network/network_unit_test.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/multiplayer_team_deathmatch.cc (modified) * trunk/src/util/multiplayer_team_deathmatch.h (modified) * trunk/src/util/network_game_rules.cc (modified) * trunk/src/util/network_game_rules.h (modified) * trunk/src/util/signal_handler.h (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) orxonox/trunk: merged the network branche back here merged with ... Tue, 20 Jun 2006 11:24:11 GMT bensch [8619] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/text_engine/limited_width_text.cc (copied) * trunk/src/lib/graphics/text_engine/limited_width_text.h (copied) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui.h (modified) * trunk/src/lib/gui/gl/glgui_box.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_container.cc (modified) * trunk/src/lib/gui/gl/glgui_cursor.cc (modified) * trunk/src/lib/gui/gl/glgui_defs.h (modified) * trunk/src/lib/gui/gl/glgui_image.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_style.cc (deleted) * trunk/src/lib/gui/gl/glgui_style.h (deleted) * trunk/src/lib/gui/gl/glgui_table.cc (copied) * trunk/src/lib/gui/gl/glgui_table.h (copied) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (modified) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (modified) * trunk/src/lib/math/rect2D.cc (modified) * trunk/src/lib/math/rect2D.h (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/executor/functor_list.h (modified) * trunk/src/lib/util/filesys/file.cc (modified) * trunk/src/lib/util/filesys/file.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/environments/mapped_water.cc (modified) * trunk/src/world_entities/skybox.h (modified) trunk: merged the gui-branche back. merged with command: svn merge ... Fri, 16 Jun 2006 09:16:38 GMT bensch [8523] * trunk/acinclude.m4 (modified) * trunk/configure.ac (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/util/filesys/directory.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/signal_handler.h (modified) trunk: compiles on Windows: DANGER: THE LINUX PORT MAY BE COMPROMISED Fri, 16 Jun 2006 08:23:05 GMT bensch [8518] * trunk/scripts/tardis-scratch-checkout.pl (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/gui/gl/Makefile.am (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_style.cc (modified) * trunk/src/lib/gui/gl/glgui_style.h (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/gui/gl/specials (copied) * trunk/src/lib/gui/gl/specials/glgui_notifier.cc (copied) * trunk/src/lib/gui/gl/specials/glgui_notifier.h (copied) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) merged the gui back to the trunk Thu, 15 Jun 2006 19:50:56 GMT bensch [8495] * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/graphics/effects/atmospheric_engine.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.cc (modified) * trunk/src/lib/graphics/effects/cloud_effect.h (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/effects/lightening_effect.cc (modified) * trunk/src/lib/graphics/effects/lightening_effect.h (modified) * trunk/src/lib/graphics/effects/rain_effect.cc (modified) * trunk/src/lib/graphics/effects/rain_effect.h (modified) * trunk/src/lib/graphics/effects/sglmodel.h (deleted) * trunk/src/lib/graphics/effects/sky.sgl (deleted) * trunk/src/lib/graphics/effects/snow_effect.cc (modified) * trunk/src/lib/graphics/effects/snow_effect.h (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.h (modified) * trunk/src/lib/graphics/effects/weather_effect.cc (modified) * trunk/src/lib/graphics/effects/weather_effect.h (modified) * trunk/src/lib/gui/qt/gui_control.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/subprojects/benchmark.cc (modified) * trunk/src/util/kill_target.cc (modified) * trunk/src/world_entities/effects/billboard.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) merged the branche atmos back. no conflicts Thu, 15 Jun 2006 10:48:26 GMT bensch [8448] * trunk/Makefile.am (modified) * trunk/configure.ac (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/graphics/text_engine/text.h (modified) * trunk/src/lib/gui/gl/glgui_bar.cc (modified) * trunk/src/lib/gui/gl/glgui_button.cc (modified) * trunk/src/lib/gui/gl/glgui_button.h (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_checkbutton.h (modified) * trunk/src/lib/gui/gl/glgui_defs.h (modified) * trunk/src/lib/gui/gl/glgui_handler.cc (modified) * trunk/src/lib/gui/gl/glgui_image.cc (modified) * trunk/src/lib/gui/gl/glgui_image.h (modified) * trunk/src/lib/gui/gl/glgui_inputline.cc (modified) * trunk/src/lib/gui/gl/glgui_inputline.h (modified) * trunk/src/lib/gui/gl/glgui_pushbutton.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.cc (modified) * trunk/src/lib/gui/gl/glgui_slider.h (modified) * trunk/src/lib/gui/gl/glgui_style.cc (modified) * trunk/src/lib/gui/gl/glgui_style.h (modified) * trunk/src/lib/gui/gl/glgui_textfield.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.cc (modified) * trunk/src/lib/gui/gl/glgui_widget.h (modified) * trunk/src/lib/math/rect2D.cc (modified) * trunk/src/lib/math/rect2D.h (modified) * trunk/src/lib/util/color.cc (modified) * trunk/src/lib/util/color.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) merged gui back to the trunk merged with command merge -r8377:HEAD ... Wed, 14 Jun 2006 15:50:18 GMT bensch [8408] * trunk/src/lib/script_engine/Makefile.am (modified) * trunk/src/lib/script_engine/account.cc (modified) * trunk/src/lib/script_engine/lunar.h (modified) * trunk/src/lib/script_engine/lunartest2.lua (modified) * trunk/src/lib/script_engine/object.cc (modified) * trunk/src/lib/script_engine/script.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/script_engine/script_class.cc (modified) * trunk/src/lib/script_engine/script_class.h (modified) * trunk/src/lib/script_engine/script_manager.cc (modified) * trunk/src/lib/util/executor/executor.h (modified) * trunk/src/lib/util/executor/executor_functional.cc (modified) * trunk/src/lib/util/executor/executor_lua.cc (modified) * trunk/src/lib/util/executor/executor_lua.h (modified) * trunk/src/lib/util/loading/load_param.cc (modified) * trunk/src/lib/util/substring.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/script_trigger.cc (modified) * trunk/src/world_entities/script_trigger.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) trunk: merged the script_engine branche back here merged with ... Wed, 14 Jun 2006 08:08:41 GMT bensch [8362] * trunk/src/lib/collision_reaction/collision_handle.cc (modified) * trunk/src/lib/collision_reaction/cr_engine.cc (modified) * trunk/src/lib/collision_reaction/cr_object_damage.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (modified) * trunk/src/lib/graphics/effects/lense_flare.h (modified) * trunk/src/lib/graphics/effects/volfog_effect.cc (modified) * trunk/src/lib/graphics/effects/volfog_effect.h (modified) * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/static_model.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/gui/gui_saveable.cc (modified) * trunk/src/lib/gui/qt/gui_video.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/network/connection_monitor.h (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/player_stats.cc (modified) * trunk/src/lib/network/udp_server_socket.cc (modified) * trunk/src/lib/network/udp_socket.cc (modified) * trunk/src/lib/network/zip.cc (modified) * trunk/src/lib/script_engine/script.h (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/lib/shell/shell_command_class.h (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/sound_buffer.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/lib/util/executor/executor_xml.h (modified) * trunk/src/lib/util/loading/dynamic_loader.cc (modified) * trunk/src/lib/util/loading/factory.cc (modified) * trunk/src/lib/util/loading/load_param_description.cc (modified) * trunk/src/lib/util/preferences.cc (modified) * trunk/src/lib/util/preferences.h (modified) * trunk/src/util/game_rules.cc (modified) * trunk/src/util/game_rules.h (modified) * trunk/src/util/object_manager.cc (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/projectile.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/turbine_hover.cc (modified) orxonox/trunk: removed stupid included in base_object.h this should ... Tue, 13 Jun 2006 20:01:55 GMT bensch [8350] * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/physics/physics_interface.cc (modified) * trunk/src/lib/shell/shell_buffer.cc (modified) * trunk/src/lib/shell/shell_command.cc (modified) * trunk/src/lib/sound/ogg_player.cc (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/lib/sound/sound_source.cc (modified) * trunk/src/util/fast_factory.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) fixed out some warnings 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