Author Topic: Nightly (FreeBSD): 23 Apr 2015 - Revision 11329  (Read 205 times)

0 Members and 1 Guest are viewing this topic.

Offline SirKnightly

  • George or Keira?
  • 211
Nightly (FreeBSD): 23 Apr 2015 - Revision 11329
Here is the nightly for FreeBSD on 23 Apr 2015 - Revision 11329

Open non-feature issues in Mantis: 128

Group: Standard
fso_Standard_20150423_r11329.tar.bz2
MD5Sum

Code: [Select]
------------------------------------------------------------------------
r11317 | chief1983 | 2015-04-22 15:39:53 -0500 (Wed, 22 Apr 2015) | 6 lines
Changed paths:
   M /trunk/fs2_open/code/sound/phrases.xml
   M /trunk/fs2_open/code/sound/voicerec.cpp

Backport (?) r3727 and 3733 from fs2_open-unstable_old, the old CVS unstable branch.

3727: added MadProf's voice recognition enhancements
3733: fix spelling, and synch with voicerec.cpp

See http://www.hard-light.net/forums/index.php?topic=37643.msg880793#msg880793 for more information.
------------------------------------------------------------------------
r11318 | MageKing17 | 2015-04-22 15:47:40 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/projects/MSVC_2013/Fred2.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/Freespace2.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/code.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/libjpeg.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/liblua.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/libpng.vcxproj
   M /trunk/fs2_open/projects/MSVC_2013/zlib.vcxproj

Commit various updates to the MSVS 2013 project files, following discussion in #scp.

Fixes Mantis 3104, amongst other minor issues. Given the existence of the Community Edition, decided to make FS2_SPEECH and FS2_VOICER defined by default. Setup release builds for debugging symbols. Corrected a few inconsistencies between configurations.
------------------------------------------------------------------------
r11319 | MageKing17 | 2015-04-22 16:49:41 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/weapon/weapons.cpp

Fix minor problem with weapons.cpp.

If "@Laser Color2:" is defined for a weapon and you override that weapon with a modular table (even if that override entry doesn't actually contain any data), the weapon's laser_color_2 value would get defaulted to its laser_color_1 value. Now, only do that if changing laser_color_1 and the RGB values of the two colors matched before.
------------------------------------------------------------------------
r11320 | MageKing17 | 2015-04-22 16:52:19 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/parse/parselo.cpp

Remove some redundant code in parselo.cpp.

7 cases in stuff_string() (both versions) were using identical code. Consolidated into one branch for clarity.
------------------------------------------------------------------------
r11321 | MageKing17 | 2015-04-22 16:57:21 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp
   M /trunk/fs2_open/code/mission/missionmessage.cpp
   M /trunk/fs2_open/code/parse/parselo.cpp
   M /trunk/fs2_open/code/parse/parselo.h
   M /trunk/fs2_open/code/ship/ship.cpp

Remove required_string_3() and required_string_4().

Replaced with usage of required_string_one_of(). (required_string_either() not removed due to different behavior.)
------------------------------------------------------------------------
r11322 | MageKing17 | 2015-04-22 17:26:57 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/object/objectsnd.cpp

Minor objectsnd.cpp cleanup.

Should be all nonfunctional changes (yes, even those "else" branches that look like they change behavior; functionally speaking, those branches shouldn't get hit because FSO will delete the sounds when they shouldn't apply).
------------------------------------------------------------------------
r11323 | MageKing17 | 2015-04-22 17:29:02 -0500 (Wed, 22 Apr 2015) | 3 lines
Changed paths:
   M /trunk/fs2_open/code/freespace2/freespace.cpp

Record mission loading time in the debug log.

(Just changes a printf into an mprintf.)
------------------------------------------------------------------------
r11324 | chief1983 | 2015-04-22 17:35:47 -0500 (Wed, 22 Apr 2015) | 1 line
Changed paths:
   M /trunk/fs2_open/jansson/LICENSE
   M /trunk/fs2_open/jansson/dump.c
   M /trunk/fs2_open/jansson/hashtable.c
   M /trunk/fs2_open/jansson/hashtable.h
   A /trunk/fs2_open/jansson/hashtable_seed.c
   M /trunk/fs2_open/jansson/jansson.h
   M /trunk/fs2_open/jansson/jansson_config.h
   M /trunk/fs2_open/jansson/jansson_private.h
   M /trunk/fs2_open/jansson/load.c
   A /trunk/fs2_open/jansson/lookup3.h
   M /trunk/fs2_open/jansson/memory.c
   M /trunk/fs2_open/jansson/pack_unpack.c
   M /trunk/fs2_open/jansson/strbuffer.c
   M /trunk/fs2_open/jansson/strbuffer.h
   M /trunk/fs2_open/jansson/strconv.c
   M /trunk/fs2_open/jansson/utf.c
   M /trunk/fs2_open/jansson/utf.h
   M /trunk/fs2_open/jansson/value.c

Upgrade Jansson to 2.7.
------------------------------------------------------------------------
r11325 | chief1983 | 2015-04-22 17:36:23 -0500 (Wed, 22 Apr 2015) | 1 line
Changed paths:
   M /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj

Update OS X project to work with updated Jansson.
------------------------------------------------------------------------
r11326 | chief1983 | 2015-04-22 17:37:52 -0500 (Wed, 22 Apr 2015) | 1 line
Changed paths:
   M /trunk/fs2_open/code/ship/ship.cpp

Eliminate some redundancy with ship allowed weapon parsing.
------------------------------------------------------------------------
r11327 | chief1983 | 2015-04-22 18:09:44 -0500 (Wed, 22 Apr 2015) | 1 line
Changed paths:
   M /trunk/fs2_open/code/bmpman/bmpman.cpp
   M /trunk/fs2_open/code/bmpman/bmpman.h
   M /trunk/fs2_open/code/cutscene/movie.cpp
   M /trunk/fs2_open/code/cutscene/movie.h
   M /trunk/fs2_open/code/gamesnd/eventmusic.cpp
   M /trunk/fs2_open/code/sound/audiostr.cpp
   M /trunk/fs2_open/code/sound/audiostr.h
   M /trunk/fs2_open/code/sound/ds.cpp
   M /trunk/fs2_open/code/sound/sound.cpp

Globalize various file extension lists littered throughout the code so they can be referenced from other classes as needed, instead of being hardcoded multiple times.
------------------------------------------------------------------------
r11328 | chief1983 | 2015-04-22 18:16:20 -0500 (Wed, 22 Apr 2015) | 1 line
Changed paths:
   M /trunk/fs2_open/code/graphics/generic.cpp
   M /trunk/fs2_open/code/graphics/generic.h

File exists wrappers for bitmaps and animations; eliminates worrying about extensions, only need the base filename and it'll tell you if it's available.
------------------------------------------------------------------------