scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 17:46:53 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
10,347 Commits 63 Branches 1,530 Tags
032c19e8894069ffbf4be2bc4e731455238beb19
Commit Graph
72 Commits
Author SHA1 Message Date
asarium d822f2a467 Merge branch 'master' into antipodes 
Conflicts:
	code/io/timer.cpp

timer conflict was fixed by using the performance counters of SDL instead of what the OS offers directly
 2015-05-08 22:24:36 +02:00
MageKing17 5f43e78be2 Fix Mantis 3140. 
Changes the "virtual frame" used for aspect locks to be 640x480 so as to correct different lock behavior due to both different aspect ratios and different resolutions. Applies a scaling factor to the drawing of the lock indicator on the HUD so that it traverses roughly the same portion of the screen regardless of resolution.
 2015-05-05 12:54:07 -07:00
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
z64555 8d5fbab768 z64555's debug console. Take 2. Includes changes to most (not Xcode) project files to include the added files of r10621 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10622 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-05-08 19:18:37 +10:00
The_E 98355da7d5 Revert 10619: Missing files 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10620 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-05-08 19:18:36 +10:00
z64555 2b2ba832f8 z64555's debug console. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10619 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-05-08 19:18:36 +10:00
The_E 09d039fd42 sync to trunk 10223 
git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-03-06 19:24:13 +10:00
Echelon9 ce41e56f46 Fix Mantis 2896: AddressSanitizer: global-buffer-overflow in hud_lock_reset() hudlock.cpp (v2) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10204 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-08 19:52:58 +10:00
Goober5000 40c4583792 fix Echelon9's fix >:( also add a judicious Assert for Mantis #2958 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10139 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-25 19:29:37 +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
Goober5000 8a72823839 turn hud_anim back into an actual struct 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9834 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-28 11:47:23 +10:00
Echelon9 90a6702ede Fix Mantis 2896: AddressSanitizer: global-buffer-overflow in hud_lock_reset() hudlock.cpp 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9699 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-07-26 08:14:30 +10:00
m_m 947263a047 Let's try this again, hopefully this time without reverting previous changes. See r9215 for a better description. 2012-09-24 16:17:26 +00:00
The_E 1f8dcf5494 Reverting 9215, because it conflicts massively with my fixes for hud_gauges. m|m, did you update your checkout before committing your stuff? 2012-09-22 21:41:23 +00:00
The_E 1d75b96d5c Trunk sync r9215 2012-09-20 16:34:15 +00:00
m_m 1faee4f711 Added weapon specific HUD tracking and lock-on sounds and in-flight sounds. 
New options are $TrackingSnd, $LockedSnd, $InFlightSnd and +Inflight sound type.
 2012-09-20 13:05:09 +00:00
CommanderDJ 35da255b8d Trunk sync r8874. 2012-06-12 07:57:20 +00:00
Goober5000 bfe3f3f60c parentheses are A-1 SUPAR 2012-06-11 01:04:46 +00:00
The_E ebfeb106e9 Trunk sync r8441-8444 2012-02-06 12:57:58 +00:00
Swifty dd1c4a436c Fixed Mantis 2413. hud-set-color changes to the HUD will no longer reset when pausing or entering options menu. Introduced Color entry fields for hud_gauges.tbl. 2012-02-06 10:01:01 +00:00
Swifty 3affb86b52 Removed configOverride from HudGauge class since we don't even use it. 2012-02-05 03:41:31 +00:00
Zacam d495ef5ca9 Trunk Sync r7926 2011-10-23 19:04:29 +00:00
IssMneur 29b4a6c922 From m!m: patch to add support for customizable cockpit sounds. See: http://www.hard-light.net/forums/index.php?topic=78675.0 2011-10-22 22:11:31 +00:00
Zacam 31ccffef1c Trunk Sync r7853 2011-10-03 11:28:19 +00:00
The_E ca52181adb From Eli2: Patch for Mantis 2489: adjust-audio-volume doesn't affect subspace 2011-10-02 11:08:41 +00:00
Zacam 17b3c8be17 Trunk Sync r7677 2011-09-08 05:47:44 +00:00
IssMneur 0717ad3d13 PVS-Studio fix: V512 A call of the 'memcpy' function will lead to overflow of the buffer '& x'. (pstypes.h:131) 2011-09-08 05:39:53 +00:00
The_E 75f66ee174 Trunk sync r7607 2011-08-31 19:36:54 +00:00
Zacam 10445ba0c3 MSVC Analysis C6244: Local declaration of <variable> hides previous declaration at <line> of <file>. (lock_world_pos; 31; hudlock.cpp) 2011-08-31 09:59:55 +00:00
Echelon9 139bb5afa9 PVS-studio fix: Ensure that both x and y of Player->current_target are reset correctly in hud_lock_determine_lock_point() 2011-08-10 13:47:06 +00:00
Zacam d3bb5578e3 From Echelon9: For testing, PVS-Studio output corrections. 2011-08-09 07:45:09 +00:00
The_E 116c1945f5 Trunk sync r7104 2011-04-04 20:25:24 +00:00
The_E 406b57e5b0 Fix for Mantis 2391 (Erroneous warning about missing assets due to changd HUD loading mechanisms) 2011-04-04 13:03:29 +00:00
Zacam 09fad95070 Antipodes 7 Merge: HUD Overhaul, by Swifty. 2010-12-12 20:34:15 +00:00
chief1983 48d5472738 Initial commit of HUD/Dradis code from Swifty's branch for Antipodes 7 2010-10-19 23:17:26 +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
karajorma a2afa2b67a Switch to using the Macros for Multiplayer modes whenever possible. 2010-04-27 13:42:59 +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
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 75baeadbed crap, that did need to be a float to work properly (fixes wobbly hud from r4561) 
also be sure to handle the overflow case in HUD_get_nose_coordinates()
 2008-03-30 08:53:50 +00:00
taylor 88693b7388 fix various compiler warnings 2008-03-29 06:30:20 +00:00
taylor 94d2357dd4 some minor optimization and cleanup 2008-03-29 05:22:28 +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
Kazan 7e25a502a8 recommiting keldor's javelin_hs patch without busting line endings 2008-02-08 04:34:18 +00:00
Kazan 1d2d2bce10 revert all my commits from today [revert codebase back to r4410] 2008-02-08 02:29:47 +00:00
Kazan 9adacb0a51 Keldor's Javelin HS (new homing missile type) patch - approved by Kazan 2008-02-07 16:55:00 +00:00
Goober5000 b8eee053fa allow FS1 hud to be displayed in FS2 
(many thanks to the icculus project for blazing the way)
 2008-01-24 03:53:36 +00:00
taylor 0107652287 maybe optimize the (PI/2), (PI*2) and (RAND_MAX/2) stuff a little bit 2006-08-19 04:38:47 +00:00