Commit Graph
69 Commits
Author SHA1 Message Date
Zacam 4952b70488 Trunk Sync - r10911
There are a lot of changes here that should probably be examined, namely the Debug Console (which had conflicts) and Yarn's "any resolution" mainhalls code (Which also had conflicts) but for the most part this should be fairly clean.

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10912 387891d4-d844-0410-90c0-e4c51a9137d3
2014-09-11 19:22:13 +10:00
The_E 2f46cbe8a3 sync to trunk 10046
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10047 387891d4-d844-0410-90c0-e4c51a9137d3
2013-11-25 18:40:16 +10:00
The_E ce05f3a88a Trunk sync r9274 2012-10-21 07:58:11 +00:00
The_E 45bd1d1d99 Trunk sync r8679 2012-04-15 11:41:31 +00:00
Zacam e6a4e6114a And another Sync Drift check for AP to tidy things up. 2011-09-25 08:27:17 +00:00
The_E b725ff7e21 trunk sync r7657 2011-09-06 21:22:39 +00:00
The_E d8a728d5f1 Trunk sync r7593 2011-08-30 18:17:09 +00:00
Zacam ad3b01c2f2 Trunk Sync r7563 2011-08-29 00:21:43 +00:00
The_E 08063525c7 trunk sync r7363 2011-07-20 18:07:56 +00:00
Zacam 5f0c4ad2a7 Trunk Sync - r7328 2011-07-06 05:23:54 +00:00
Zacam eca9a5380b Trunk Sync - r7315 2011-07-04 06:41:27 +00:00
Zacam d96982e6ce Catches one of the signed/unsigned conversions not covered under r7258. 2011-06-22 23:05:23 +00:00
Zacam 8d587f1c75 Trunk 7257: "Fix compiler warnings re: signed/unsigned mismatch" by The E 2011-06-18 21:48:12 +00:00
The_E 6546d07d90 Trunk sync r7253 2011-06-16 17:18:13 +00:00
Zacam d86f450c55 Antipodes 8: New Pilot code, from taylor. 2010-12-12 23:53:05 +00:00
Zacam 3bebbbbcd0 Trunk Sync r6269. I hope this works. This is supposed to be a Trunk overlay merge into Antipodes, which should mean that Antipodes is now a copy of Trunk in all respects. 2010-06-29 22:09:34 +00:00
Hery b725a5e8bb Trunk sync (pending PostProcessing patch) 2009-11-24 15:31:34 +00:00
portej05 eb9f23d6fd Trunk Sync 2009-07-31 09:27:55 +00:00
portej05 aaf3a9bf09 safe_strings changes 2009-07-26 05:15:24 +00:00
portej05 6a8d45c93d Replace most instances of std::vector with SCP_vector. Memory is now all run through vm_malloc and vm_free.
Watch it go up AND down in mission.
2009-07-11 07:07:57 +00:00
portej05 719825f80d The big CVS comment removal. This chops approx. 3.5mb off a full checkout.
I've tested this through compiling and through hand checking. 
Normalises line endings in ALL files to \n.
2009-06-20 08:08:20 +00:00
Goober5000 6e4021888d add apostrophes to contractions, lol 2009-04-10 07:49:12 +00:00
karajorma d8a1a68c16 Fix multiplayer for Inferno builds. 2009-03-17 20:25:36 +00:00
phreak 6a3cf80be0 Add additional filename extension filters to fix Mantis #1484 2008-10-11 12:08:09 +00:00
taylor 6d085d6d22 be sure to skip filenames that are too long in cf_get_file_list() too, since we still need them to be of a certain size later 2008-04-01 06:30:05 +00:00
taylor d6c6430efb tweaks for slightly more efficient file matching
minor cleanup
2008-03-20 17:45:31 +00:00
taylor 6b24116d1a this should allow a more graceful handling of 0-byte VP files so that they don't cause hangs/crashes 2008-02-22 02:40:30 +00:00
taylor 40d3516892 make the chcksum spew in logs always have a full 8-set of values
skip over files found on system which are over the max filename length, prevents several crashes (partial for Mantis #1182)
2007-05-28 19:45:14 +00:00
taylor 54e820b01c cleanup of chcksum stuff (works properly on 64-bit systems now)
add chksum support for VPs, both a startup in debug builds, and via cmdline option (-verify_vps)
little cleanup in cmdline.cpp (get rid of the remaining "fix bugs" crap)
2007-04-11 18:21:23 +00:00
taylor 2f38c8ce54 a little better error handling for cf_exists_full()
add a cf_exists_full_ext() which can find a series of extensions and returns true if any of them exist
use cf_exists_full_ext() for eventmusic file checks (to check for ogg and wav)
get rid of SPM hack, it's wrong (just commented out for now though)
fix a bunch of bugs in cf_find_file_location_ext():
 - try to handle files with multiple periods a bit better (for the wav files like: blah_1.5.wav)
 - load issue with finding incorrect files by mistake
 - prevent finding different file types in various paths/roots
2007-03-22 20:22:45 +00:00
taylor ed073ec841 add the number of files that CFILE is going to try and use in each root to the debug info
optimizations for cf_find_file_location_ext()
2007-02-09 23:57:24 +00:00
taylor 303d820966 various small cleanup and speedup changes
add a cf_find_file_location_ext() function, which you can pass a filename and a list of extensions and it will search for all of them at once
2006-08-27 18:01:45 +00:00
taylor 848445805b include CF_TYPE_PLAYERS in special pilot path consideration, prevents moddirs from always getting and empty data/players/ 2006-07-28 02:44:17 +00:00
taylor 380b0de996 extra safety check when creating a default path string, filename is optional be we need to available if root0 is missing (CFILE not initted yet)
fix that crazy compiler<->constructor<->linker<->server.txt deal caused by some bad code and a freaky link thing in freespace.cpp
2006-04-16 05:28:10 +00:00
taylor 79e0e6b355 fix up cf_find_file_location() and related elements so that it's safer (based on WMC's work, but actually safe this time ;)) 2005-12-28 22:06:48 +00:00
taylor 22b9889d33 fix quite a few CFILE issues:
use #define's for path lengths when possible so it's easier to move between functions
  fix huge Cfile_stack[] issue (how the hell did that get through ✌️ QA?)
  add Int3() check on cfopen() so it's easier to know if it get's called before cfile is ready to use
  move path separators to pstypes.h
  fix possible string overruns when setting up CFILE roots
  make sure we don't try to init current directory again thinking it's a CD-ROM
  add the list of VP roots to debug log, this will undoubtedly be useful
