scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 17:49:53 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity
10,488 Commits 62 Branches 1,531 Tags
6d60bb1511c19fa0cd586d78a3ff10090efa64fa
Commit Graph
160 Commits
Author SHA1 Message Date
Echelon9 5d593f0df0 Plumb through is_minimum_GLSL_version() 2016-01-03 16:33:04 -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
asarium 733b020bf5 Fix unneded check for this != nullptr in wmcgui.h 2015-08-19 11:26:31 +02: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 6985b198ec Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 
Conflicts:
	code/ship/ship.cpp
 2015-08-12 13:25:34 -07:00
Echelon9 efc4d62bd0 Change s/Error code/Error message/ in GUISystem::ParseClassInfo() 2015-08-06 17:56:53 +10: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 aae7c47748 Fix: lab/lab.cpp:943:9: warning: declaration of ‘j’ shadows a previous local [-Wshadow] 2015-07-06 21:14:45 +10:00
Echelon9 c220480075 Fix: lab/lab.cpp:2497:45: warning: declaration of ‘color’ shadows a global declaration [-Wshadow] 2015-07-05 00:40:13 +10:00
Echelon9 e613f4db7d Simplify duplicative lab/ includes, which are in lab/wmcgui.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
SamuelCho 2ba39e6b6d Refactored how color setting is done for model rendering. Fixes Mantis 3163. 2015-05-29 21:54:33 -07: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
Lari Nieminen 72a082c9eb Added a $Thruster Glow Noise Mult ship table entry for decreasing/increasing the effect of noise applied to the glow radius. 2015-05-23 00:11:43 +03: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
MageKing17 764c1ab03f Fix F3 lab using old idx value. 
This was causing everything to use the Ship_info index of the size of the species vector; for FS2, that meant 3, which meant GTF Ares.
 2015-05-18 10:09:29 -07: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
SamuelCho 90c8025588 Code cleanup before the big soft shadows and deferred lighting merge into master. 2015-05-08 21:55:28 -07:00
SamuelCho 094c5fe302 Resolve faster ibx and improved profiling merges. 2015-05-08 20:53:59 -07:00
Lari Nieminen ce853a5f07 Added a "Show Destroyed Subsystems" flag to ship lab for viewing -destroyed submodels. 2015-05-08 01:20:58 +03: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 202bd3a5dc Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info 2015-05-05 14:39:01 -07:00
Goober5000 f0a0632d9d Merge pull request #51 from asarium/coverity/1093689 
Fix for Coverity 1093689: Resource leak
 2015-05-02 23:47:28 -04:00
Swifty c620372357 Soft shadows, deferred lighting, and various major graphics optimizations. 2015-05-02 14:35:37 -07:00
asarium aef3e3ac36 Fix for Coverity 1093688: Resource leak 2015-05-02 19:24:57 +02:00
asarium a7398d7f5c Fix for Coverity 1093689: Resource leak 2015-05-02 18:19:28 +02: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 1591237acf Reverting recent string of commits. 
Since they didn't go through code review (and break compilation), reverting the recent string of commits (just used "git revert -n 5042c44..05b4635").
 2015-04-29 16:19:59 -07:00
zookeeper 400fd0f9a8 Fixed $Thruster Glow Noise Mult not having effect in the ship lab. 
git-svn-id: svn://svn.icculus.org/fs2open/branches/zookeeper@10789 387891d4-d844-0410-90c0-e4c51a9137d3
 2015-04-29 23:07:41 +03: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
The_E d3089bb406 Fix for Mantis 2882 by Mageking17 (change-team-color with None color results in error) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10914 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:32 +10:00
chief1983 ae351d2924 Fix Mantis 2886 - Option to render External weapon models, besides Tech models, in Weapon lab, from FUBAR. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10907 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:31 +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
Echelon9 bc568a9149 Address clang warning - lab/lab.cpp:912:8: warning: declaration shadows a local variable [-Wshadow] 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10881 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:30 +10:00
Echelon9 522eb962ff Fix a range of issue identified via clang warnings 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10860 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-05 10:38:08 +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
Echelon9 f834aa80a9 Fix Coverity CID 1093375: Copy-paste error 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10245 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-12-22 19:05:16 +10:00
Wanderer ca0bcd5dbf Fix for Mantis #2806 - added option to rotate the turrets according to 'initial' state animation code in the lab - option enabled by default but can be toggled via render options 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10022 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-10 18:28:58 +10:00
Goober5000 6836199eeb ship_subsys is now a class 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10021 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-10 18:28:58 +10:00
Wanderer 6cbc4f78c4 Fix to prevent invalid weapon bitmap references from being created in the lab. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10016 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-10 18:28:57 +10:00
niffiwan 8b78abd7a6 Coverity CID 1093930: read from pointer after free in GUIScreen::Add(GUIObject* new_gauge) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9857 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-29 22:12:23 +10:00
Goober5000 7e5b2aee52 turn mc_info into a plain data struct, part 2 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9822 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-26 18:51:36 +10:00
Goober5000 886018d28f here a const, there a const, everywhere a const const 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9801 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-20 19:46:41 +10:00
Valathil 456290db4e Fix for Mantis 2364: Load the relevant thruster bitmaps when switching weapons in lab. 2012-12-18 20:09:08 +00:00
Goober5000 b329c4020a fix Mantis #2752 2012-12-13 06:14:04 +00:00
Goober5000 0627377338 Admiral MS's fix for Mantis #2723 2012-11-12 06:57:18 +00:00
Goober5000 b30e2ee226 inspired by recent change to multi_sexp.cpp... in most cases, SCP_string should not be passed by value 2012-11-05 08:31:39 +00:00