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
10,488 Commits 62 Branches 1,531 Tags
6d60bb1511c19fa0cd586d78a3ff10090efa64fa
Commit Graph
568 Commits
Author SHA1 Message Date
asarium 94ca29735c Quit when the end of the mission is reached 2015-12-02 17:03:54 +01:00
DahBlount 3fa03fcda0 Fix ENVMAP vertex shader to use the inverse of gl_ModelViewMatrix 2015-11-30 09:36:29 -07:00
Peter Mitsis 57c16bd58a toolchain: Replace __attribute__((__unused__)) with __UNUSED 
Abstracting this allows for the possibility of other compilers to have their
own implementation of marking a variable as potentially unused without using
the __attribute__ keyword (which is not supported on all compilers).

Signed-off-by: Peter Mitsis <[email protected]>
 2015-11-22 11:32:07 -05:00
Goober5000 564f31aeab properly close the fiction viewer when returning to the main menu 2015-11-04 00:54:02 -05:00
niffiwan 253d8a7eb1 Fix memory leak from Control_config_presets 2015-10-31 14:06:56 +10:00
Goober5000 eaa09dd862 small optimization of shadow checks 2015-10-24 15:42:06 -04:00
Yarn366 932a5230e9 Fixed language autodetection 2015-09-02 17:13:33 -04:00
Cliff Gordon 0a2b97c3bc Merge pull request #41 from MageKing17/ship_info 
Ship_info vectorization, ship templates.
 2015-08-20 21:51:18 -05:00
Cliff Gordon f824df070b Merge pull request #290 from MageKing17/cleanup/move-voice-recognition-grammar-files 
Move the temporary grammar files into the build directory.
 2015-08-20 21:34:10 -05:00
MageKing17 20279838bf Move the temporary grammar files into the build directory. 
These are only used for voice recognition on Windows. In addition, the gc.exe shouldn't be needed locally since it should be included with SAPI, which Visual Studio 2010 and later should already include.

I also tried to backport some of the changes from the 2013/2015 project files to the 2010/2012 project files, but lack of certain compiler flags made me tend to err on the conservative side in that regard.
 2015-08-19 16:33:13 -07:00
Cliff Gordon f0c4bf2e3a [fix/292_warnings_part_b] Cast Frametime (of type fix) to int for printf specifier to avoid a warning. 2015-08-19 17:01:07 -05: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
Goober5000 bd3cd7eb18 Merge pull request #195 from Echelon9/fix/sort-uniq-includes 
Review and refactor #include's
 2015-08-19 00:05:02 -04:00
MageKing17 ce3755b333 Further hook variables cleanup. 
Consolidated a few sequential calls, corrected a few instances of "ObjectB" being removed when "Object" was set, and removed a couple instances of hook variables that weren't set being removed.
 2015-08-18 08:11:11 -07:00
MageKing17 dc80ae0c9a Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/ship/ship.cpp
 2015-08-06 00:25:42 -07:00
Echelon9 8e018c5338 Clean up load_animating_pointer(). 2015-07-01 23:07:17 +10:00
Echelon9 90bb4e3a7b Simplify duplicative freespace2/ includes, which are in freespace2/freespace.h 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 2d662075c3 Merge remote-tracking branch 'origin/master' into fix/triplemon_hud 2015-06-17 10:11:57 -05:00
MageKing17 7e696a55d2 Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Also added model_icon_angles to the ship_info() constructor, and model_icon_angles, thruster_glow_noise_mult, and min_engine_vol to ship_info::clone() and and ship_info::move().

Conflicts:
	code/ship/ship.cpp
	code/ship/ship.h
 2015-05-28 23:49:33 -07: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
The E ef9ae017b5 Make sure we use the same calling convention both times 2015-05-19 21:21:54 +02:00
The E 2c626b4eec According to AMD and NV, these _should_ force their drivers into high-performance mode 2015-05-19 20:48:01 +02:00
MageKing17 274a32e1ac Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/model/modelread.cpp
	code/ship/ship.h
 2015-05-12 19:22:58 -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
Swifty c620372357 Soft shadows, deferred lighting, and various major graphics optimizations. 2015-05-02 14:35:37 -07: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
niffiwan b0bb0ee3be Remove gcc -Wunused-but-set-variable warnings 2015-04-29 20:27:49 +10: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
MageKing17 0c60515662 Record mission loading time in the debug log. 
(Just changes a printf into an mprintf.)

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11323 387891d4-d844-0410-90c0-e4c51a9137d3
 2015-04-23 12:09:15 +10:00
chief1983 161e7498c4 git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11309 387891d4-d844-0410-90c0-e4c51a9137d3 2015-04-18 18:12:04 +10:00
Goober5000 f01c4bf952 fix Mantis #3135: account for the case when the game is paused before being minimized 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11190 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-12-08 17:14:57 +10:00
Goober5000 e22a4b0b5b xt branch: add capability for custom identifiers in build names (e.g. Xt-0314) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11128 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-10-13 12:24:24 +10:00
Goober5000 31562ba811 xt branch tweaks 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11120 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-10-12 18:22:10 +10:00
Goober5000 435b078157 Yarn's patch for Mantis #3107 (Parts of the interface code assume a font size of 10) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11082 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-09-25 16:40:34 +10:00
zookeeper 774ec066a4 Fix a render target bug by disabling environment mapping when doing full-scene RTT. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10959 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-30 20:41:21 +10:00
The_E b178fd0cbc Fix for Mantis 3076 from MageKing17: Fixes behaviour of animated textures on skyboxes 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10927 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-24 19:45:28 +10:00
The_E d3ef69848c Fix for Mantis 3064 from MageKing17: Adds more functionality to colors.tbl. * "#Start Colors" is now optional; no more need for a blank section at the start of a colors.tbl just to define some team colors. * "#Interface Colors" section added for redefining various colors used by the interface. * "#Color Tags" section added for redefining or adding your own text color tags. * "#Default Text Color" section for choosing what color tag is the baseline default for various different screens. * And the big one, support for *-clr.tbm modular table files. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10926 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-24 19:45:28 +10:00
chief1983 f89d864756 Fix Mantis #3070, courtesy of Yarn. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10868 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-05 10:38:09 +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
niffiwan e3ebdd3ce9 Coverity ID 1221483: Missing break in switch 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10763 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-06-09 13:48:52 +10:00
m_m d84d9d31aa Added multiple scripting features related to messaging as requested by Axem. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10756 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-06-06 16:51:18 +10:00
m_m 6d5b5ddde1 Add support for voice acting in fiction viewer. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10755 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-06-06 16:51:18 +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
niffiwan 7c3631002b From Yarn: Fix mantis 3031 
Use PF_USE_AFFIRMATIVE_ICON where necessary

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10601 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-05-04 20:52:23 +10:00
chief1983 46c61fcbcf Unify all the revision placeholders out to 6 digits for increased regex replacement reliablity. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10570 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-04-22 19:22:25 +10:00
The_E 6e91857745 From Yarn: Fixes interface graphics scaling issues. If, for some reason, you want to have the interface graphics stretched, use the -stretch_menu commandline flag. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10544 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-03-30 12:39:54 +10:00