when -nosound is use go ahead and set -nomusic too to both checks are correct
add list of cmdline options to debug log
fix possible overwrite issues with get_version_string() and remove '(fs2_open)' from string plus change OGL->OpenGL, D3D->Direct3D
2005-12-06 03:13:49 +00:00
taylor dd30247a35 switch from strchr() to strrchr() for extension checks in order to allow for multiple periods in a filename 2005-11-16 21:25:34 +00:00
taylor 5e932a8730 fix memory errors from new[]/delete[] mismatch 2005-10-23 11:44:07 +00:00
wmcoolmon 6e97ac964a Ack, missed testing compile under an Inferno build 2005-10-23 05:37:59 +00:00
wmcoolmon 542c762d6a Some cfile changes that slipped by 2005-10-17 00:13:28 +00:00
wmcoolmon b00f5f9a55 Hardened cfile against array overflows 2005-10-16 23:15:47 +00:00
taylor 3f6e13d20b use vm_malloc(), vm_free(), vm_realloc(), vm_strdup() rather than system named macros
fixes various problems and is past time to make the switch
2005-05-12 17:49:18 +00:00
taylor 2a7b06112d merge with Linux/OSX tree - p0130 2005-01-30 12:50:08 +00:00
taylor af3e060a17 some 64-bit OS comaptibility fixes 2004-11-21 11:27:31 +00:00
taylor 49303fd117 support new pilot code, Linux code tree merge, don't use same pilot directory for Inferno builds 2004-10-31 21:28:38 +00:00
Kazan 864e1b5922 remove MCD complete 2004-07-26 20:47:56 +00:00
taylor 46f274f38d add CF_SORT_REVERSE to real sort routine, makes CF_SORT_TIME work again 2004-07-17 09:26:00 +00:00
Kazan 428b3dcbc9 MCD - define _MCD_CHECK to use memory tracking 2004-07-12 16:33:09 +00:00
wmcoolmon e6c3498787 Fixed cf_matches_spec; small bug was introduced. 2004-05-26 22:02:36 +00:00
wmcoolmon 22ed91e5ad Added weapons_expl modular table, updated cfilesystem to work with modular tables, fixed loading order, fixed ship loading error messages 2004-05-26 21:02:27 +00:00