Changesets: fs2open
|
trunk r11334
Timestamp: 2015-04-30 01:06:22 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Fix issue with git and nightly revision injection, and an export issue with git on Windows. | ||
| mod - /trunk/nightly-build/Vcs.pm | [ Diff ] [ File ] | ||
| mod - /trunk/nightly-build/Replacer.pm | [ Diff ] [ File ] | ||
| mod - /trunk/nightly-build/nightlybuild.pl | [ Diff ] [ File ] | ||
| mod - /trunk/nightly-build/Git.pm | [ Diff ] [ File ] | ||
| mod - /trunk/nightly-build/Svn.pm | [ Diff ] [ File ] | ||
|
trunk r11333
Timestamp: 2015-04-26 10:32:13 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Fix a bug in the release script that broke source code exporting for final release builds. | ||
| mod - /trunk/nightly-build/release.pl | [ Diff ] [ File ] | ||
|
trunk r11332
Timestamp: 2015-04-25 22:56:46 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
FreeBSD 10 is on Clang now, -ansi doesn't mean anything here. | ||
| mod - /trunk/fs2_open/configure.ac | [ Diff ] [ File ] | ||
|
trunk r11331
Timestamp: 2015-04-25 22:02:29 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Voice recognition upgrades. Switches to an in-process recognizer, removes the hard-coded wing list (which could in accessing invalid memory, when used with a custom grammar file), and fixes up the grammar file a bit. |
||
| mod - /trunk/fs2_open/code/sound/voicerec.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/phrases.xml | [ Diff ] [ File ] | ||
|
zookeeper r11330
Timestamp: 2015-04-24 06:49:40 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Trunk sync r11329, with some cosmetic changes to the EFF subdirs code to conform with recent bmpman changes. | ||
| mod - /branches/zookeeper/projects/Xcode/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/pack_unpack.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/load.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/libpng.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/libjpeg.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2011/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_6/Fred2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2015/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/cutscene/movie.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/utf.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/menuui/credits.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_6/wxFRED2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/Xcode4/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| add - /branches/zookeeper/jansson/lookup3.h | [ File ] | ||
| mod - /branches/zookeeper/jansson/utf.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2011/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/dump.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2015/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/menuui/mainhallmenu.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/value.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2010/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/jansson.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/graphics/generic.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/object/objectsnd.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2010/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2008/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2011/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2015/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| add - /branches/zookeeper/jansson/hashtable_seed.c | [ File ] | ||
| mod - /branches/zookeeper/code/weapon/beam.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2005/wxFRED2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_6/Freespace2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2008/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/configure.ac | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/graphics/generic.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/parselo.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/code.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2005/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/graphics/gropenglpostprocessing.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/sound.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/voicerec.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/bmpman/bmpman.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/LICENSE | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/fs2open.Doxyfile | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2010/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/zlib.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/debugconsole/consoleparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/globalincs/version.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/memory.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/jansson_private.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/phrases.xml | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2013/liblua.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/bmpman/bmpman.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/parselo.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/graphics/gropengltnl.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/hashtable.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/MSVC_2005/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/cutscene/movie.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/freespace2/freespace.rc | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/sound/ds.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/strconv.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/gamesnd/eventmusic.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/hud/hud.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/hashtable.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/strbuffer.c | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/fred.rc | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/hud/hudsquadmsg.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/jansson_config.h | [ Diff ] [ File ] | ||
| add - /branches/zookeeper/code/bmpman/bm_examples.cpp | [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/projects/codeblocks/Freespace2/Freespace2.cbp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/jansson/strbuffer.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/bmpman/bm_internal.h | [ Diff ] [ File ] | ||
|
fs2_open_3_7_2 r11329
Timestamp: 2015-04-23 15:27:00 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Automated 3.7.2 Final versioning commit | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/Fred2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2008/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/freespace2/freespace.rc | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/wxFRED2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/Freespace2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2008/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/wxFRED2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode4/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/fred2/fred.rc | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/globalincs/version.h | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/codeblocks/Freespace2/Freespace2.cbp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/configure.ac | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Fred2.vcxproj | [ Diff ] [ File ] | ||
|
trunk r11328
Timestamp: 2015-04-22 19:16:20 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
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. | ||
| mod - /trunk/fs2_open/code/graphics/generic.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/graphics/generic.h | [ Diff ] [ File ] | ||
|
trunk r11327
Timestamp: 2015-04-22 19:09:44 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
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. | ||
| mod - /trunk/fs2_open/code/sound/audiostr.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/cutscene/movie.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/bmpman/bmpman.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/cutscene/movie.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/ds.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/gamesnd/eventmusic.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/sound.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/audiostr.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/bmpman/bmpman.cpp | [ Diff ] [ File ] | ||
|
trunk r11326
Timestamp: 2015-04-22 18:37:52 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Eliminate some redundancy with ship allowed weapon parsing. | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
trunk r11325
Timestamp: 2015-04-22 18:36:23 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Update OS X project to work with updated Jansson. | ||
| mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
|
trunk r11324
Timestamp: 2015-04-22 18:35:47 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Upgrade Jansson to 2.7. | ||
| add - /trunk/fs2_open/jansson/hashtable_seed.c | [ File ] | ||
| mod - /trunk/fs2_open/jansson/hashtable.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/utf.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/strconv.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/hashtable.h | [ Diff ] [ File ] | ||
| add - /trunk/fs2_open/jansson/lookup3.h | [ File ] | ||
| mod - /trunk/fs2_open/jansson/LICENSE | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/strbuffer.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/utf.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/jansson_config.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/dump.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/strbuffer.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/memory.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/jansson_private.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/value.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/pack_unpack.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/load.c | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/jansson/jansson.h | [ Diff ] [ File ] | ||
|
trunk r11323
Timestamp: 2015-04-22 18:29:02 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Record mission loading time in the debug log. (Just changes a printf into an mprintf.) |
||
| mod - /trunk/fs2_open/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
|
trunk r11322
Timestamp: 2015-04-22 18:26:57 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
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). |
||
| mod - /trunk/fs2_open/code/object/objectsnd.cpp | [ Diff ] [ File ] | ||
|
trunk r11321
Timestamp: 2015-04-22 17:57:21 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
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.) |
||
| mod - /trunk/fs2_open/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/parselo.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/parselo.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
trunk r11320
Timestamp: 2015-04-22 17:52:19 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Remove some redundant code in parselo.cpp. 7 cases in stuff_string() (both versions) were using identical code. Consolidated into one branch for clarity. |
||
| mod - /trunk/fs2_open/code/parse/parselo.cpp | [ Diff ] [ File ] | ||
|
trunk r11319
Timestamp: 2015-04-22 17:49:41 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
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. |
||
| mod - /trunk/fs2_open/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
|
trunk r11318
Timestamp: 2015-04-22 16:47:40 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
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. |
||
| mod - /trunk/fs2_open/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/liblua.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/code.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/libpng.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/libjpeg.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/zlib.vcxproj | [ Diff ] [ File ] | ||
|
trunk r11317
Timestamp: 2015-04-22 16:39:53 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
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. |
||
| mod - /trunk/fs2_open/code/sound/voicerec.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/sound/phrases.xml | [ Diff ] [ File ] | ||
|
trunk r11316
Timestamp: 2015-04-20 11:05:34 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
As I promised, an automated trunk/master version bumping script. | ||
| add - /trunk/nightly-build/versionup.pl | [ File ] | ||
| mod - /trunk/nightly-build/Git.pm | [ Diff ] [ File ] | ||
| mod - /trunk/nightly-build/Svn.pm | [ Diff ] [ File ] | ||
|
trunk r11315
Timestamp: 2015-04-18 04:26:30 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Removing unused code from hud.cpp | ||
| mod - /trunk/fs2_open/code/hud/hud.cpp | [ Diff ] [ File ] | ||
|
trunk r11314
Timestamp: 2015-04-18 03:13:57 Author: MageKing17 Ported: N/A [ Details ] [ Diff ] |
Fix a possible crash with -reparse_mainhall. Left over pointer towards a structure that had been cleared and rebuilt could cause a crash. Found (and fix tested) by Axem. Also thanks to z64555 for bouncing ideas back and forth until this solution was found. |
||
| mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp | [ Diff ] [ File ] | ||
|
fs2_open_3_7_2 r11313
Timestamp: 2015-04-17 23:32:56 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Automated 3.7.2 RC6 versioning commit | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/Fred2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2008/Fred2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/freespace2/freespace.rc | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2005/wxFRED2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/Freespace2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2008/Freespace2.vcproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_6/wxFRED2.dsp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/Xcode4/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2010/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/fred2/fred.rc | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2011/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/code/globalincs/version.h | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/codeblocks/Freespace2/Freespace2.cbp | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/configure.ac | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Fred2.vcxproj | [ Diff ] [ File ] | ||
|
fs2_open_3_7_2 r11312
Timestamp: 2015-04-17 23:26:39 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Project file version catchup to RC5. | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/fs2_open_3_7_2/projects/MSVC_2015/Fred2.vcxproj | [ Diff ] [ File ] | ||
|
trunk r11311
Timestamp: 2015-04-17 23:22:56 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Should update the newer project files during the release build cycle now. | ||
| mod - /trunk/nightly-build/release.pl | [ Diff ] [ File ] | ||
|
trunk r11310
Timestamp: 2015-04-17 23:21:08 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Other half of version bump to 3.7.3, I will probably have that automated by the next release cycle. | ||
| mod - /trunk/fs2_open/projects/MSVC_2015/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_6/Freespace2.dsp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/Xcode4/English.lproj/InfoPlist.strings | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_6/wxFRED2.dsp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2011/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/globalincs/version.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2015/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_6/Fred2.dsp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2011/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2010/wxFRED2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2015/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/projects/MSVC_2013/wxFRED2.vcxproj | [ Diff ] [ File ] | ||