[SirKnightly]

Here is the nightly for Windows on 21 May 2009 - Revision 5297

fso-WIN-20090521_r5297.7z
MD5Sum

Code: [Select]

------------------------------------------------------------------------
r5284 | Wanderer | 2009-05-20 13:03:14 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aibig.cpp
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/model/modelread.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/beam.cpp

merge from wanderer branch - limited rotation turrets, reset idle turrets option
------------------------------------------------------------------------
r5285 | Wanderer | 2009-05-20 14:44:18 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/swarm.cpp

fix swarm issue - again
------------------------------------------------------------------------
r5286 | Wanderer | 2009-05-20 15:11:15 -0500 (Wed, 20 May 2009) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/ai/ai_profiles.cpp
   M /trunk/fs2_open/code/ai/ai_profiles.h
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/globalincs/def_files.cpp
   M /trunk/fs2_open/code/object/collideweaponweapon.cpp
   M /trunk/fs2_open/code/object/objcollide.cpp
   M /trunk/fs2_open/code/weapon/emp.cpp
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

merge from wanderer branch.
option to allow all hitpointed weapons to be hit.
allow 'safe from weapons' time of bombs be set.
------------------------------------------------------------------------
r5287 | Wanderer | 2009-05-20 15:43:01 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aibig.cpp
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch - turret target priorities setup
------------------------------------------------------------------------
r5288 | Wanderer | 2009-05-21 02:31:43 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/ship/ship.cpp

merge from wanderer branch - alt subsys name for damage popup
------------------------------------------------------------------------
r5289 | Wanderer | 2009-05-21 03:05:46 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp
   M /trunk/fs2_open/code/hud/hudtarget.cpp
   M /trunk/fs2_open/code/hud/hudtargetbox.cpp
   M /trunk/fs2_open/code/ship/shiphit.cpp

merge from wanderer branch - additions to alt subsys name from r5125
------------------------------------------------------------------------
r5290 | Wanderer | 2009-05-21 03:19:51 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aigoals.cpp
   M /trunk/fs2_open/code/hud/hudtargetbox.cpp
   M /trunk/fs2_open/code/mission/missionlog.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/playerman/playercontrol.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/shipfx.cpp
   M /trunk/fs2_open/code/weapon/emp.cpp

merge from wanderer branch - fix inconsistencies with subobj_name and name
------------------------------------------------------------------------
r5291 | Goober5000 | 2009-05-21 03:31:31 -0500 (Thu, 21 May 2009) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

fix ship-to-ship collisions; they should be disabled iff the ship has a no_collide flag, not iff the ship is a navbuoy
(fortunately, in retail, all navbuoys also have no_collide flags)
------------------------------------------------------------------------
r5292 | Goober5000 | 2009-05-21 03:33:02 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/freespace2/freespace.cpp

add Taylor's fix for Mantis 1768 (cutscene bars)
------------------------------------------------------------------------
r5293 | Wanderer | 2009-05-21 03:37:48 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/emp.cpp
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

merge from wanderer branch - emp protection option for weapon, emp resistant option for ships
------------------------------------------------------------------------
r5294 | Wanderer | 2009-05-21 03:50:31 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/trails.cpp
   M /trunk/fs2_open/code/weapon/trails.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

merge from wanderer branch - trail & contrail leading edge fade out option
------------------------------------------------------------------------
r5297 | karajorma | 2009-05-21 09:15:41 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

A piece of WMC's warp code that somehow missed being committed.
------------------------------------------------------------------------