# # ChangeLog for branches/playability/src/world_entities/space_ships/space_ship.cc in orxonox.OLD # # Generated by Trac 1.0.9 # May 6, 2024, 6:05:40 AM Sun, 14 Jan 2007 15:34:23 GMT nicolasc [10235] * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/projectiles/projectile_weapon.cc (added) * branches/playability/src/world_entities/projectiles/projectile_weapon.h (added) * branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) * branches/playability/src/world_entities/projectiles/spike_ball.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) inital upload of projectile_weapon, started usage in spike_ball Thu, 11 Jan 2007 22:42:43 GMT muellmic [10233] * branches/playability/src/util/hud.cc (modified) * branches/playability/src/util/hud.h (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) energy bars are now changing its colors, adding hud overlay - very ... Wed, 10 Jan 2007 18:16:00 GMT muellmic [10230] * branches/playability/src/util/hud.cc (modified) * branches/playability/src/util/hud.h (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.h (modified) * branches/playability/src/world_entities/elements/glgui_radar.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon.h (modified) interface changes Wed, 10 Jan 2007 16:33:19 GMT nicolasc [10224] * branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) * branches/playability/src/world_entities/projectiles/spike_ball.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.cc (modified) * branches/playability/src/world_entities/weapons/spike_thrower.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) bump Wed, 10 Jan 2007 14:37:40 GMT nicolasc [10217] * branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) * branches/playability/src/world_entities/projectiles/spike_ball.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.h (modified) bump Mon, 08 Jan 2007 20:46:13 GMT nicolasc [10196] * branches/playability/src/world_entities/projectiles/projectile.h (modified) * branches/playability/src/world_entities/projectiles/spike.cc (modified) * branches/playability/src/world_entities/projectiles/spike.h (modified) * branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) * branches/playability/src/world_entities/projectiles/spike_ball.h (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.cc (modified) * branches/playability/src/world_entities/weapons/spike_thrower.cc (modified) just another upload GUI seems to work, but there are still some ... Mon, 08 Jan 2007 20:19:39 GMT muellmic [10194] * branches/playability/src/lib/gui/gl/glgui_box.cc (modified) * branches/playability/src/util/hud.cc (modified) * branches/playability/src/util/hud.h (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/world_entity.cc (modified) implementing interface 'by hand' without still buggy packing- ... Sun, 07 Jan 2007 13:50:47 GMT nicolasc [10188] * branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) * branches/playability/src/world_entities/projectiles/spike_ball.h (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.h (modified) updated spikeball/spike combo; still need to turn a projectile into a ... Wed, 03 Jan 2007 15:56:20 GMT nicolasc [10173] * branches/playability/src/world_entities/projectiles/spike.cc (modified) * branches/playability/src/world_entities/projectiles/spike.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) bump2 Wed, 03 Jan 2007 15:44:17 GMT nicolasc [10170] * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/spike.cc (added) * branches/playability/src/world_entities/projectiles/spike.h (added) * branches/playability/src/world_entities/projectiles/spike_ball.cc (added) * branches/playability/src/world_entities/projectiles/spike_ball.h (added) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) * branches/playability/src/world_entities/weapons/spike_launcher.cc (added) * branches/playability/src/world_entities/weapons/spike_launcher.h (added) EOD commit Wed, 03 Jan 2007 11:53:52 GMT nicolasc [10159] * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) bump Mon, 01 Jan 2007 20:51:49 GMT marcscha [10156] * branches/playability/src/world_entities/effects/wobblegrid.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) Addition of billboard calc to wobblegrid. Temp addition to show it of ... Mon, 01 Jan 2007 02:33:36 GMT marcscha [10155] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) Added fixme tag to testaddition of the wobblegrid on spaceship Mon, 01 Jan 2007 02:32:36 GMT marcscha [10154] * branches/playability/src/lib/graphics/importer/vertex_array_model.cc (modified) * branches/playability/src/world_entities/Makefile.am (modified) * branches/playability/src/world_entities/effects/wobblegrid.cc (added) * branches/playability/src/world_entities/effects/wobblegrid.h (added) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) Wobblegrid addition for alienweapons Wed, 27 Dec 2006 11:03:36 GMT nicolasc [10152] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.h (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) * branches/playability/src/world_entities/weapons/light_blaster.h (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon.h (modified) finished animation on heavy blaster, started light blaster code ... Thu, 21 Dec 2006 23:21:38 GMT muellmic [10139] * branches/playability/src/lib/gui/gl/glgui_bar.cc (modified) * branches/playability/src/lib/gui/gl/glgui_box.cc (modified) * branches/playability/src/util/hud.cc (modified) * branches/playability/src/util/hud.h (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/world_entity.cc (modified) trying to adjust interface Wed, 20 Dec 2006 18:45:55 GMT nicolasc [10133] * branches/playability/src/lib/graphics/importer/objModel.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.h (modified) animation in heavy blaster Wed, 20 Dec 2006 16:36:18 GMT marcscha [10132] * branches/playability/src/world_entities/effects/trail.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) Firing Echo fix on WM Wed, 20 Dec 2006 12:09:05 GMT marcscha [10121] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) Deactivate Fix Wed, 20 Dec 2006 11:02:01 GMT muellmic [10120] * branches/playability/src/util/hud.cc (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (modified) * branches/playability/src/world_entities/player.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/world_entity.cc (modified) some interface hacks Wed, 20 Dec 2006 08:58:14 GMT marcscha [10119] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) Armor -> Health interconnection for UI Tue, 19 Dec 2006 23:31:27 GMT marcscha [10117] * branches/playability/src/world_entities/projectiles/lbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.h (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) Last update, collision working again. SEGFAULT problems Tue, 19 Dec 2006 22:39:59 GMT marcscha [10113] * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) * branches/playability/src/world_entities/world_entity.cc (modified) Collision fixes, further additions Tue, 19 Dec 2006 22:14:27 GMT nicolasc [10109] * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) bump Tue, 19 Dec 2006 21:03:19 GMT marcscha [10107] * branches/playability/src/world_entities/Makefile.am (modified) * branches/playability/src/world_entities/effects/trail.cc (modified) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.cc (added) * branches/playability/src/world_entities/elements/glgui_energywidgetvertical.h (added) * branches/playability/src/world_entities/particles/emitter_node.cc (modified) * branches/playability/src/world_entities/particles/emitter_node.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) * branches/playability/src/world_entities/world_entity.h (modified) many additions, several fixes Tue, 19 Dec 2006 16:13:25 GMT muellmic [10099] * branches/playability/src/world_entities/elements/glgui_energywidget.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) conflict at end of movement switch resolved for 10012312112th time ... Tue, 19 Dec 2006 15:08:04 GMT marcscha [10098] * branches/playability/src/world_entities/particles/emitter_node.cc (modified) * branches/playability/src/world_entities/particles/emitter_node.h (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) addition of local travel speed, removal of path hacks Tue, 19 Dec 2006 13:52:29 GMT bknecht [10096] * branches/playability/src/util/track/track.cc (modified) * branches/playability/src/util/track/track.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/world_entity.cc (modified) * branches/playability/src/world_entities/world_entity.h (modified) connected the track with the worldentities and the spaceship Tue, 19 Dec 2006 10:18:22 GMT marcscha [10095] * branches/playability/src/world_entities/effects/trail.cc (modified) * branches/playability/src/world_entities/effects/trail.h (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) velocity fix Mon, 18 Dec 2006 19:39:38 GMT muellmic [10092] * branches/playability/src/lib/gui/gl/glgui_widget.cc (modified) * branches/playability/src/lib/gui/gl/glgui_widget.h (modified) * branches/playability/src/util/hud.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) work of last week: radar set-up, Gui- Widget class draws itself ... Sat, 16 Dec 2006 01:12:41 GMT marcscha [10081] * branches/playability/src/world_entities/Makefile.am (modified) * branches/playability/src/world_entities/effects/trail.cc (added) * branches/playability/src/world_entities/effects/trail.h (added) * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.h (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) Some surprises for comming wednesday Thu, 14 Dec 2006 09:58:41 GMT marcscha [10078] * branches/playability/src/world_entities/particles/emitter_node.cc (modified) * branches/playability/src/world_entities/particles/emitter_node.h (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) Update in swarm launcher, swarm missile, mbolt Wed, 13 Dec 2006 21:30:51 GMT marcscha [10073] * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/particles/particle_emitter.h (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.h (modified) Emitter Node implemented, first steps for swarm missile in Wed, 13 Dec 2006 14:19:40 GMT marcscha [10064] * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.h (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) weapon, collision, particles Tue, 12 Dec 2006 17:27:39 GMT muellmic [10043] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) updated accel / maxSpeed calculation, updated burst-emitter calculation Sun, 10 Dec 2006 12:51:44 GMT nicolasc [10037] * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) added some comments made swarm missile spin Sun, 10 Dec 2006 12:08:50 GMT nicolasc [10036] * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/projectiles/mbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.h (modified) equalized energy usage of all blasters solved the fire echo problem, ... Wed, 06 Dec 2006 18:07:24 GMT muellmic [10032] * branches/playability/src/story_entities/game_world.cc (modified) * branches/playability/src/world_entities/playable.cc (modified) * branches/playability/src/world_entities/playable.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) changed roll- handling at left/right translation Wed, 06 Dec 2006 16:35:28 GMT marcscha [10030] * branches/playability/src/util/hud.cc (modified) * branches/playability/src/world_entities/player.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) Second Weapon Ammo Widget Support Wed, 06 Dec 2006 15:49:40 GMT marcscha [10024] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) electronic addition Wed, 06 Dec 2006 15:47:06 GMT marcscha [10023] * branches/playability/src/defs/class_id_DEPRECATED.h (modified) * branches/playability/src/util/hud.cc (modified) * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/player.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/swarm_launcher.cc (added) * branches/playability/src/world_entities/weapons/swarm_launcher.h (added) * branches/playability/src/world_entities/weapons/swarm_missile.cc (deleted) * branches/playability/src/world_entities/weapons/swarm_missile.h (deleted) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) little modifications to swarm launcher Wed, 06 Dec 2006 13:38:25 GMT nicolasc [10022] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) finished systemFailure(), included RNG Wed, 06 Dec 2006 12:48:58 GMT nicolasc [10021] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) cleaned space_ship.cc Wed, 06 Dec 2006 12:11:02 GMT nicolasc [10020] * branches/playability/src/world_entities/projectiles/projectile.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) Tue, 05 Dec 2006 21:47:43 GMT muellmic [10019] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) finally: vertical scroller moves implemented :-) Tue, 05 Dec 2006 18:14:05 GMT muellmic [10017] * branches/playability/src/util/state.h (modified) * branches/playability/src/world_entities/player.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) implementing new scroller controls but still probs with camera Tue, 05 Dec 2006 09:29:13 GMT nicolasc [10016] * branches/playability/ChangeLog (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) space_ship cleanup, ChangeLog update Sun, 03 Dec 2006 21:36:50 GMT marcscha [10004] * branches/playability/ChangeLog (modified) * branches/playability/src/defs/class_id_DEPRECATED.h (modified) * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/projectiles/swarm_projectile.cc (added) * branches/playability/src/world_entities/projectiles/swarm_projectile.h (added) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/swarm_missile.cc (added) * branches/playability/src/world_entities/weapons/swarm_missile.h (added) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.h (modified) see changelog Sun, 03 Dec 2006 19:02:30 GMT nicolasc [10001] * branches/playability (modified) * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/projectiles/hbolt.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) reactivated rotation in hbolt.cc Sun, 03 Dec 2006 18:40:07 GMT marcscha [9998] * branches/playability/ChangeLog (modified) * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/projectiles/bolt.cc (modified) * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.h (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.h (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.h (modified) multiple weapons, crosshair visibility -> changelog Sun, 03 Dec 2006 17:34:43 GMT nicolasc [9996] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) updated spaceship to use all 3 blasters, set timing in medium blaster Sun, 03 Dec 2006 14:26:08 GMT nicolasc [9987] * branches/playability/src/world_entities/projectiles/hbolt.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/test_entity2.cc (modified) update regen(); add new model for hbolt Wed, 29 Nov 2006 21:30:03 GMT nicolasc [9979] * branches/playability/ChangeLog (modified) * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/projectiles/bolt.cc (modified) * branches/playability/src/world_entities/projectiles/bolt.h (modified) * branches/playability/src/world_entities/projectiles/hbolt.cc (added) * branches/playability/src/world_entities/projectiles/hbolt.h (added) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/test_entity2.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) created hbolt.[cc,h], copied from laser, used in heavy blaster ... Wed, 29 Nov 2006 16:15:10 GMT marcscha [9975] * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/player.cc (modified) * branches/playability/src/world_entities/player.h (modified) * branches/playability/src/world_entities/space_ships/playership.cc (deleted) * branches/playability/src/world_entities/space_ships/playership.h (deleted) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.cc (modified) * branches/playability/src/world_entities/weapons/heavy_blaster.h (modified) * branches/playability/src/world_entities/weapons/light_blaster.cc (modified) * branches/playability/src/world_entities/weapons/light_blaster.h (modified) * branches/playability/src/world_entities/weapons/medium_blaster.cc (modified) * branches/playability/src/world_entities/weapons/medium_blaster.h (modified) fixes Wed, 29 Nov 2006 15:22:38 GMT marcscha [9970] * branches/playability/src/world_entities/Makefile.am (modified) * branches/playability/src/world_entities/WorldEntities.am (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) modifications done this afternoon Wed, 29 Nov 2006 09:04:35 GMT marcscha [9966] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/weapons/weapon.cc (modified) * branches/playability/src/world_entities/weapons/weapon.h (modified) move of HUD update from SpaceShip to Weapon::increaseEnergy Tue, 28 Nov 2006 22:54:34 GMT marcscha [9965] * branches/playability/ChangeLog (modified) * branches/playability/src/util/hud.cc (modified) * branches/playability/src/util/hud.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/weapon.h (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) * branches/playability/src/world_entities/weapons/weapon_manager.h (modified) Modifications to ship, HUD,.. see changelog Tue, 28 Nov 2006 13:46:25 GMT nicolasc [9963] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) Add armorRegen for bioships (--> Zergs for starcraft); updated regen ... Sun, 26 Nov 2006 21:32:50 GMT marcscha [9962] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) small event handling fix Sun, 26 Nov 2006 21:15:51 GMT marcscha [9961] * branches/playability/src/world_entities/playable.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) * branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) Double Weapon Manager implementation Sun, 26 Nov 2006 10:44:49 GMT nicolasc [9959] * branches/playability/src/world_entities/projectiles/projectile.cc (modified) * branches/playability/src/world_entities/projectiles/projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) moved damage attr to proteced; collidesWith checks against SpaceShip ... Sat, 25 Nov 2006 23:31:01 GMT marcscha [9958] * branches/playability/src/world_entities/projectiles/projectile.cc (modified) * branches/playability/src/world_entities/projectiles/projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) Inline of damage get on projectile, part implementation of primary - ... Fri, 24 Nov 2006 22:58:23 GMT nicolasc [9957] * branches/playability/src/world_entities/projectiles/projectile.cc (modified) * branches/playability/src/world_entities/projectiles/projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) updated damage() to use tick added collidesWith() to Projectile Fri, 24 Nov 2006 08:10:24 GMT nicolasc [9953] * branches/playability/src/world_entities/projectiles/projectile.cc (modified) * branches/playability/src/world_entities/projectiles/projectile.h (modified) * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) renamed shield() to regen as Regenration Handler, defined damage in ... Thu, 23 Nov 2006 10:44:35 GMT nicolasc [9950] * branches/playability/src/world_entities/space_ships/space_ship.cc (modified) * branches/playability/src/world_entities/space_ships/space_ship.h (modified) some getAttr for GUI, damage and shield handlers Wed, 22 Nov 2006 13:57:49 GMT stefalie [9941] * branches/playability (copied) 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. ...