scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 12:41:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
8,224 Commits 63 Branches 1,530 Tags
9ebbd7efce4e67ba0ec6771b2daf5c273cb28858
Commit Graph
6972 Commits
Author SHA1 Message Date
niffiwan 9ebbd7efce Fix for mantis 2814: don't check filename lengths when deleting .csg files Also change win32 to check for last . in filenames, not the 1st 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9613 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-04-14 13:00:34 +10:00
Echelon9 f627a66488 Extra validation to help triage Mantis 2828 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9612 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:49 +10:00
The_E 3664486cdb If the player ships' sensors are out, we need to exit button_function earlier. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9611 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:49 +10:00
m_m 53b8ebeeb4 Fixed scripting functions which use the current camera to also use the main camera when no custom camera is in use. This adds a optional boolean parameter to getCurrentCamera to retain backwards-compatibility. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9610 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:49 +10:00
Echelon9 36363fc419 Fix for Mantis 2823: AddressSanitizer: global-buffer-overflow in hud_escort_ship_hit() 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9607 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
niffiwan f45b8dbf5a Update for mantis 2817: this is a better way of removing extra popups There are more types of campaign load failures than just missing campaign files 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9606 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
niffiwan 45cbfa32e0 Fix for mantis 2817: remove two redundant popups regarding missing campaigns 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9605 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
Echelon9 9376ad1d51 Fix Mantis 2822: AddressSanitizer: global-buffer-overflow in hud_target_change_check() hudtarget.cpp:4459 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9604 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
Echelon9 078d065688 Third shot at Mantis 2818, other sections of the code in modelinterp.cpp use -1 is odd ways but nonetheless valid ways 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9603 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
karajorma 0c4f6bfcdc Fix Mantis 2811 (Default Campaign File Name was not used). 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9602 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
Echelon9 2d51c3e05f Have another go at fixing Mantis 2818, this time using the less fatal Warning() report in Debug builds when invalid handles passed to bm_is_valid() 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9601 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
karajorma ac6796f5af Add all the strings that had no translation. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9600 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
zookeeper b4f721c253 Fixed dual fire being available even for secondary banks with only one firepoint. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9599 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
chief1983 4fe447aab5 Revert r9596 and reopen #2818. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9598 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
niffiwan 815ce24d0d Fix for mantis 2809: re-enable quick-start-missions (g key in debug) Save Recent_missions & last_flown_ship_si_index to CSG 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9597 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
Echelon9 c348f5b7c0 AddressSanitizer: global-buffer-overflow in bm_is_valid() bmpman.cpp fix 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9596 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
The_E b4f39e9ece Patch for Mantis 2808: Player select menu always defaults to Single Player mode regardless of what the last played mode was. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9594 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
zookeeper 53c90981ea Fixed even secondaries without a free flight time receiving a decreased initial speed, which was causing particle spews to create a particle with the wrong speed when the weapon is created. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9593 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
niffiwan edcb5aa483 Fix for mantis 2810: ensure Last Player from registry/.ini is at the top of the pilot selection list 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9592 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:17 +10:00
niffiwan 8a1666c5aa derp - fix for r9584; remove 7th entry in the 6-item array Thanks for zookeeper for noticing this 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9585 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:07 +10:00
niffiwan 5c3d105f85 Fix for mantis 2789: replace shield icons drawn with 100's of lines with 6-point polygons 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9584 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:07 +10:00
zookeeper c105b2ad15 Fixed an accidentally committed debug mprintf. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9583 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:07 +10:00
zookeeper 4eee845335 Restored the code which loads up the default HUD colors from hud_3.hcf. Was apparently accidentally removed in r9549. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9582 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:07 +10:00
zookeeper 95a11f71f8 Fixed gr_opengl_circle drawing the middle horizontal line twice, which is a problem when drawing with alpha. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9581 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:07 +10:00
FUBAR-BDHR 07fdf1b3c1 Commit 9473 from anitpodes to prevent standalone crashing never ported over. Original commit message: "From Eli2: Lower the value of MAX_SHIPS_PER_PACKET to 64 in order to keep packet size down" 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9565 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
Zacam 43f02b201a For BluePlanet compatibility: change-nebula-pattern SEXP. Also adds a logging nprintf for op_num in add_to_event_log_buffer. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9564 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
FUBAR-BDHR 13efc81b22 Need to back out temporary commit 9553 or it looks in inferno\inferno and \inferno for pilots. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9563 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
zookeeper 2490764c1b Fixed a syntax error. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9562 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
Zacam 593be42e66 *drum roll* Pilot Code! Originated by taylor. Additional direct work by: The E, niffiwan, CommanderDJ, Pyro3D, Echelon9 (PVS-Studio), Karajorma and Eli2. (If I missed you, don't kill me.) 
MASSIVE thanks to Mjn.Mixael and Blue Planet for tireless constant testing.
(It's still not perfect, but it probably wouldn't be where it is at without them)

Spans a lot from initial commit to AP Branch in r6835.

git-svn-id: svn://svn.icculus.org/fs2open/trunk@9561 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
zookeeper 222f632943 Fix turrets not getting can_move = true set for them; fixes at least glowpoints parented to turrets not moving right. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9560 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
Zacam 11140adf51 aaaaaaaaand finally, lets make sure that we can actually see the "Inferno" directory for all those pilot files. *sighs* That had better be everything. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9553 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Zacam 0ba6052326 Update to r9550: Make sure that we keep the right directory default for the reading of current player Pilot files until the Pilot code goes in. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9552 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Zacam 16e9892903 Whoops. When removing #ifdefs, check the #else block. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9550 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Zacam 759b080814 pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9549 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
chief1983 104d2d6fce Update trunk version to 3.6.19 to make sure nightlies are now properly indicated as newer than 3.6.18. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9547 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
karajorma 9531268fd9 Fix Mantis 2797 (Ship Loadout shouldn't remember the previous settings if the mission has changed) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9544 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Goober5000 3c3d1b4bd1 proper movement of ships attached to other ships fixes Mantis #2787 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9542 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Goober5000 dc18b7e012 fix Mantis #2796 (capships always have an EMP time of 7.5 seconds) by adding a weapon flag to allow the full value of emp_time to be used 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9540 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Zacam 8959ecdc07 Follow up to r9536: re-instate -no_warn, but put it behind a compiler level #ifdef flag to enable the ability to use it. And if you don't know how to do that, you have no business using it. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9539 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
m_m 7f170217a8 Fixed scripting issue with wrong type conversions. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9538 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
Goober5000 55d4f0b96c follow-up to revision 9127: that commit breaks FSPort (causing part of the nameplated Orions to be translucent), so let's just check that "nameplate" is the entire texture name 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9537 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
The_E 129d02eb0d Removing the -nowarn commandline argument. The encouragement of bad habits is a serious bug. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9536 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
The_E 4bcc9f1716 From AMS: Fix for Mantis 2293: Destroyed/departed AI showing up as present in wingmen display. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9535 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
niffiwan 24037c6e02 Fix for mantis 2786: from Yarn - make +Main Hall: always override +Flags: i.e. so retail-compatible campaigns can use the second main hall in retail and a different main hall in FSO 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9534 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
Echelon9 72770939a2 Further spelling fixes, inspired by bugmenot's Mantis 2794 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9533 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
The_E d1e73bd8b7 Followup for 2788: Fix potential issue while looping through subobjects. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9530 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
The_E 6197c20010 Patch for Mantis 2788: Difficulty-based damage scaling does not work 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9529 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
Goober5000 6ab03f2e2b might as well remove this unnecessary temporary variable 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9528 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
niffiwan 37c132318a Fix for mantis 2785: when unpausing sounds, use the previous volume, not the detault 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9527 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00
Echelon9 93d0af04d2 Resolve uninitialised value warnings in load_gauge_warhead_count() 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9526 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:45 +10:00