scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
11,983 Commits 62 Branches 1,531 Tags
94412da2dec4bbe8db6be06b6855808ba37726b2
Commit Graph
173 Commits
Author SHA1 Message Date
m!m 22c0255277 Fix a bunch of 64-bit MSVC warnings (#709) 
* Fix a bunch of 64-bit warnings

* Fix Linux compilation error

* Fix Mac error

* Fix some issues

* Fix more GCC warnings

* Remote unwanted change

* Remove accidentally readded file

* Fix wrong limit check

* Use BEAM_INDEX macro for getting beam object index

* Fix 32-bit warning

* Use BEAM_INDEX instead of pointer arithmetic
 2016-08-09 11:08:54 -07:00
Fabian Woltermann 5ffc569eed Merge pull request #759 from asarium/fix/hudParseErrors 
Detect HUD gauges parse error and print a warning
 2016-08-09 08:30:34 +02:00
asarium 7baefbcd45 Detect HUD gauges parse error and print a warning 
Previously the code simply skipped the invalid tokens and silently
ignored them. This is frustrating for modders and also let #758 slip
into the code base which would not have happened otherwise.
 2016-08-06 21:40:52 +02:00
asarium 0d165f159e Fix parsing code error introduced by TTF merge 2016-08-06 19:15:47 +02:00
asarium 16be3b7cc5 Add support for TrueType fonts 
This allows to use standard TrueType Fonts for text rendering in FSO. It uses the NanoVG library which provides the ability of drawing 2D shapes. This library is used for most 2D operations now and can also be used directly by using the PathRenderer class.
 2016-08-02 10:57:28 +02:00
Yarn366 5e623d10b0 Moved the check for negative values in $Force Scaling Above so that $Scale Gauges can work properly 2016-02-06 16:40:08 -05:00
Yarn366 5b8410de98 Values of "Force Scaling Above" that are <= 0 are now handled in adjust_base_res rather than in gauge_load_common. (This fixes a bug that prevented this parameter from working properly under certain conditions.) 
Also removed an erroneous plus sign in adjust_base_res.
 2016-01-25 17:00:08 -05:00
Yarn366 1bd7160461 Remove parameters from gauge_settings constructor and change values after struct creation. 2016-01-25 15:13:17 -05:00
Yarn366 8464e1769f Use a constructor rather than a define to create a gauge settings struct. 2016-01-25 04:41:24 -05:00
Yarn366 ca95a3c25d Changed default gauge settings from a function to a define 2016-01-04 03:57:13 -05:00
Yarn366 3fd9b8f802 Fix the errors reported by AppVeyor and Travis CI (take 2) 2016-01-03 04:29:59 -05:00
Yarn366 890c607ad2 Fix the errors reported by AppVeyor and Travis CI (hopefully) 2016-01-03 03:56:13 -05:00
Yarn366 3512fcc18e Changed the gauge loaders to accept a pointer to the new gauge_settings struct instead of a bunch of values. 2016-01-03 03:12:00 -05:00
Yarn366 fa10977e77 Added parameters that allow HUD scaling to be disabled at lower resolutions and enabled at higher resolutions. 2015-12-03 20:06:06 -05:00
MageKing17 6df0a704f2 Add "Right-Align Ship Names:" option to HudGaugeEscort. 
It allows the escort gauge to render with ship names right-aligned, as the name would suggest. Changed gr_force_fit_string() to return the width instead redundantly returning the (already modified in-place) string; nothing else actually cares about the return value, so secondary impact should be nonexistent.
 2015-11-27 18:22:45 -08:00
Yarn366 33c7c4eae9 Added "Radar Center Offsets:" and "Radar Size:" to the 2D and 3D radar gauges 2015-11-23 19:48:04 -05:00
Yarn366 962261421e Added "Dock Max Width:" and "Order Max Width:" to extra target data gauge 2015-11-23 18:29:40 -05:00
Yarn366 5144dba6b4 Added "Fixed Header Position:" to wingman gauge 2015-11-23 18:22:37 -05:00
Yarn366 c3c7477114 Made head animations scale to the size of the gauge window. Also deprecated "Animation Background Size" parameter and added the more accurately named "Animation Size" parameter, which sets how large animations should be. 2015-10-29 14:35:08 -04:00
MageKing17 64c9b272e7 Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/pilotfile/pilotfile.cpp
 2015-08-19 11:53:25 -07: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
MageKing17 ab9d2e20fb Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/ship/ship.cpp
 2015-06-18 14:40:53 -07: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
MageKing17 e8bed8f892 Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/ship/ship.cpp
 2015-05-01 13:09:32 -07:00
MageKing17 bc0c7cf4c5 Vectorization of Ship_info. 
Converts Ship_info from a ship_info[] to an SCP_vector<ship_info>. ship_info now has proper constructors, assignment operators, and a destructor. Num_ship_classes removed; various references to Num_ship_classes and/or MAX_SHIP_CLASSES (which remains for various other structures which need it) changed to Ship_info.size() instead.

This doesn't make the ship class limit dynamic, but it is a preparatory step to get there.
 2015-04-27 00:01:22 -07:00
asarium 9aed627ce7 Replace longjmp with exceptions 
Also added a EditorConfig file
 2015-04-24 15:03:59 +02:00
MageKing17 4742378d50 Followup to r11266; let code use hardcoded defaults. 
Presumably, the use of use_default_pos in load_gauge_radar_dradis() is the result of a copy&paste job, but removing it allows the default values to be used to compute coords.

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11273 387891d4-d844-0410-90c0-e4c51a9137d3
 2015-03-04 22:43:03 +10:00
niffiwan a1979e704e Coverity 1244962 Uninitialized scalar variable 
Set default DRADIS coords to 0,0

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11266 387891d4-d844-0410-90c0-e4c51a9137d3
 2015-03-01 11:02:15 +10:00
niffiwan 16f0ff1959 Allow fonts to set/change special char indexes 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11151 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-10-24 19:06:21 +10:00
niffiwan df3435cadd Fix mantis 3108 (from Yarn) 
Make parsing of DRADIS and custom hud gauges consistent with the rest
of the hud gauges

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11087 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-09-27 00:19:25 +10:00
Goober5000 62a2fb3c00 Yarn's patch for Mantis #3106 (Font parameter in hud_gauges.tbl not parsed correctly) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11080 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-09-24 20:08:21 +10:00
Goober5000 7cd97633b6 Yarn's patch for Polish localization 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11044 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-09-09 20:37:02 +10:00
m_m f8ff3be1fe From MageKing17: Fix for Mantis 3085: Unhelpful error reporting in hud_gauges.tbl if an invalid gauge type is specified. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10978 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-08-11 18:54:04 +10:00
niffiwan b725ec527a Fix mantis 3087 (from Yarn) 
Readd translation support for default escort gauge header text

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10976 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-08-11 18:54:04 +10:00
The_E 5bff2754c2 From MageKing17: Fixes for a couple of clang warnings. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10921 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-24 19:45:27 +10:00
Goober5000 2fe0ec8ef0 Yarn's patch for Mantis #3049 (character remapping in tstrings.tbl) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10894 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:31 +10:00
niffiwan 4e98285d2a Followup to mantis 3009; missed the Lead Sight gauge in the 1st fix 
Rechecked all other gauges that set slew=true in their contructors
(vs 1st pass which checked gauges that set slew=true in hudparse.cpp)
I think I got them all now...

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10476 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-03-14 19:50:31 +10:00
niffiwan a2b42bf5f1 Fix mantis 3009: set slew correctly for hud gauges 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10462 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-02-20 18:27:35 +10:00
The_E 6b39db6b12 Remove a superfluous $ sign from gauge_load_common, which was messing up hud_gauges tables that defined differing fonts for hud gauges. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10350 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-31 17:26:00 +10:00
niffiwan cecc445e8b Move $Scale Gauges: token before $Reticle Style: to avoid breaking parsing when both are specified 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10275 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-14 20:24:45 +10:00
niffiwan 7f05cca670 Ensure Offset & Origin are used together (hud gauges) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10274 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-14 20:24:45 +10:00
niffiwan 4d7c218d59 Tweak HUD so that retail gauge scale/no-scale can be set in a minimalistic hud gauges table 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10273 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-14 20:24:45 +10:00
niffiwan 770cd66755 Add scaling option to Yarns hud gauges 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10272 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-01-14 20:24:45 +10:00
niffiwan aa60c5acec Coverity ID 109381[456]: Uninitialized scalar variable in load_gauge_target_monitor() 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10217 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-15 12:23:02 +10:00
niffiwan a3256bbf88 Fix two issues found by Yarn 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10210 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-11 18:52:14 +10:00
niffiwan 0402e46f89 Merge Yarn adaptable hud with m!m common hud parse 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10209 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-11 18:52:14 +10:00
niffiwan 706152c7d5 Add common parsing function for hud tables (originally from m!m with updates from me) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10208 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-11 18:52:14 +10:00
Goober5000 0fb563b241 set ballistic HUD gauge any time HUD is changed -- fixes Mantis #2962 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10158 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:37 +10:00
Goober5000 138e6b853f yeesh... a veritable cascade of const-correctness 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9783 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-13 20:18:32 +10:00