Author Topic: Nightly (Linux): 28 May 2009 - Revision 5317  (Read 851 times)

0 Members and 1 Guest are viewing this topic.

Offline SirKnightly

  • George or Keira?
  • 211
Nightly (Linux): 28 May 2009 - Revision 5317
Here is the nightly for Linux on 28 May 2009 - Revision 5317

fso-LINUX-20090528_r5317.tar.bz2
MD5Sum

Code: [Select]
------------------------------------------------------------------------
r5229 | karajorma | 2009-05-12 16:30:17 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/chatbox.cpp
   M /trunk/fs2_open/code/network/multi_pmsg.cpp
   M /trunk/fs2_open/code/network/multimsgs.cpp

Allow players to filter who they send messages to when using the chatbox
------------------------------------------------------------------------
r5230 | karajorma | 2009-05-12 16:49:41 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/mission/missionbriefcommon.cpp
   M /trunk/fs2_open/code/mission/missionbriefcommon.h
   M /trunk/fs2_open/code/missionui/fictionviewer.cpp
   M /trunk/fs2_open/code/parse/parselo.cpp
   M /trunk/fs2_open/code/parse/parselo.h

Fix the FictionViewer truncating anything with more than 70 lines.
------------------------------------------------------------------------
r5231 | karajorma | 2009-05-12 16:53:12 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudsquadmsg.cpp

