Author Topic: Nightly (Linux): 20 Jun 2011 - Revision 7264  (Read 1009 times)

0 Members and 1 Guest are viewing this topic.

Offline SirKnightly

  • George or Keira?
  • 211
Nightly (Linux): 20 Jun 2011 - Revision 7264
Here is the nightly for Linux on 20 Jun 2011 - Revision 7264

Group: Inferno
fso-LINUX-Inferno-20110620_r7264.tar.bz2
MD5Sum

Code: [Select]
------------------------------------------------------------------------
r7109 | The_E | 2011-04-06 05:25:18 -0500 (Wed, 06 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudreticle.cpp

Removing an Assert in favour of more elegant error handling.

------------------------------------------------------------------------
r7110 | Echelon9 | 2011-04-08 07:38:19 -0500 (Fri, 08 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/missionweaponchoice.cpp

Fix two buffer overflows: missionweaponchoice.cpp(3580): warning C6386: Buffer overrun: accessing 'slot->wep', the writable size is '28' bytes, but '4194244' bytes might be written & missionweaponchoice.cpp(3585): warning C6386: Buffer overrun: accessing 'slot->wep_count', the writable size is '28' bytes, but '4194244' bytes might be written
------------------------------------------------------------------------
r7111 | Echelon9 | 2011-04-08 08:00:51 -0500 (Fri, 08 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/missionweaponchoice.cpp

Second go at patch r7110
------------------------------------------------------------------------
r7112 | Echelon9 | 2011-04-10 08:09:24 -0500 (Sun, 10 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudtarget.cpp

Documentation: hud_sensors_ok() function comment
------------------------------------------------------------------------
r7113 | The_E | 2011-04-11 10:44:33 -0500 (Mon, 11 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ship/shiphit.cpp

Requested by Axem: Allow beams to tag targets.

------------------------------------------------------------------------
r7115 | The_E | 2011-04-12 08:32:27 -0500 (Tue, 12 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ship/shiphit.cpp

Of course, I did it wrong. However, this works now.

------------------------------------------------------------------------
r7116 | Zacam | 2011-04-12 18:35:58 -0500 (Tue, 12 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ship/shiphit.cpp

Reported by chief1983, adds closing brace to line 2346.
Mac's should be happy now.
------------------------------------------------------------------------
r7119 | Wanderer | 2011-04-14 13:59:06 -0500 (Thu, 14 Apr 2011) | 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/ship/shipfx.cpp
   M /trunk/fs2_open/code/ship/shiphit.cpp

adds table controls for various particle effects, and explosions related to ship death event. per ship class base deathroll time.
------------------------------------------------------------------------
r7125 | The_E | 2011-04-15 07:16:17 -0500 (Fri, 15 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudmessage.cpp
   M /trunk/fs2_open/code/hud/hudmessage.h
   M /trunk/fs2_open/code/mission/missiontraining.cpp

Fix for Mantis 2240 (HUD anis and training messages do not display if hud_disable_except_messages is active)

------------------------------------------------------------------------
r7126 | The_E | 2011-04-15 07:34:11 -0500 (Fri, 15 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudmessage.cpp
   M /trunk/fs2_open/code/hud/hudparse.cpp

Fix for Mantis 2416 (Messages do not display when in padlock view)

------------------------------------------------------------------------
r7127 | The_E | 2011-04-15 07:44:24 -0500 (Fri, 15 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudparse.cpp

Woops, this shouldn't have gone in

------------------------------------------------------------------------
r7128 | Wanderer | 2011-04-15 09:34:31 -0500 (Fri, 15 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/shipfx.cpp

fix for issue noticed by Zacam in the particle effect changes
------------------------------------------------------------------------
r7132 | Echelon9 | 2011-04-16 19:18:59 -0500 (Sat, 16 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/math/floating.cpp

DOC: Documentation of floating.cpp
------------------------------------------------------------------------
r7133 | Echelon9 | 2011-04-16 19:33:51 -0500 (Sat, 16 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/math/floating.cpp

DOC: Amendment to frand_range()
------------------------------------------------------------------------
r7136 | karajorma | 2011-04-18 00:34:18 -0500 (Mon, 18 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Add a SEXP to allow variables to set the counter in a directive.
------------------------------------------------------------------------
r7138 | Sushi | 2011-04-18 09:08:31 -0500 (Mon, 18 Apr 2011) | 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

Add "$ai path mode:" to ai_profiles. This allows an alternate method of path following that works better in some cases, such as with high-damp ships.
------------------------------------------------------------------------
r7139 | IssMneur | 2011-04-19 23:16:42 -0500 (Tue, 19 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

Make this a more useful error message.
------------------------------------------------------------------------
r7140 | Wanderer | 2011-04-20 03:17:24 -0500 (Wed, 20 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/object/collideweaponweapon.cpp

Fix for mantis 2406 for weapon vs. weapon collisions (not beam vs. weapon collisions however)
------------------------------------------------------------------------
r7141 | Wanderer | 2011-04-20 10:40:29 -0500 (Wed, 20 Apr 2011) | 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/globalincs/def_files.cpp
   M /trunk/fs2_open/code/weapon/beam.cpp

related to mantis 2406 - ai profiles option to make beams deal damage to weapons
------------------------------------------------------------------------
r7143 | The_E | 2011-04-21 11:12:54 -0500 (Thu, 21 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/weapon/trails.cpp

Guarding against a null vec3D in vm_vec_normalize here.

------------------------------------------------------------------------
r7144 | Wanderer | 2011-04-23 07:18:30 -0500 (Sat, 23 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/swarm.cpp

fix for mantis 2309's corkscrew issue
------------------------------------------------------------------------
r7145 | Wanderer | 2011-04-23 16:53:19 -0500 (Sat, 23 Apr 2011) | 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/model/modelread.cpp

fixes to turret rotation handling (swarm issue) and to secondary turret angle checks
------------------------------------------------------------------------
r7146 | The_E | 2011-04-24 12:19:21 -0500 (Sun, 24 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp
   M /trunk/fs2_open/code/hud/hud.h

Fixes issue with custom HUD gauges not resetting to their default values between missions.

------------------------------------------------------------------------
r7148 | The_E | 2011-04-26 04:24:54 -0500 (Tue, 26 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Fix for Mantis 2428: Decal parsing deprecation error

------------------------------------------------------------------------
r7149 | The_E | 2011-04-26 06:09:19 -0500 (Tue, 26 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Ooops, this armor type business isn't ready yet
------------------------------------------------------------------------
r7150 | The_E | 2011-04-26 06:13:56 -0500 (Tue, 26 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Okay. No more screwing around with this.

------------------------------------------------------------------------
r7152 | Sushi | 2011-04-27 09:22:22 -0500 (Wed, 27 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/ai.h
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

Add $Path Metadata and +departure rvec to ships.tbl
------------------------------------------------------------------------
r7153 | karajorma | 2011-04-28 07:46:01 -0500 (Thu, 28 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/fred2/sexp_tree.cpp

Fix for Mantis 2427 (Directive-Is-Variable SEXP doesn't allow you to change the variable name.

------------------------------------------------------------------------
r7155 | The_E | 2011-04-29 09:05:45 -0500 (Fri, 29 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/jumpnode/jumpnode.cpp
   M /trunk/fs2_open/code/jumpnode/jumpnode.h
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

set-jumpnode-name, as implemented by CommanderDJ
------------------------------------------------------------------------
r7156 | The_E | 2011-04-29 09:10:52 -0500 (Fri, 29 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Added warning to the sexp help for set-jumpnode-name
------------------------------------------------------------------------
r7157 | The_E | 2011-04-29 09:54:38 -0500 (Fri, 29 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

And now set-jumpnode-name is even multi compatible.
------------------------------------------------------------------------
r7158 | Echelon9 | 2011-04-30 01:18:03 -0500 (Sat, 30 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/ds.cpp

Documentation: sound/ds.cpp
------------------------------------------------------------------------
r7159 | Echelon9 | 2011-04-30 01:24:08 -0500 (Sat, 30 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj

Xcode project file: Generate debug builds with a DWARF plus dsym file, so that analysis tools can retrieve source code line numbers
------------------------------------------------------------------------
r7160 | The_E | 2011-04-30 11:23:05 -0500 (Sat, 30 Apr 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Change syntax and help text of the set-jumpnode-model sexp, as it was rather broken before.

------------------------------------------------------------------------
r7161 | Echelon9 | 2011-04-30 22:54:01 -0500 (Sat, 30 Apr 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp
   M /trunk/fs2_open/code/debugconsole/timerbar.cpp
   M /trunk/fs2_open/code/graphics/2d.cpp
   M /trunk/fs2_open/code/math/floating.cpp
   M /trunk/fs2_open/code/sound/ds.cpp

Documentation: Fix a few syntax errors reported in Doxygen's log
------------------------------------------------------------------------
r7162 | Echelon9 | 2011-05-01 01:05:48 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp
   M /trunk/fs2_open/code/hud/hud.h

Documentation: hud.cpp and hud.h files
------------------------------------------------------------------------
r7163 | Echelon9 | 2011-05-01 03:53:13 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp

As we don't do Unicode properly yet, this character corrupts. In French it still means Hat Back (joystick control)
------------------------------------------------------------------------
r7164 | Echelon9 | 2011-05-01 04:06:12 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/fs2open.Doxyfile

Documentation: Help save some trees
------------------------------------------------------------------------
r7165 | Echelon9 | 2011-05-01 06:07:26 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/ds.cpp

Fix Valgrind report: Use of uninitialised value &freq in alcGetIntergerv(); requires braces to address GCC crosses initialisation error due to the goto in this function
------------------------------------------------------------------------
r7166 | Echelon9 | 2011-05-01 06:59:40 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/model/modelanim.cpp
   M /trunk/fs2_open/code/model/modelanim.h

Documentation: Commentary for modelanim.cpp|h
------------------------------------------------------------------------
r7167 | Echelon9 | 2011-05-01 07:00:26 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/model/model.h
   M /trunk/fs2_open/code/ship/ship.cpp

Two small comment typo corrections for model.h and ship.cpp
------------------------------------------------------------------------
r7168 | Echelon9 | 2011-05-01 08:03:39 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/playerman/playercontrol.cpp

Fix Diaspora Mantis 772: Player is able to fire countermeasures when player-use-ai SEXP is used. Also document.
------------------------------------------------------------------------
r7169 | Echelon9 | 2011-05-01 09:59:31 -0500 (Sun, 01 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/ds.cpp

ds.cpp: Back this change back out until the wholesale change can be made at once
------------------------------------------------------------------------
r7170 | The_E | 2011-05-01 10:00:53 -0500 (Sun, 01 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Fix compile warnings here.

------------------------------------------------------------------------
r7171 | The_E | 2011-05-01 10:05:01 -0500 (Sun, 01 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Aargh, this might have been catastrophic

------------------------------------------------------------------------
r7173 | Sushi | 2011-05-07 06:31:30 -0500 (Sat, 07 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp

Updated "alt1" path mode so that it respects the cap-waypoint-speed SEXP.
------------------------------------------------------------------------
r7174 | The_E | 2011-05-08 06:17:34 -0500 (Sun, 08 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ai/aigoals.cpp
   M /trunk/fs2_open/code/globalincs/def_files.cpp
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

This makes the "Form on Wing" AI order accessible to FREDers as an AI goal.

------------------------------------------------------------------------
r7176 | The_E | 2011-05-10 10:26:46 -0500 (Tue, 10 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudparse.cpp

Fixes issue where both the 2D and 3D radars were visible at the same time. Code should now respet the commandline flags properly.

------------------------------------------------------------------------
r7178 | Echelon9 | 2011-05-12 08:43:00 -0500 (Thu, 12 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/anim/animplay.cpp
   M /trunk/fs2_open/code/anim/packunpack.cpp
   M /trunk/fs2_open/code/anim/packunpack.h

Documentation: Animation code function documentation
------------------------------------------------------------------------
r7179 | Echelon9 | 2011-05-12 08:43:42 -0500 (Thu, 12 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/render/3dclipper.cpp

Documentation: 3D clipper functions
------------------------------------------------------------------------
r7180 | Echelon9 | 2011-05-12 08:44:20 -0500 (Thu, 12 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/ai.cpp
   M /trunk/fs2_open/code/ai/ai.h

Documentation: First pass of AI code functions
------------------------------------------------------------------------
r7181 | Sushi | 2011-05-14 11:58:29 -0500 (Sat, 14 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/freespace2/freespace.cpp

Fix clipping problems with deathcam and cutscene bars.
------------------------------------------------------------------------
r7182 | The_E | 2011-05-15 03:38:22 -0500 (Sun, 15 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/model/modelread.cpp

Converting a few more Asserts to Assertions. Also added a graceful exit path.

------------------------------------------------------------------------
r7184 | The_E | 2011-05-17 09:57:33 -0500 (Tue, 17 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/cmdline/cmdline.cpp
   M /trunk/fs2_open/code/cmdline/cmdline.h
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp
   M /trunk/fs2_open/code/lab/lab.cpp

This will enable FXAA support in FSO (Read: Antialiasing as a post-process stage). In order to use it, the shaders found here: http://blueplanet.fsmods.net/E/stuff/FXAA-shaders.7z need to be in data/effects.

------------------------------------------------------------------------
r7186 | The_E | 2011-05-17 11:29:43 -0500 (Tue, 17 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp

Adding an error message in case FXAA shader compilation fails.

------------------------------------------------------------------------
r7188 | The_E | 2011-05-18 06:37:27 -0500 (Wed, 18 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/cmdline/cmdline.cpp
   M /trunk/fs2_open/code/cmdline/cmdline.h
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp
   M /trunk/fs2_open/code/lab/lab.cpp

Adding a bit of configurability to the FXAA business. This alters the F3 Lab so that the number keys correspond to FXAA presets (with 0 being lowest and fastest, default being 3). Also adds the "-fxaa_preset" commandline argument, which accepts a single int parameter. New Shaders needed to take full advantage of this, see forum thread (http://www.hard-light.net/forums/index.php?topic=76145.0) for details.

------------------------------------------------------------------------
r7190 | Sushi | 2011-05-18 19:50:27 -0500 (Wed, 18 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/shipfx.cpp
   M /trunk/fs2_open/code/ship/shipfx.h

Fix BSG warp effect shockwave
------------------------------------------------------------------------
r7195 | Zacam | 2011-05-19 07:20:22 -0500 (Thu, 19 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/gamesequence/gamesequence.cpp

Stupidest typo ever. "GS_STATE_END_OF_CAMPAIGN" not "_EMD_"
------------------------------------------------------------------------
r7196 | The_E | 2011-05-19 09:51:51 -0500 (Thu, 19 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/lab/lab.cpp

This will make the lab more useful, as it is now possible to adjust the bloom intensity on-the-fly by pressing b (for more bloom) or n (for less bloom).

------------------------------------------------------------------------
r7197 | The_E | 2011-05-19 16:32:02 -0500 (Thu, 19 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

Patch for bug encountered by Zacam: Ship model instance data was not being reset correctly when changing ship classes.
------------------------------------------------------------------------
r7199 | The_E | 2011-05-20 10:56:30 -0500 (Fri, 20 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp

Since bloom can now be changed in-game, we always need to compile the shaders.

------------------------------------------------------------------------
r7200 | The_E | 2011-05-21 12:07:41 -0500 (Sat, 21 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/globalincs/def_files.cpp
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp
   M /trunk/fs2_open/code/graphics/gropenglshader.cpp
   M /trunk/fs2_open/code/menuui/credits.cpp

Adding the FSU main shaders, FSU post-processing.tbl, as well as the post-processing and FXAA shaders to def_files.

------------------------------------------------------------------------
r7201 | Sushi | 2011-05-21 15:25:14 -0500 (Sat, 21 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

Update thruster rendering (consistently render based on acceleration instead of speed, don't render distant/tiny thrusters)
------------------------------------------------------------------------
r7203 | Sushi | 2011-05-24 09:40:57 -0500 (Tue, 24 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp

Fix some HUD gauges being rendered while viewing other ships externally
------------------------------------------------------------------------
r7204 | Sushi | 2011-05-24 10:03:09 -0500 (Tue, 24 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/sound/sound.cpp

Added an Assertion to help track down a sound error
------------------------------------------------------------------------
r7208 | Goober5000 | 2011-05-25 22:40:07 -0500 (Wed, 25 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

fix minor pierce-shields table flag bug (Mantis #2442)
------------------------------------------------------------------------
r7209 | Goober5000 | 2011-05-25 22:58:00 -0500 (Wed, 25 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/globalincs/def_files.cpp

break strings into bite-size pieces for ease of compiler digestion
------------------------------------------------------------------------
r7210 | The_E | 2011-05-26 15:45:12 -0500 (Thu, 26 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hud.cpp

Reverting commit 7203. If you wish to exclude certain gauges from rendering depending on camera mode, you need to edit that gauges's constructor function, NOT the canRender() method.
------------------------------------------------------------------------
r7211 | The_E | 2011-05-27 04:11:51 -0500 (Fri, 27 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/awacs.cpp

Patch for Mantis 2441 (friendly-stealth-invisible" flag doesn't work) from pyro3d
------------------------------------------------------------------------
r7212 | Sushi | 2011-05-27 09:36:14 -0500 (Fri, 27 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudreticle.cpp
   M /trunk/fs2_open/code/hud/hudtarget.cpp

Fixing some HUDs showing from other ships when they shouldn't, take 2
------------------------------------------------------------------------
r7213 | Zacam | 2011-05-27 18:38:14 -0500 (Fri, 27 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudparse.cpp

Back in r6952 "HUD_OBJECT_PING," was added to "static int retail_gauges[] = {" but "int num_default_gauges = 43;" was not bumped up, resulting in "HUD_OBJECT_FIXED_MESSAGES" not displaying.
------------------------------------------------------------------------
r7215 | The_E | 2011-05-28 09:37:48 -0500 (Sat, 28 May 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudparse.cpp

Adding a code comment here to remind people about necessary bumpings

------------------------------------------------------------------------
r7217 | Goober5000 | 2011-05-29 01:56:17 -0500 (Sun, 29 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/awacs.cpp

reverting 7211 because it is not a proper fix
------------------------------------------------------------------------
r7218 | Goober5000 | 2011-05-30 01:47:27 -0500 (Mon, 30 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/hud/hudmessage.cpp

fix sanity check for too-long messages (Mantis #2412)
------------------------------------------------------------------------
r7219 | The_E | 2011-05-30 13:47:27 -0500 (Mon, 30 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/graphics/2d.cpp
   M /trunk/fs2_open/code/io/keycontrol.cpp
   M /trunk/fs2_open/code/io/keycontrol.h

From m!m: Patch for Mantis 2446: Scripts not pausing when game is paused.
------------------------------------------------------------------------
r7221 | Goober5000 | 2011-05-30 16:06:11 -0500 (Mon, 30 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/fred2/fred.rc
   M /trunk/fs2_open/code/fred2/missionsave.cpp
   M /trunk/fs2_open/code/fred2/resource.h
   M /trunk/fs2_open/code/fred2/shipspecialdamage.cpp
   M /trunk/fs2_open/code/fred2/shipspecialdamage.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/ship/ship.h
   M /trunk/fs2_open/code/ship/shiphit.cpp

add ability to set the duration of the ship death roll
------------------------------------------------------------------------
r7222 | Goober5000 | 2011-05-30 16:20:32 -0500 (Mon, 30 May 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

extra small enhancement
------------------------------------------------------------------------
r7224 | The_E | 2011-06-01 14:41:07 -0500 (Wed, 01 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/lua.cpp
   M /trunk/fs2_open/code/particle/particle.cpp
   M /trunk/fs2_open/code/particle/particle.h

Patch for Mantis 2421 from m!m: Adds scripting controls for particles.
------------------------------------------------------------------------
r7226 | The_E | 2011-06-02 04:36:24 -0500 (Thu, 02 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp

Another Assert -> Assertion conversion to help in mission debugging.

------------------------------------------------------------------------
r7227 | Sushi | 2011-06-02 22:02:48 -0500 (Thu, 02 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ai/aicode.cpp

Fix nasty pointer bug
------------------------------------------------------------------------
r7228 | Zacam | 2011-06-03 00:18:10 -0500 (Fri, 03 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/model/modelread.cpp

In crawling through XT Branch, noticed this.
"%sÀÄ%s" should be "%s:%s"
------------------------------------------------------------------------
r7229 | chief1983 | 2011-06-03 11:53:39 -0500 (Fri, 03 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/graphics/2d.cpp

Fix a typo reported by ElGuillermo.
------------------------------------------------------------------------
r7230 | The_E | 2011-06-03 13:02:29 -0500 (Fri, 03 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/globalincs/def_files.cpp

A small change to make Apple's GLSL compiler happy

------------------------------------------------------------------------
r7232 | Sushi | 2011-06-03 18:54:30 -0500 (Fri, 03 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/ship/shipfx.cpp

Turn Z-buffering back on for BSG warp effect.

------------------------------------------------------------------------
r7233 | Sushi | 2011-06-04 11:02:21 -0500 (Sat, 04 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/shield.cpp
   M /trunk/fs2_open/code/species_defs/species_defs.cpp

Merged from Diaspora branch: Make "+Shield_Hit_ani" optional
------------------------------------------------------------------------
r7234 | Sushi | 2011-06-04 11:42:43 -0500 (Sat, 04 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.h

Merged from Diaspora: Slight bump in contrail limit and max reinforcements
------------------------------------------------------------------------
r7235 | Zacam | 2011-06-06 21:30:00 -0500 (Mon, 06 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp
   M /trunk/fs2_open/code/graphics/gropenglshader.cpp

Back port from AP: removes a couple of Unreachable NULL returns
------------------------------------------------------------------------
r7237 | Sushi | 2011-06-09 23:52:35 -0500 (Thu, 09 Jun 2011) | 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/weapon.h
   M /trunk/fs2_open/code/weapon/weapons.cpp

Halleck's pre-launch sound patch (mantis 2451)
------------------------------------------------------------------------
r7238 | The_E | 2011-06-11 14:26:56 -0500 (Sat, 11 Jun 2011) | 2 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/weapon/weapons.cpp

Adds "$disable weapon damage scaling for player:" AI profiles option, which does what it says on the tin.

------------------------------------------------------------------------
r7240 | Goober5000 | 2011-06-12 22:42:24 -0500 (Sun, 12 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/menuui/credits.cpp

add mjn.mixael's credits image specification feature
------------------------------------------------------------------------
r7242 | The_E | 2011-06-14 11:40:20 -0500 (Tue, 14 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/missionui/missionbrief.cpp
   M /trunk/fs2_open/code/missionui/missioncmdbrief.cpp
   M /trunk/fs2_open/code/missionui/missiondebrief.cpp

This will make various text boxes react correctly to changes in font height.

------------------------------------------------------------------------
r7244 | The_E | 2011-06-14 11:45:35 -0500 (Tue, 14 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/missionui/missioncmdbrief.cpp

Oops, small typo
------------------------------------------------------------------------
r7245 | karajorma | 2011-06-15 07:46:02 -0500 (Wed, 15 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Get and set SEXPs for countermeasures.
------------------------------------------------------------------------
r7247 | chief1983 | 2011-06-15 15:04:07 -0500 (Wed, 15 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/Xcode/Frameworks.tgz

Update OS X Ogg libraries in the Frameworks archive.
------------------------------------------------------------------------
r7248 | Sushi | 2011-06-15 21:59:44 -0500 (Wed, 15 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/parse/sexp.cpp
   M /trunk/fs2_open/code/parse/sexp.h

Added is-in-box SEXP
------------------------------------------------------------------------
r7252 | Zacam | 2011-06-16 10:59:59 -0500 (Thu, 16 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/MSVC_2008/Freespace2.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/libpng.vcproj
   M /trunk/fs2_open/projects/MSVC_2008/zlib.vcproj

Adds "/MP" as an Additional compiler Option for MSVC 2008.
------------------------------------------------------------------------
r7253 | The_E | 2011-06-16 12:09:30 -0500 (Thu, 16 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/cfile/cfilesystem.cpp

Bumping the max number of files CFile can handle to 2^16

------------------------------------------------------------------------
r7255 | Sushi | 2011-06-17 19:44:41 -0500 (Fri, 17 Jun 2011) | 1 line
Changed paths:
   M /trunk/fs2_open/code/playerman/playercontrol.cpp
   M /trunk/fs2_open/code/ship/ship.cpp
   M /trunk/fs2_open/code/ship/ship.h

Halleck's glide sound patch (mantis 2452)
------------------------------------------------------------------------
r7257 | The_E | 2011-06-18 16:36:05 -0500 (Sat, 18 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/cfile/cfilesystem.cpp

Fix compiler warnings re: signed/unsigned mismatch

------------------------------------------------------------------------
r7259 | The_E | 2011-06-19 07:57:26 -0500 (Sun, 19 Jun 2011) | 2 lines
Changed paths:
   M /trunk/fs2_open/code/hud/hudmessage.cpp

Fixes issue with padlock view messages not appearing

------------------------------------------------------------------------