scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 12:11:36 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
12,738 Commits 61 Branches 1,532 Tags
4153aa80a94de6a13399780542808f1cf9fc84e9
Commit Graph
93 Commits
Author SHA1 Message Date
z64555 b0d9c53688 Remove duplicate function get_max_shield_quad() 2016-11-25 15:07:37 -06:00
z64555 260673fcea Remove unused variables. 2016-11-25 15:04:11 -06:00
z64555 6f0888e30b Combine shield transfers from AI and Players into one code path 
Fixed an Assert()
 2016-11-25 15:04:08 -06:00
z64555 0a81104723 AI and Player shield balancing now share same codepath. 2016-11-25 15:01:28 -06:00
niffiwan bf21913708 Updates to max shield recharge fix 
Use a helper function in appropriate places, add comments where not
Avoid a potential div/0 & add Assertion to shield_get_max_strength
 2016-10-16 16:31:11 +10:00
MageKing17 bce17561ed Change pointless .size() calls into .empty() calls. 
The codebase had quite a few instances of .size() being called and then checked to see if it was 0 or not (or less than 1, or greater-than-or-equal-to 1, which are basically equivalent), when .empty() could be called instead (negated or not, depending on what the original condition was).
 2016-09-07 18:36:12 -07:00
SamuelCho a481999a24 OpenGL Core support. Introduction of material based draw system. Rewrote geometry batcher. 2016-08-17 00:13:19 -07:00
Fabian Woltermann 770fce8de5 Bitset flags -- take 2 (#775) 
This introduces a new mechanism for handling bit flags. Instead of using an int (or two, or three) to write bits into, this uses the std::bitset in a wrapper class that accepts an enum class as input. This means that certain classes of errors we've had a few of in the engine, where a coder used the wrong set of flags or checked them against the wrong variable (SF_STEALTH vs SIF_STEALTH, for example) can now be detected at a compiler level rather than not at all.
 2016-08-12 16:13:50 -07:00
MageKing17 70529dbd5a Deprecate -nohtl and -brief_lighting. 
-nohtl hasn't worked for years, and -brief_lighting was always supposed to be a temporary flag before making the behavior always on.
 2016-07-08 09:39:29 -07:00
SamuelCho 0f0f6377d0 Killed the last vestiges of ship_model_start/stop. 2015-12-13 23:51:24 -08:00
Lari Nieminen 8d0624b064 Fix a small glitch in shield icon alpha range 
Calculates the alpha range using the actual number of shield segments instead of 4.
 2015-12-08 14:08:34 +02:00
Goober5000 8a125ab019 remove obsolete const_casts 2015-10-28 00:18:31 -04:00
asarium 077dc61660 Fix format warnings in hudshield.cpp 2015-08-19 11:26:27 +02:00
Echelon9 47af1ff851 Simplify duplicative hud/ includes. 2015-06-22 20:24:30 +10:00
Echelon9 c5493bb480 Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes. 2015-06-22 20:24:30 +10:00
Cliff Gordon a4c1f89720 Merge remote-tracking branch 'origin/master' into fix/triplemon_hud 
Conflicts:
	code/freespace2/freespace.cpp
 2015-05-20 17:15:15 -05:00
asarium 3cfbcbe363 Fix signed < unsigned warning 2015-05-14 10:45:25 +02:00
Cliff Gordon 0ce31bf471 [fix/triplemon_hud] Yarn's triple-monitor fix, see http://www.hard-light.net/forums/index.php?topic=89262.0. Patch tweaked to work around changes in 9aed627. 2015-05-06 10:40:45 -05:00
Swifty c620372357 Soft shadows, deferred lighting, and various major graphics optimizations. 2015-05-02 14:35:37 -07:00
MageKing17 1a29b395ab Stop standalones from executing hud_shield_quadrant_hit(). 
Also add some assertions to avoid (or at least help detect) similar errors in the future. Should fix Mantis 2971.
 2015-04-30 22:10:17 -07:00
Goober5000 85872114ee related to Mantis #2971: properly reset shield info when we have a null objp 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11099 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-10-04 13:45:44 +10:00
niffiwan 027f218f7f Allow any resolution for mainhalls (From Yarn) 
Also includes support for more than two mainhall resolutions, zooming
so one mainhall can adapt to multiple resolutions, setting new mainhall
fonts, help overlays for all resolutions and adjustable tooltip padding.
Also allows preload screens to be any resolution & aspect ratio.

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10844 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-05 10:38:07 +10:00
zookeeper 6e8a90fbbc Fixed targethit1 -> targhit1 in an error message. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10349 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-31 17:26:00 +10:00
zookeeper a59be2e7c7 Allowed shield_info_reset() to initialize shield_hit_info to empty values if it's not associated with a ship, as required by hudescort.cpp. Might fix Mantis #2961. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10161 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:37 +10:00
Echelon9 3bbd389420 LLVM/Clang warns that a dangling else can occur without one level of braces 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10143 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:37 +10:00
zookeeper 8cd19aa588 Merged model point shields from zookeeper branch. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10135 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:36 +10:00
niffiwan b2958b5e4a Remove a magic number 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10084 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-17 20:24:43 +10:00
niffiwan 797ffdf0f4 Fix mantis 2883 
update hud_num_make_mono (& callers) to handle the font number
add partial support for specifying special char indexes for individual fonts

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9985 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-10-31 19:25:03 +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
Goober5000 ee357c9846 yes, whoops (fix bug noticed by Droid803) 2012-10-29 07:10:01 +00:00
Goober5000 8aa23d6a1a fix for Mantis #2643 (generated shield quadrants displayed in the wrong spots) 2012-10-16 03:20:47 +00:00
Echelon9 79da099645 GCC warning: variable set but not used (related to HUD) 2012-06-13 14:50:57 +00:00
Echelon9 68faf910cd GCC warning: suggest brackets (parentheses) around '&&' within '||' 2012-05-27 14:38:53 +00:00
Zacam b78ad057e5 Reported by ni1s: GCC complaint about missing .c_str() in the updated dynamic MAX_SHIELD_ICON dynamic change. 2012-02-15 07:58:46 +00:00
Zacam 15f7e72fc6 From CommanderDJ: Makes MAX_SHIELD_ICONS dynamic 2012-02-09 12:40:15 +00:00
Swifty 3affb86b52 Removed configOverride from HudGauge class since we don't even use it. 2012-02-05 03:41:31 +00:00
Echelon9 e3c100d5fa Documentation: A few documentation fixes 2011-09-03 09:06:00 +00:00
The_E 42ff356ad2 Fix for Mantis 2422 (Target Shield indicator behaves like a duplicate of the player shield indicator) 2011-04-04 12:56:59 +00:00
Zacam 09fad95070 Antipodes 7 Merge: HUD Overhaul, by Swifty. 2010-12-12 20:34:15 +00:00
chief1983 ed5cd1d06b Fix for Mantis #1936: Per ship gauges should now work properly. From KK. 2010-01-18 16:06:35 +00:00
portej05 98f337f701 safe_strings - from Antipodes build #1 2009-07-27 16:06:24 +00:00
portej05 915a9270c9 NEW_HUD Removal commit 2009-07-13 15:48:38 +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
Swifty 7e047b5c98 WMC's fix for RTT indexing and fix unnecessary slewing for 3D HUD elements. 2008-09-06 07:51:50 +00:00
WMCoolmon 6c7ccad82f Attempted HUD shake fixes 2008-08-30 10:56:04 +00:00
taylor 3090cd74b0 fix "generate icon" flag check for hud shield icons and add some compatibility handling for old data (Mantis #1646) 
clean up ballistic primary fixage so that it doesn't run more than it needs to and doesn't end up "fixing" it's own mess
 2008-03-31 12:57:34 +00:00
WMCoolmon 7e7d77c8d7 *Drumroll* The official scripting system commit to the stable branch! 2008-03-15 08:56:43 +00:00
Backslash bfde817bb2 View slew, Target padlock and TrackIR patch by Swifty. Very nice! 
Don't forget to add code/io/trackir.* to your projects!
 2008-03-14 08:55:47 +00:00
Goober5000 6ab0b17acc added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable 2007-09-02 02:10:29 +00:00