Fix Mantis 1913 (Characters after # are visible in the wings and reinforcements comms menu)
------------------------------------------------------------------------
r5232 | karajorma | 2009-05-12 16:55:49 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp

Fix Mantis 1538 (special hitpoints not updated properly on deletion)
------------------------------------------------------------------------
r5233 | karajorma | 2009-05-12 17:03:39 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/missiondebrief.cpp

Allow the boilerplate traitor debrief to be turned off even if the player did turn traitor.
------------------------------------------------------------------------
r5234 | karajorma | 2009-05-12 17:05:43 -0500 (Tue, 12 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudparse.cpp
   M /trunk/fs2_open/code/hud/hudtargetbox.cpp
   M /trunk/fs2_open/code/hud/hudtargetbox.h
   M /trunk/fs2_open/code/io/keycontrol.cpp

Allow wireframe for the targetbox to be set from hud_gauges.tbl.
------------------------------------------------------------------------
r5235 | Wanderer | 2009-05-13 17:03:30 -0500 (Wed, 13 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/radar/radarorb.cpp

tweak to keep all 3d radar dots inside the retail radar bitmap area - Mantis 1908
------------------------------------------------------------------------
r5236 | karajorma | 2009-05-14 09:08:07 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/parselo.cpp
   M /trunk/fs2_open/code/parse/parselo.h

A couple of new parsing functions for dealing with variables in fields that previously only accepted integers or strings.
------------------------------------------------------------------------
r5237 | karajorma | 2009-05-14 10:06:52 -0500 (Thu, 14 May 2009) | 3 lines
Changed paths:
   A /trunk/fs2_open/code/fred2/AltShipClassDlg.cpp (from /branches/karajorma/code/fred2/AltShipClassDlg.cpp:4669)
   A /trunk/fs2_open/code/fred2/AltShipClassDlg.h (from /branches/karajorma/code/fred2/AltShipClassDlg.h:4669)
   M /trunk/fs2_open/code/fred2/briefingeditordlg.cpp
   M /trunk/fs2_open/code/fred2/debriefingeditordlg.cpp
   M /trunk/fs2_open/code/fred2/dumpstats.cpp
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/freddoc.cpp
   M /trunk/fs2_open/code/fred2/management.cpp
   M /trunk/fs2_open/code/fred2/management.h
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/modifyvariabledlg.cpp
   M /trunk/fs2_open/code/fred2/modifyvariabledlg.h
   M /trunk/fs2_open/code/fred2/playerstarteditor.cpp
   M /trunk/fs2_open/code/fred2/playerstarteditor.h
   M /trunk/fs2_open/code/fred2/resource.h
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp
   M /trunk/fs2_open/code/fred2/sexp_tree.h
   M /trunk/fs2_open/code/fred2/shipeditordlg.cpp
   M /trunk/fs2_open/code/fred2/shipeditordlg.h
   M /trunk/fs2_open/code/fred2/shipflagsdlg.cpp
   M /trunk/fs2_open/code/fred2/shipflagsdlg.h
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/missionui/missionshipchoice.cpp
   M /trunk/fs2_open/code/missionui/missionweaponchoice.cpp
   M /trunk/fs2_open/code/missionui/redalert.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/ship/shiphit.cpp
   M /trunk/fs2_open/code/stats/scoring.cpp
   M /trunk/fs2_open/code/stats/scoring.h
   M /trunk/fs2_open/code/weapon/weapons.cpp
   M /trunk/fs2_open/projects/MSVC_2008/Fred2.vcproj

Changes to allow more data to be used from exited_ship. Make ship_exited dynamic too.
Get-Damage-Caused SEXP and a couple of functions for counting the number of variables of a certain type.
Commit the new team loadout code and FRED changes to support it.
------------------------------------------------------------------------
r5238 | karajorma | 2009-05-14 11:26:37 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/shiphit.cpp

Fix a bug where the log displays incorrect percentages for kills.
------------------------------------------------------------------------
r5239 | karajorma | 2009-05-14 11:27:36 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/management.cpp
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/missionsave.h
   M /trunk/fs2_open/code/freespace2/freespace.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/missionui/missionscreencommon.cpp
   M /trunk/fs2_open/code/missionui/missionscreencommon.h

Add support for cutscenes before the various briefing and debriefing sections (FRED support for this feature will come later, but it will load and save correctly for now).
------------------------------------------------------------------------
r5240 | karajorma | 2009-05-14 11:37:11 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Add new sexps to determine the amount of afterburner and weapon energy remaining.
------------------------------------------------------------------------
r5241 | karajorma | 2009-05-14 11:38:02 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   D /trunk/fs2_open/code/freespace2/app_icon_glow.ico

Due to a merge, delete a file which was never in trunk anyway.
------------------------------------------------------------------------
r5242 | karajorma | 2009-05-14 11:52:56 -0500 (Thu, 14 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/freddoc.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/parse/parselo.cpp

Fix Mantis 1859 (FRED crashes if an unknown ship type is detected in the loadout).
------------------------------------------------------------------------
r5243 | karajorma | 2009-05-14 12:12:23 -0500 (Thu, 14 May 2009) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Add the validate-argument SEXP.
Fix a minor initialisation error with the ship-tag SEXP.
Fix Mantis 1907 (Error in the get-damage-caused description)
------------------------------------------------------------------------
r5244 | karajorma | 2009-05-15 12:34:46 -0500 (Fri, 15 May 2009) | 1 line
Changed paths:
   A /trunk/fs2_open/code/freespace2/app_icon_glow.ico

Looks like that icon was needed after all.
------------------------------------------------------------------------
r5245 | karajorma | 2009-05-15 12:53:38 -0500 (Fri, 15 May 2009) | 1 line
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/aicode.cpp
   M /trunk/fs2_open/code/globalincs/def_files.cpp

Move the repair penalty to an AI profile setting.
------------------------------------------------------------------------
r5246 | karajorma | 2009-05-15 13:32:46 -0500 (Fri, 15 May 2009) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/mission/missiongoals.cpp
   M /trunk/fs2_open/code/network/multi.cpp
   M /trunk/fs2_open/code/network/multi.h
   A /trunk/fs2_open/code/network/multi_sexp.cpp (from /branches/karajorma/code/network/multi_sexp.cpp:5162)
   A /trunk/fs2_open/code/network/multi_sexp.h (from /branches/karajorma/code/network/multi_sexp.h:5162)
   M /trunk/fs2_open/code/network/multimsgs.cpp
   M /trunk/fs2_open/code/network/multimsgs.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/projects/MSVC_2008/code.vcproj

Commit the SEXP packet code.
Add the set-respawns SEXP.
------------------------------------------------------------------------
r5247 | karajorma | 2009-05-15 13:36:47 -0500 (Fri, 15 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/eventeditor.cpp

Fix an assertion that crops up when you have no selected message but click on delete message. Has the side effect of making the message editor much less annoying too.
------------------------------------------------------------------------
r5248 | karajorma | 2009-05-15 13:38:24 -0500 (Fri, 15 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp

Auto-expand branches after pasting, add-pasting or replacing SEXPs. I really don't know why someone didn't get rid of that petty annoyance years ago.
------------------------------------------------------------------------
r5250 | karajorma | 2009-05-16 07:32:46 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/mission/missionparse.cpp

Echelon 9's fix for a potential buffer overrun.
------------------------------------------------------------------------
r5252 | karajorma | 2009-05-16 07:55:11 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Add SEXPs to set weapon, shield and afterburner energy.
------------------------------------------------------------------------
r5253 | karajorma | 2009-05-16 07:56:26 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Fix a bug where the order of SEXP arguments was reversed.
------------------------------------------------------------------------
r5254 | karajorma | 2009-05-16 08:03:59 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Break up the status SEXPs into sub-categories.
------------------------------------------------------------------------
r5255 | karajorma | 2009-05-16 09:06:23 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/initialstatus.cpp
   M /trunk/fs2_open/code/fred2/initialstatus.h
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/resource.h
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/ship/ship.h

Add a ship and parse flag to lock all turrets initially. Fix the Lock Primary/Secondary checkboxes to work for multi-selection. Add a checkbox for lock afterburner. Add the weapon fired since SEXPs
------------------------------------------------------------------------
r5256 | karajorma | 2009-05-16 11:20:45 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/network/multi_sexp.cpp
   M /trunk/fs2_open/code/object/object.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp

More minor fixes.
------------------------------------------------------------------------
r5257 | karajorma | 2009-05-16 11:29:41 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/network/multimsgs.cpp
   M /trunk/fs2_open/code/network/multimsgs.h

Allow multi-docking in multiplayer.
------------------------------------------------------------------------
r5258 | karajorma | 2009-05-16 11:38:49 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Add the set-ambient-light SEXP
------------------------------------------------------------------------
r5259 | karajorma | 2009-05-16 11:58:22 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Switch network variables over to the SEXP packet except for when called from lua
------------------------------------------------------------------------
r5260 | karajorma | 2009-05-16 12:32:53 -0500 (Sat, 16 May 2009) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/mission/missionmessage.cpp
   M /trunk/fs2_open/code/mission/missionmessage.h
   M /trunk/fs2_open/code/playerman/playercontrol.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/ship/shiphit.cpp

AddAdd support for multiple builtins of the same type and new builtin message types Praise Self, High Praise and Primaries Low

------------------------------------------------------------------------
r5261 | karajorma | 2009-05-16 13:01:08 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/management.cpp
   M /trunk/fs2_open/code/fred2/playerstarteditor.cpp
   M /trunk/fs2_open/code/mission/missionmessage.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/network/multi_pmsg.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/shipfx.cpp
   M /trunk/fs2_open/code/ship/shipfx.h

WMC's shipFX changes. Some other minor fixes.
------------------------------------------------------------------------
r5262 | chief1983 | 2009-05-16 14:09:55 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/Xcode/Info.plist

Update Xcode's Info.plist to 3.6.11
------------------------------------------------------------------------
r5263 | karajorma | 2009-05-16 14:41:05 -0500 (Sat, 16 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/network/multi.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/weapon/swarm.cpp
   M /trunk/fs2_open/code/weapon/swarm.h

Commit Wanderer's Salvo Fire mode changes.
------------------------------------------------------------------------
r5264 | karajorma | 2009-05-17 06:50:48 -0500 (Sun, 17 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/ai_profiles.cpp
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/ai/aigoals.cpp
   M /trunk/fs2_open/code/asteroid/asteroid.cpp
   M /trunk/fs2_open/code/autopilot/autopilot.cpp
   M /trunk/fs2_open/code/cmdline/cmdline.cpp
   M /trunk/fs2_open/code/cutscene/cutscenes.cpp
   M /trunk/fs2_open/code/cutscene/decoder16.cpp
   M /trunk/fs2_open/code/cutscene/decoder8.cpp
   M /trunk/fs2_open/code/cutscene/mvelib.cpp
   M /trunk/fs2_open/code/debugconsole/console.cpp
   M /trunk/fs2_open/code/fred2/fredview.cpp
   M /trunk/fs2_open/code/fred2/management.cpp
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp
   M /trunk/fs2_open/code/gamesnd/eventmusic.cpp
   M /trunk/fs2_open/code/graphics/gropengl.cpp
   M /trunk/fs2_open/code/hud/hudbrackets.cpp
   M /trunk/fs2_open/code/hud/hudsquadmsg.cpp
   M /trunk/fs2_open/code/hud/hudtarget.cpp
   M /trunk/fs2_open/code/io/keycontrol.cpp
   M /trunk/fs2_open/code/lab/lab.cpp
   M /trunk/fs2_open/code/lighting/lighting.cpp
   M /trunk/fs2_open/code/localization/localize.cpp
   M /trunk/fs2_open/code/math/vecmat.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/object/object.cpp
   M /trunk/fs2_open/code/osapi/osapi.cpp
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/popup/popup.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/sound/sound.cpp

Portej05's preFAST warning fixes.
------------------------------------------------------------------------
r5266 | karajorma | 2009-05-17 07:35:52 -0500 (Sun, 17 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/parselo.cpp

Fix Mantis 1925 (Loadout lists may contain ships and weapons which are not been flagged as player allowed).
------------------------------------------------------------------------
r5267 | Wanderer | 2009-05-18 15:36:11 -0500 (Mon, 18 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/radar/radar.cpp
   M /trunk/fs2_open/code/radar/radarorb.cpp
   M /trunk/fs2_open/code/weapon/weapons.cpp

initial merge from wanderer branch - fixes to corkscrew missile effects
------------------------------------------------------------------------
r5269 | karajorma | 2009-05-18 17:00:01 -0500 (Mon, 18 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Fix Mantis 1926 (Piranha submunitions home in on the ship that fired them in dogfight mode)
------------------------------------------------------------------------
r5270 | Wanderer | 2009-05-18 17:08:13 -0500 (Mon, 18 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/graphics/2d.h
   M /trunk/fs2_open/code/graphics/gropengldraw.cpp
   M /trunk/fs2_open/code/graphics/gropengldraw.h
   M /trunk/fs2_open/code/graphics/gropenglstate.cpp
   M /trunk/fs2_open/code/graphics/gropengltexture.cpp
   M /trunk/fs2_open/code/graphics/gropengltnl.cpp
   M /trunk/fs2_open/code/graphics/grstub.cpp
   M /trunk/fs2_open/code/graphics/tmapper.h
   M /trunk/fs2_open/code/radar/radar.cpp
   M /trunk/fs2_open/code/radar/radar.h
   M /trunk/fs2_open/code/radar/radarorb.cpp
   M /trunk/fs2_open/code/radar/radarorb.h
   M /trunk/fs2_open/code/radar/radarsetup.h
   M /trunk/fs2_open/code/render/3ddraw.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch. 2d and 3d radar images support
------------------------------------------------------------------------
r5271 | Wanderer | 2009-05-19 11:53:05 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/shipfx.cpp

quick jury rigging to prevent stream of null vec warnings caused by r5261
------------------------------------------------------------------------
r5272 | Wanderer | 2009-05-19 12:20:18 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/globalincs/def_files.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch '$Turrets prioritize ship target:' objecttypes flag
------------------------------------------------------------------------
r5273 | chief1983 | 2009-05-19 13:17:31 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/Makefile.am

Add SEXP stuff to Linux Makefile.am
------------------------------------------------------------------------
r5274 | Wanderer | 2009-05-19 14:29:41 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

merge from wanderer branch - smart spawn weapon flag
------------------------------------------------------------------------
r5275 | Wanderer | 2009-05-19 14:40:06 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

merge from wanderer branch - phreak's inherit parent target weapon flag
------------------------------------------------------------------------
r5276 | Wanderer | 2009-05-19 16:17:48 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fredrender.cpp
   M /trunk/fs2_open/code/hud/hud.cpp
   M /trunk/fs2_open/code/hud/hudtargetbox.cpp
   M /trunk/fs2_open/code/iff_defs/iff_defs.cpp
   M /trunk/fs2_open/code/iff_defs/iff_defs.h
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/network/multi.cpp
   M /trunk/fs2_open/code/network/multi.h
   M /trunk/fs2_open/code/network/multimsgs.cpp
   M /trunk/fs2_open/code/network/multimsgs.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/radar/radar.cpp
   M /trunk/fs2_open/code/radar/radarorb.cpp
   M /trunk/fs2_open/code/radar/radarsetup.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch - alt iff colors
------------------------------------------------------------------------
r5277 | chief1983 | 2009-05-19 17:02:48 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/network/multi_sexp.cpp
   M /trunk/fs2_open/code/network/multi_sexp.h

Convert these to UNIX again, hope they compile this time...
------------------------------------------------------------------------
r5278 | chief1983 | 2009-05-19 17:13:12 -0500 (Tue, 19 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/configure.ac

Bump linux version to 3.6.11
------------------------------------------------------------------------
r5279 | Wanderer | 2009-05-20 04:46:45 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch - no subsystem targeting flag for turrets
------------------------------------------------------------------------
r5280 | Wanderer | 2009-05-20 07:24:45 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/math/vecmat.cpp
   M /trunk/fs2_open/code/math/vecmat.h
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/model/modelread.cpp
   M /trunk/fs2_open/code/object/objectsnd.cpp
   M /trunk/fs2_open/code/object/objectsnd.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h
   M /trunk/fs2_open/code/ship/shiphit.cpp

merge from wanderer branch - subsys/turret sounds
------------------------------------------------------------------------
r5281 | Wanderer | 2009-05-20 08:24:57 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp
   M /trunk/fs2_open/code/math/vecmat.cpp
   M /trunk/fs2_open/code/math/vecmat.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/swarm.cpp

merge from wanderer branch - fixed firingpoint and 'fire on target' subsystem flags
------------------------------------------------------------------------
r5282 | Wanderer | 2009-05-20 09:13:58 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

merge from wanderer branch - autoaim/convergence improvements and variants
------------------------------------------------------------------------
r5283 | Wanderer | 2009-05-20 09:23:19 -0500 (Wed, 20 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

addition to the rotate sound to toggle it on if rotation is re-enabled via sexps
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r5298 | karajorma | 2009-05-21 09:57:33 -0500 (Thu, 21 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/bgbitmapdlg.cpp
   M /trunk/fs2_open/code/fred2/bgbitmapdlg.h
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/management.cpp
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/resource.h
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/mission/missionparse.h
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/model/modelinterp.cpp
   M /trunk/fs2_open/code/model/modelread.cpp
   M /trunk/fs2_open/code/network/multi.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/starfield/starfield.cpp
   M /trunk/fs2_open/code/starfield/starfield.h
   M /trunk/fs2_open/code/weapon/weapon.h

Bobboau's Skybox flags code (via Wanderer then me)
------------------------------------------------------------------------
r5302 | Wanderer | 2009-05-23 02:06:11 -0500 (Sat, 23 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/playerman/player.h
   M /trunk/fs2_open/code/playerman/playercontrol.cpp

merge from wanderer branch - lua flight control option
------------------------------------------------------------------------
r5303 | Wanderer | 2009-05-23 02:29:56 -0500 (Sat, 23 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/io/mouse.h
   M /trunk/fs2_open/code/parse/lua.cpp

merge from wanderer branch - additional options for lua mouse control
------------------------------------------------------------------------
r5304 | Wanderer | 2009-05-23 14:22:05 -0500 (Sat, 23 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp

fixing the number of lua enumerations
------------------------------------------------------------------------
r5305 | Wanderer | 2009-05-24 02:09:16 -0500 (Sun, 24 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

fix for the release build crash reported by HT
------------------------------------------------------------------------
r5307 | karajorma | 2009-05-24 16:38:22 -0500 (Sun, 24 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/createwingdlg.cpp
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/shiptexturesdlg.cpp
   M /trunk/fs2_open/code/fred2/voiceactingmanager.cpp
   M /trunk/fs2_open/code/fred2/wing_editor.cpp
   M /trunk/fs2_open/code/gamesnd/eventmusic.cpp
   M /trunk/fs2_open/code/graphics/generic.cpp
   M /trunk/fs2_open/code/graphics/gropengldraw.cpp
   M /trunk/fs2_open/code/hud/hudsquadmsg.cpp
   M /trunk/fs2_open/code/iff_defs/iff_defs.cpp
   M /trunk/fs2_open/code/mission/missionparse.cpp
   M /trunk/fs2_open/code/missionui/missionweaponchoice.cpp
   M /trunk/fs2_open/code/model/modelinterp.cpp
   M /trunk/fs2_open/code/network/multi_kick.cpp
   M /trunk/fs2_open/code/network/psnet2.cpp
   M /trunk/fs2_open/code/parse/lua.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/ship/shiphit.cpp
   M /trunk/fs2_open/code/species_defs/species_defs.cpp
   M /trunk/fs2_open/code/weapon/weapons.cpp

Portej05's second set of preFAST fixes.
------------------------------------------------------------------------
r5309 | Wanderer | 2009-05-25 16:16:00 -0500 (Mon, 25 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aiturret.cpp

fixing vector rotation issue in subsystem targeting
------------------------------------------------------------------------
r5314 | karajorma | 2009-05-28 08:00:26 -0500 (Thu, 28 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/globalincs/pstypes.h
   M /trunk/fs2_open/code/network/multi_sexp.cpp
   M /trunk/fs2_open/code/ship/ship.cpp

Fix compilation of Assertion on MSVC 6 and compilation of multi_sexp stuff on Mac OS X
------------------------------------------------------------------------
r5315 | chief1983 | 2009-05-28 16:32:46 -0500 (Thu, 28 May 2009) | 1 line
Changed paths:
   M /trunk/fs2_open/code/globalincs/pstypes.h

Committing for Karajorma since he's occupied - fixes Assertion code from breaking Linux now
------------------------------------------------------------------------