# # ChangeLog for trunk/src/world_entities in orxonox.OLD # # Generated by Trac 1.0.9 # May 23, 2024, 6:08:41 PM Wed, 01 Feb 2006 15:40:34 GMT patrick [6959] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/synchronizeable.h (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/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged network branche into trunk Wed, 01 Feb 2006 15:37:08 GMT bensch [6956] * trunk/src/lib/graphics/importer/height_map.cc (modified) * trunk/src/lib/graphics/importer/height_map.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) orxonox/trunk: merged the HeightMapBranche back to the trunk Wed, 01 Feb 2006 14:59:19 GMT bensch [6947] * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) orxonox/trunk: merged the controll back Wed, 01 Feb 2006 12:26:58 GMT bensch [6931] * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) orxonox/trunk: implemented addWeapon Tue, 31 Jan 2006 21:37:09 GMT bensch [6920] * trunk/src/world_entities/weapons/turret.cc (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) orxonox/trunk: default target for turret and other weapons, that ... Tue, 31 Jan 2006 21:15:54 GMT bensch [6918] * trunk/src/world_entities/weapons/weapon_manager.cc (modified) orxonox/trunk: weapons do disengage if they are empty. Tue, 31 Jan 2006 19:24:49 GMT bensch [6912] * trunk/src/lib/graphics/importer/primitive_model.cc (modified) * trunk/src/world_entities/planet.cc (modified) orxonox/trunk: tried to fix the planet Tue, 31 Jan 2006 01:38:19 GMT bensch [6882] * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: smooth Tue, 31 Jan 2006 01:27:52 GMT bensch [6881] * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: in 3d Tue, 31 Jan 2006 01:27:02 GMT bensch [6880] * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: in 3d Tue, 31 Jan 2006 01:04:29 GMT bensch [6879] * trunk/src/world_entities/space_ships/hover.cc (modified) orxonox/trunk: smoother control of the Hover Mon, 30 Jan 2006 20:39:58 GMT bensch [6871] * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/sound/ogg_player.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/player.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.h (modified) orxonox/trunk: small fixes (cleanup) Mon, 30 Jan 2006 15:41:19 GMT bensch [6868] * trunk/src/defs/debug.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) orxonox/trunk: merged the Network back to the trunk. merged with ... Mon, 30 Jan 2006 10:42:44 GMT patrick [6863] * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/world_entities/skybox.cc (modified) trunk: fixed the segfault problem, when restarting world Mon, 30 Jan 2006 04:24:31 GMT bensch [6860] * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/skybox.cc (modified) orxonox/trunk: hmm... do not know Mon, 30 Jan 2006 02:35:17 GMT bensch [6852] * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/world_entities/image_entity.cc (modified) * trunk/src/world_entities/image_entity.h (modified) orxonox/trunk: small little necessities Mon, 30 Jan 2006 02:13:16 GMT bensch [6851] * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/world_entities/image_entity.cc (modified) orxonox/trunk: count to infinity, I think notgdb ./src/orxonox Mon, 30 Jan 2006 01:56:54 GMT patrick [6848] * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/world_entities/image_entity.cc (modified) trunk: switching to element2sd Mon, 30 Jan 2006 01:37:22 GMT bensch [6846] * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/lib/sound/sound_engine.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) trunk: valgrind Mon, 30 Jan 2006 00:36:43 GMT patrick [6841] * trunk/src/lib/graphics/render2D/element_2d.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/world_entities/image_entity.cc (modified) trunk: submenu loading work, graphics chaos Sun, 29 Jan 2006 12:35:43 GMT bensch [6826] * trunk/src/lib/particles/box_emitter.cc (modified) * trunk/src/lib/particles/box_emitter.h (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) orxonox/trunk: ok, the Cube Emitter works Sun, 29 Jan 2006 12:07:01 GMT bensch [6825] * trunk/src/lib/particles/box_emitter.cc (modified) * trunk/src/lib/particles/box_emitter.h (modified) * trunk/src/lib/particles/dot_emitter.cc (modified) * trunk/src/lib/particles/dot_emitter.h (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: new interface to ParticleEmitters Sun, 29 Jan 2006 01:27:38 GMT bensch [6824] * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: ballanced speed Sun, 29 Jan 2006 00:57:03 GMT bensch [6822] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/network/shared_network_data.cc (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/dot_emitter.cc (copied) * trunk/src/lib/particles/dot_emitter.h (copied) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: ParticleEmitters now splitted into SubClasses. Also fixed a ... Sat, 28 Jan 2006 23:57:24 GMT bensch [6821] * trunk/src/lib/particles/spark_particles.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) trunk: HyperBlaster Sat, 28 Jan 2006 16:11:51 GMT bensch [6815] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.h (modified) * trunk/src/lib/graphics/effects/lense_flare.cc (copied) * trunk/src/lib/graphics/effects/lense_flare.h (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/graphics/render2D/billboard.cc (copied) * trunk/src/lib/graphics/render2D/billboard.h (copied) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/image_entity.cc (modified) * trunk/src/world_entities/image_entity.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: merged branches/network back to the trunk. merged ... Sat, 28 Jan 2006 16:06:25 GMT bensch [6814] * trunk/src/world_entities/space_ships/hover.cc (modified) orxonox/trunk: hover is as it should be... mucgh too fast :) Sat, 28 Jan 2006 16:01:53 GMT bensch [6813] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) orxonox/trunk: particles, player etc. Sat, 28 Jan 2006 15:02:06 GMT bensch [6811] * trunk/src/world_entities/projectiles/hyperblast.cc (modified) * trunk/src/world_entities/projectiles/hyperblast.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/hyperblaster.cc (modified) More stuff in Cannon and Hyperblast Sat, 28 Jan 2006 14:30:54 GMT bensch [6810] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/projectiles/hyperblast.cc (copied) * trunk/src/world_entities/projectiles/hyperblast.h (copied) * trunk/src/world_entities/weapons/hyperblaster.cc (copied) * trunk/src/world_entities/weapons/hyperblaster.h (copied) trunk: added hyperblaster Sat, 28 Jan 2006 13:57:27 GMT bensch [6807] * trunk/src/world_entities/camera.cc (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/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: hover optimize Sat, 28 Jan 2006 11:40:08 GMT bensch [6806] * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.h (modified) trunk: hover-rotors Sat, 28 Jan 2006 11:20:58 GMT bensch [6805] * 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) orxonox/trunk: hover works as it should Sat, 28 Jan 2006 10:29:03 GMT bensch [6804] * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) trunk: remastered Playables a bit Sat, 28 Jan 2006 10:14:40 GMT bensch [6803] * trunk/src/world_entities/environments/water.cc (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/weapons/cannon.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: WeaponManager fix Fri, 27 Jan 2006 16:16:44 GMT bensch [6801] * trunk/src/world_entities/space_ships/hover.cc (modified) trunk: hover positioned Fri, 27 Jan 2006 15:40:37 GMT bensch [6800] * trunk/src/world_entities/space_ships/hover.cc (modified) * trunk/src/world_entities/space_ships/hover.h (modified) trunk: hover functionality Fri, 27 Jan 2006 15:16:02 GMT bensch [6799] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/world_entities/space_ships/hover.cc (copied) * trunk/src/world_entities/space_ships/hover.h (copied) * trunk/src/world_entities/weapons/cannon.cc (modified) trunk: new Hover Fri, 27 Jan 2006 15:02:31 GMT bensch [6798] * trunk/src/world_entities/space_ships/hover.cc (deleted) * trunk/src/world_entities/space_ships/hover.h (deleted) orxonox/trunk: deleted old hover -> unstable Thu, 26 Jan 2006 17:47:32 GMT bensch [6780] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/shell/shell.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/environments/water.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/turret_power_up.cc (modified) * trunk/src/world_entities/terrain.cc (modified) trunk: war of the popers Thu, 26 Jan 2006 16:49:58 GMT bensch [6778] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/skysphere.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: ModelView work... Thu, 26 Jan 2006 14:00:44 GMT bensch [6775] * trunk/src/world_entities/recorder.h (modified) sdlincl Thu, 26 Jan 2006 13:44:26 GMT bensch [6772] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/effects/fog_effect.cc (modified) * trunk/src/lib/graphics/effects/fog_effect.h (modified) * trunk/src/lib/graphics/effects/graphics_effect.cc (modified) * trunk/src/lib/graphics/effects/graphics_effect.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/world_entities/camera.cc (modified) * trunk/src/world_entities/skybox.cc (modified) orxonox/trunk: merged the branche network back merged with command ... Thu, 26 Jan 2006 13:39:31 GMT bensch [6771] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/skybox.h (modified) Water is better now (but still quite Bad) Thu, 26 Jan 2006 11:54:16 GMT bensch [6766] * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) trunk: splash splash Thu, 26 Jan 2006 10:08:20 GMT bensch [6764] * trunk/src/lib/graphics/light.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: better lighting Thu, 26 Jan 2006 01:44:57 GMT bensch [6760] * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) merged the SpaceShipControl branche back here. Thu, 26 Jan 2006 01:36:14 GMT bensch [6759] * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) timing of the turret is better now Thu, 26 Jan 2006 01:08:16 GMT bensch [6757] * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: nicer burst Thu, 26 Jan 2006 00:55:40 GMT bensch [6756] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) trunk: Burst Particles Thu, 26 Jan 2006 00:08:23 GMT patrick [6753] * trunk/src/lib/graphics/Makefile.am (modified) * trunk/src/lib/graphics/effects (copied) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: merged network back to trunk Wed, 25 Jan 2006 20:30:43 GMT bensch [6738] * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) orxonox/trunk: tick also in the turrets now Wed, 25 Jan 2006 20:29:45 GMT patrick [6737] * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: merged network back to trunk Wed, 25 Jan 2006 20:28:18 GMT bensch [6736] * trunk/src/world_entities/npcs/ground_turret.cc (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) orxonox/trunk: Weapons are ticked only if they are inside of a ticked ... Wed, 25 Jan 2006 17:46:06 GMT bensch [6731] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/media_container.cc (modified) * trunk/src/lib/graphics/importer/media_container.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/story_entities/movie_loader.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) * trunk/src/world_entities/recorder.cc (copied) * trunk/src/world_entities/recorder.h (copied) merged avi_play back to the trunk. command ... Wed, 25 Jan 2006 17:02:36 GMT bensch [6728] * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) orxonox/trunk: now Weapons get Loaded on pickup Wed, 25 Jan 2006 16:35:49 GMT bensch [6724] * 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/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) merged the Spaceshipcontrol back to the trunk Wed, 25 Jan 2006 16:08:23 GMT bensch [6720] * trunk/src/world_entities/world_entity.cc (modified) trunk: bug in loadModel Wed, 25 Jan 2006 15:24:24 GMT bensch [6714] * trunk/src/world_entities/weapons/weapon_manager.cc (modified) no assertion error anymore. Wed, 25 Jan 2006 15:18:12 GMT bensch [6710] * trunk/src/story_entities/game_world.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) merged the powerups back to the trunk Wed, 25 Jan 2006 14:10:17 GMT bensch [6700] * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/player.cc (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: Energy->Health Wed, 25 Jan 2006 13:53:34 GMT patrick [6696] * trunk/src/story_entities/simple_game_menu.cc (modified) * trunk/src/story_entities/simple_game_menu.h (modified) * trunk/src/world_entities/image_entity.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: works again Wed, 25 Jan 2006 13:39:53 GMT patrick [6695] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/lib/network/Makefile.am (modified) * trunk/src/lib/network/handshake.cc (modified) * trunk/src/lib/network/netdefs.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_manager.cc (modified) * trunk/src/lib/network/network_manager.h (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_socket.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/network/shared_network_data.cc (copied) * trunk/src/lib/network/shared_network_data.h (copied) * trunk/src/lib/network/synchronizeable.cc (modified) * trunk/src/lib/network/synchronizeable.h (modified) * trunk/src/orxonox.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/planet.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) merged the network branche to the trunk Wed, 25 Jan 2006 13:16:31 GMT patrick [6692] * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) emerged spaceshipcontrol back to trunk via command >svn merge ... Tue, 24 Jan 2006 23:37:21 GMT bensch [6684] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) some water fixes Tue, 24 Jan 2006 22:01:11 GMT bensch [6680] * trunk/src/world_entities/environments/water.cc (modified) tried to fix water Tue, 24 Jan 2006 21:56:46 GMT bensch [6679] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) orxonox/trunk: WeaponManager seems to work, better than before. Tue, 24 Jan 2006 19:37:08 GMT bensch [6677] * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: minor Tue, 24 Jan 2006 19:24:48 GMT bensch [6676] * trunk/src/subprojects/importer/Makefile.am (modified) * trunk/src/subprojects/importer/tc.cc (deleted) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: weaponManager works again Tue, 24 Jan 2006 13:52:25 GMT bensch [6671] * trunk/src/util/hud.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/ammo_container.h (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) WeaponManger now handles Ammo. If a Weapon has NO ammo then the Ammo ... Tue, 24 Jan 2006 13:26:15 GMT bensch [6669] * trunk/src/lib/util/count_pointer.h (added) * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) * trunk/src/world_entities/weapons/ammo_container.h (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) some WeaponManager remake Tue, 24 Jan 2006 10:23:53 GMT bensch [6664] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (modified) trunk: small fix in resource/ammos Mon, 23 Jan 2006 13:02:22 GMT bensch [6655] * trunk/src/defs/class_id.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/items (added) * trunk/src/world_entities/items/item_container.cc (copied) * trunk/src/world_entities/items/item_container.h (copied) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/weapons/ammo_container.cc (copied) * trunk/src/world_entities/weapons/ammo_container.h (copied) orxonox/trunk: ammoContainer added Sat, 21 Jan 2006 15:56:43 GMT bensch [6645] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/md2Model.cc (modified) * trunk/src/lib/graphics/shader.cc (modified) * trunk/src/lib/graphics/text_engine/text.cc (modified) * trunk/src/lib/util/executor/executor.cc (modified) * trunk/src/lib/util/multi_type.cc (modified) * trunk/src/lib/util/multi_type.h (modified) * trunk/src/util/loading/resource_manager.cc (modified) * trunk/src/util/loading/resource_manager.h (modified) * trunk/src/world_entities/environments/water.cc (modified) orxonox/trunk: totally remastered the ResourceManager. Now it takes ... Sat, 21 Jan 2006 00:27:29 GMT bensch [6637] * trunk/src/defs/class_id.h (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/hover.cc (copied) * trunk/src/world_entities/space_ships/hover.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) orxonox/trunk: merged the SpaceShipControl branche back to the trunk ... Sat, 21 Jan 2006 00:18:19 GMT bensch [6634] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/converter.cc (modified) * trunk/src/lib/network/converter.h (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_socket.cc (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/lib/network/network_stream.h (modified) * trunk/src/lib/sound/sound_source.h (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/campaign_data.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/story_entities/game_world_data.h (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/simple_game_menu.cc (copied) * trunk/src/story_entities/simple_game_menu.h (copied) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/subprojects/network/Makefile.am (modified) * trunk/src/subprojects/network/isolated_unit_test.cc (copied) * trunk/src/subprojects/network/isolated_unit_test.h (copied) * trunk/src/subprojects/network/read_sync.cc (modified) * trunk/src/subprojects/network/simple_sync.cc (modified) * trunk/src/subprojects/network/write_sync.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/image_entity.cc (copied) * trunk/src/world_entities/image_entity.h (copied) * trunk/src/world_entities/planet.cc (copied) * trunk/src/world_entities/planet.h (copied) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/world_entity.cc (modified) orxonox/trunk: merged the network-branche back to the trunk merged ... Fri, 20 Jan 2006 01:55:12 GMT bensch [6628] * trunk/src/lib/particles/sprite_particles.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) trunk: segfault-prevention, and minor cleanup Fri, 20 Jan 2006 01:43:55 GMT bensch [6627] * trunk/configure.ac (modified) * trunk/src/lib/math/quaternion.h (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) trunk: valgrind sweep Thu, 19 Jan 2006 23:54:48 GMT bensch [6624] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.h (modified) orxonox/trunk: Some missing stuff Thu, 19 Jan 2006 23:08:41 GMT bensch [6622] * trunk/src/lib/graphics/importer/material.cc (modified) * trunk/src/lib/graphics/importer/material.h (modified) * trunk/src/world_entities/projectiles/bomb.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/laser.cc (modified) * trunk/src/world_entities/projectiles/laser.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) orxonox/trunk: Material can now be copied ParticleSprite used for ... Thu, 19 Jan 2006 22:46:28 GMT bensch [6621] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/particles/sprite_particles.cc (copied) * trunk/src/lib/particles/sprite_particles.h (copied) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) orxonox/trunk: particle derivate... still working on this Thu, 19 Jan 2006 17:23:56 GMT bensch [6619] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/lib/particles/Makefile.am (modified) * trunk/src/lib/particles/engine (added) * trunk/src/lib/particles/engine/particle_engine.cc (moved) * trunk/src/lib/particles/engine/particle_engine.h (moved) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world_data.cc (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/guided_missile.cc (modified) * trunk/src/world_entities/projectiles/laser.cc (modified) * trunk/src/world_entities/projectiles/rocket.cc (modified) * trunk/src/world_entities/projectiles/test_bullet.cc (modified) orxonox/trunk: rendering without the ParticleEngine, so now we are ... Thu, 19 Jan 2006 11:45:55 GMT bensch [6617] * trunk/src/lib/Makefile.am (modified) * trunk/src/lib/collision_detection/obb_tree_node.cc (modified) * trunk/src/lib/graphics/spatial_separation/quadtree_node.h (modified) * trunk/src/lib/math/line.cc (copied) * trunk/src/lib/math/line.h (copied) * trunk/src/lib/math/plane.cc (copied) * trunk/src/lib/math/plane.h (copied) * trunk/src/lib/math/rotation_OBSOLETE.cc (copied) * trunk/src/lib/math/rotation_OBSOLETE.h (copied) * trunk/src/lib/math/vector.cc (modified) * trunk/src/lib/math/vector.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) trunk: split Rotation/Line/Quaternion/Plane(Rectangle) into seperate ... Wed, 18 Jan 2006 23:29:58 GMT bensch [6610] * trunk/src/world_entities/environments/water.cc (modified) trunk: minor valgrinds Wed, 18 Jan 2006 16:25:48 GMT bensch [6600] * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/movie_player.cc (modified) * trunk/src/lib/graphics/importer/movie_player.h (modified) * trunk/src/story_entities/Makefile.am (modified) * trunk/src/story_entities/movie_loader.cc (copied) * trunk/src/story_entities/movie_loader.h (copied) * trunk/src/world_entities/movie_entity.cc (modified) * trunk/src/world_entities/movie_entity.h (modified) TRUNK: merged the avi_play branche again Wed, 18 Jan 2006 15:41:57 GMT bensch [6589] * trunk/src/world_entities/playable.cc (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/weapons/turret.cc (modified) TRUNK: merged powerups back Wed, 18 Jan 2006 14:55:23 GMT bensch [6578] * trunk/src/lib/event/event_handler.cc (modified) * trunk/src/world_entities/playable.cc (modified) trunk: segfault prevention Wed, 18 Jan 2006 14:21:47 GMT bensch [6568] * trunk/src/world_entities/playable.cc (modified) * trunk/src/world_entities/playable.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) trunk: weaponManager is now reporting the change of Weapons to the ... Wed, 18 Jan 2006 14:06:19 GMT bensch [6565] * trunk/src/world_entities/weapons/turret.cc (modified) trunk: turret does not move anymore Wed, 18 Jan 2006 14:00:56 GMT bensch [6561] * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) trunk: WeaponManager update Wed, 18 Jan 2006 13:12:53 GMT bensch [6547] * 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/power_ups/param_power_up.h (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/weapons/turret.cc (modified) orxonox/trunk: merged the WeaponManager back to the trunk Wed, 18 Jan 2006 12:20:02 GMT bensch [6532] * trunk/config.h.in (modified) * trunk/configure.ac (modified) * trunk/src/defs/class_id.h (modified) * trunk/src/lib/graphics/importer/Makefile.am (modified) * trunk/src/lib/graphics/importer/media_container.cc (copied) * trunk/src/lib/graphics/importer/media_container.h (copied) * trunk/src/lib/graphics/importer/movie_player.cc (copied) * trunk/src/lib/graphics/importer/movie_player.h (copied) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.cc (modified) * trunk/src/lib/graphics/importer/texture_sequence.h (modified) * trunk/src/subprojects/importer/Makefile.am (modified) * trunk/src/subprojects/importer/movie_player_test.cc (copied) * trunk/src/subprojects/importer/multitex.cc (modified) * trunk/src/world_entities/Makefile.am (modified) * trunk/src/world_entities/movie_entity.cc (copied) * trunk/src/world_entities/movie_entity.h (copied) * trunk/src/world_entities/space_ships/space_ship.cc (modified) orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, ... Wed, 18 Jan 2006 01:54:04 GMT bensch [6523] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/importer/texture.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/skybox.cc (modified) trunk: water fake render :) Wed, 18 Jan 2006 01:20:13 GMT bensch [6522] * trunk/src/lib/graphics/graphics_engine.cc (modified) * trunk/src/lib/graphics/graphics_engine.h (modified) * trunk/src/world_entities/environments/water.cc (modified) trunk: switch to WireFrame with Shell -> GraphicsEngine wireframe Tue, 17 Jan 2006 23:38:19 GMT bensch [6519] * trunk/src/lib/graphics/importer/grid.h (modified) * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) trunk: better smoother water Tue, 17 Jan 2006 23:09:11 GMT bensch [6518] * trunk/src/lib/graphics/importer/grid.h (modified) * trunk/src/world_entities/environments/water.cc (modified) * trunk/src/world_entities/environments/water.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) orxonox/trunk: some waves Tue, 17 Jan 2006 22:13:05 GMT bensch [6517] * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) orxonox/trunk: each BaseObject saves its TiXmlElement as a ... Tue, 17 Jan 2006 21:01:07 GMT bensch [6512] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/graphics/light.cc (modified) * trunk/src/lib/graphics/light.h (modified) * trunk/src/lib/graphics/render2D/element_2d.cc (modified) * trunk/src/lib/graphics/render2D/element_2d.h (modified) * trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.h (modified) * trunk/src/lib/lang/base_object.h (modified) * trunk/src/lib/particles/particle_emitter.cc (modified) * trunk/src/lib/particles/particle_emitter.h (modified) * trunk/src/lib/particles/particle_engine.h (modified) * trunk/src/lib/particles/particle_system.cc (modified) * trunk/src/lib/particles/particle_system.h (modified) * trunk/src/lib/physics/fields/field.cc (modified) * trunk/src/lib/physics/fields/field.h (modified) * trunk/src/lib/physics/fields/gravity.cc (modified) * trunk/src/lib/physics/fields/gravity.h (modified) * trunk/src/lib/physics/physics_connection.cc (modified) * trunk/src/lib/physics/physics_engine.h (modified) * trunk/src/proto/proto_world_entity.cc (modified) * trunk/src/proto/proto_world_entity.h (modified) * trunk/src/story_entities/campaign.cc (modified) * trunk/src/story_entities/campaign.h (modified) * trunk/src/story_entities/campaign_data.h (modified) * trunk/src/story_entities/dedicated_server_world.cc (modified) * trunk/src/story_entities/dedicated_server_world.h (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/story_entities/single_player_world.cc (modified) * trunk/src/story_entities/single_player_world.h (modified) * trunk/src/story_entities/story_entity.cc (modified) * trunk/src/story_entities/story_entity.h (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) * trunk/src/subprojects/collision_detection/collision_test_entity.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/hud.h (modified) * trunk/src/util/track/track_manager.cc (modified) * trunk/src/util/track/track_manager.h (modified) * trunk/src/world_entities/creatures/md2_creature.cc (modified) * trunk/src/world_entities/creatures/md2_creature.h (modified) * trunk/src/world_entities/environment.cc (modified) * trunk/src/world_entities/environment.h (modified) * trunk/src/world_entities/npcs/ground_turret.cc (modified) * trunk/src/world_entities/npcs/ground_turret.h (modified) * trunk/src/world_entities/power_ups/laser_power_up.cc (modified) * trunk/src/world_entities/power_ups/laser_power_up.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/param_power_up.h (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.h (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.h (modified) * trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) * trunk/src/world_entities/power_ups/weapon_power_up.h (modified) * trunk/src/world_entities/projectiles/bomb.cc (modified) * trunk/src/world_entities/projectiles/bomb.h (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/skybox.h (modified) * trunk/src/world_entities/space_ships/helicopter.cc (modified) * trunk/src/world_entities/space_ships/helicopter.h (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/space_ships/space_ship.h (modified) * trunk/src/world_entities/spawning_point.cc (modified) * trunk/src/world_entities/spawning_point.h (modified) * trunk/src/world_entities/terrain.cc (modified) * trunk/src/world_entities/terrain.h (modified) * trunk/src/world_entities/test_entity.cc (modified) * trunk/src/world_entities/test_entity.h (modified) * trunk/src/world_entities/weapons/aim.cc (modified) * trunk/src/world_entities/weapons/aim.h (modified) * trunk/src/world_entities/weapons/aiming_turret.cc (modified) * trunk/src/world_entities/weapons/aiming_turret.h (modified) * trunk/src/world_entities/weapons/cannon.cc (modified) * trunk/src/world_entities/weapons/cannon.h (modified) * trunk/src/world_entities/weapons/crosshair.cc (modified) * trunk/src/world_entities/weapons/crosshair.h (modified) * trunk/src/world_entities/weapons/targeting_turret.cc (modified) * trunk/src/world_entities/weapons/targeting_turret.h (modified) * trunk/src/world_entities/weapons/test_gun.cc (modified) * trunk/src/world_entities/weapons/test_gun.h (modified) * trunk/src/world_entities/weapons/turret.cc (modified) * trunk/src/world_entities/weapons/turret.h (modified) * trunk/src/world_entities/weapons/weapon.cc (modified) * trunk/src/world_entities/weapons/weapon.h (modified) * trunk/src/world_entities/weapons/weapon_manager.cc (modified) * trunk/src/world_entities/weapons/weapon_manager.h (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) orxonox/trunk: loadParams is now virtual. ALL THE CLASSES HAVE TO ... Wed, 11 Jan 2006 20:58:22 GMT patrick [6498] * trunk/src/lib/coord/p_node.cc (modified) * trunk/src/lib/coord/p_node.h (modified) * trunk/src/lib/lang/base_object.cc (modified) * trunk/src/lib/network/network_game_manager.cc (modified) * trunk/src/lib/network/network_game_manager.h (modified) * trunk/src/lib/network/network_stream.cc (modified) * trunk/src/story_entities/game_world.cc (modified) * trunk/src/story_entities/game_world.h (modified) * trunk/src/story_entities/multi_player_world.cc (modified) * trunk/src/story_entities/multi_player_world.h (modified) * trunk/src/story_entities/multi_player_world_data.cc (modified) * trunk/src/story_entities/multi_player_world_data.h (modified) * trunk/src/util/hud.cc (modified) * trunk/src/util/state.cc (modified) * trunk/src/util/state.h (modified) * trunk/src/world_entities/power_ups/param_power_up.cc (modified) * trunk/src/world_entities/power_ups/power_up.cc (modified) * trunk/src/world_entities/power_ups/turret_power_up.cc (modified) * trunk/src/world_entities/skybox.cc (modified) * trunk/src/world_entities/space_ships/space_ship.cc (modified) * trunk/src/world_entities/world_entity.cc (modified) * trunk/src/world_entities/world_entity.h (modified) trunk: merged the network branche into the trunk Wed, 11 Jan 2006 11:28:17 GMT bensch [6471] * trunk/src/lib/graphics/importer/vertex_array_model.cc (modified) * trunk/src/world_entities/environments/water.cc (modified) orxonox/trunk: testing, but not working