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
11,983 Commits 63 Branches 1,530 Tags
94412da2dec4bbe8db6be06b6855808ba37726b2
Commit Graph
154 Commits
Author SHA1 Message Date
Fabian Woltermann 64153da3bd Converts the flags of ship_weapon to use the new flag system 2016-08-13 10:42:47 +02: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
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
asarium f91c681ee1 Add improved joystick API 
This API allows to handle events from multiple joysticks but currently
only the events from the configured joystick are used.
 2016-08-02 20:08:21 +02:00
asarium 1bcd5400d3 Move build system to CMake 2016-07-22 12:07:19 +02:00
Goober5000 75411d92bb const-correctness inspired by 392, because why not be masochistic 2015-10-27 22:46:35 -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
asarium aaf470f49b Fix format warning in keycontrol.cpp 2015-08-19 11:26:28 +02:00
MageKing17 439ea76475 Adding static_cast<int>() to locations pointed out by m!m. 2015-08-12 14:39:12 -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
asarium aa6936a2a5 From LotF: Fix for Mantis 3134 
dynamic weapon point firing causes a crash when used on a fighter with more than 6 firing points
 2015-05-07 18:27:48 +02: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 a03f96ca01 Related to r11189: avoid calling factor_table::getNextSlots() if the ship doesn't have the dynamic linking flag. 
Basically, hitting "o" on any ship with more than 6 slots in a bank could crash FSO, even without the flag. Reported by Spoon.

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11192 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-12-10 16:37:43 +10:00
MageKing17 1d7c01181e Fix mantis #3133. Fixes logic errors in factor_table not being sure if it's supposed to be 0-based or 1-based at different times. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@11189 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-12-08 17:14:57 +10:00
niffiwan 1a0ef281ed Fix gcc warning in io/keycontrol.cpp 
suggest parentheses around ‘+’ in operand of ‘&’ [-Wparentheses]
This code previously worked only by fluke!

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10952 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-27 20:39:17 +10:00
Echelon9 2859e74ac9 Address clang warning: extra ';' after member function definition [-Wextra-semi] 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10901 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:31 +10:00
Echelon9 02aa18c260 Address clang warning - io/keycontrol.cpp:2504:7: warning: declaration shadows a local variable [-Wshadow] 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10883 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-07-14 19:02:30 +10:00
niffiwan 28c31c9ba2 Fix mantis 3053 (From MageKing17) 
Check KEY_DEBUGGED1 to allow event.log snapshot to trigger when using
release+cheats

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10740 387891d4-d844-0410-90c0-e4c51a9137d3
 2014-06-02 18:30:00 +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
Goober5000 6a8bc0a5ed make support ship deployment more robust, and prevent an edge case where too many support ships could be in the mission at one time 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@10000 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-11-10 18:28:55 +10:00
karajorma 0b0b3fdf70 Allow event.log to snapshot all events that are checked this frame. Allow event.log to record the status of the event the previous time it was checked in addition to its status this frame. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9762 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-09-03 21:01:26 +10:00
The_E 3664486cdb If the player ships' sensors are out, we need to exit button_function earlier. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9611 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:49 +10:00
karajorma ac6796f5af Add all the strings that had no translation. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9600 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
zookeeper b4f721c253 Fixed dual fire being available even for secondary banks with only one firepoint. 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9599 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-30 15:36:18 +10:00
Zacam 593be42e66 *drum roll* Pilot Code! Originated by taylor. Additional direct work by: The E, niffiwan, CommanderDJ, Pyro3D, Echelon9 (PVS-Studio), Karajorma and Eli2. (If I missed you, don't kill me.) 
MASSIVE thanks to Mjn.Mixael and Blue Planet for tireless constant testing.
(It's still not perfect, but it probably wouldn't be where it is at without them)

Spans a lot from initial commit to AP Branch in r6835.

git-svn-id: svn://svn.icculus.org/fs2open/trunk@9561 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:26:06 +10:00
Zacam 759b080814 pre-Antipodes Staging Merge: "Inferno" build options go away, INF_BUILD settings now "default" settings. Fixed and made consistent across all projects the Build Output names ("Debug" used for Debug builds at the very end of the file name before the extension and after other options such as SSE, where applicable) Other unused #defines or #ifdefs removed: DEMO build Related, STANDALONE_ONLY_BUILD (already covered by -standalone command line flag) 
git-svn-id: svn://svn.icculus.org/fs2open/trunk@9549 387891d4-d844-0410-90c0-e4c51a9137d3
 2013-03-18 20:24:46 +10:00
Goober5000 6fe3e087a9 FUBAR's fix for #2779 -- don't crash when launching asteroids 2013-01-12 22:34:30 +00:00
Echelon9 c6691dc721 PVS-Studio fix: Resolve bug introduced in r201 (9 years, 11 months ago) in relation to an if statement without encompassing curly brackets. 2012-11-12 14:32:57 +00:00
chief1983 4e5d3e2e57 Fix all the 'no newline at end of file' warnings I saw thrown by gcc on FreeBSD. 2012-11-02 17:30:17 +00:00
zookeeper 83871b3aa3 Added support for hiding/disabling keybinds in controlconfigdefaults.tbl. Patch from http://www.hard-light.net/forums/index.php?topic=81727.0 2012-08-30 06:45:22 +00:00
The_E f0254524db From CommanderDJ: Fix for Mantis 2657 (Alt-Shift-E does not clear escort list) 2012-06-22 15:55:43 +00:00
IssMneur 218ce9ed3f From Mastadon: "Target closest attacker" cycles through all attackers; misc code cleanup. 
- Changed "target closest attacker" command to cycle through the other baddies gunning for you by pressing the "target closest attacker" command repeatedly.
- The new functionality behaves similarly to the "target closest hostile" key.
- Moved the esct (or, the "Evaluate Ship as Closest Target" struct) to hudtarget.h, where a type declaration belongs.
- Moved the documenting comments for hud_target_closest() to be just above the function definition.
-- Also, converted these comments to doxygen format.
 2012-06-01 02:05:14 +00:00
zookeeper c87c2cbd63 Added a "collide submodel" subsystem flag, which makes the subsystem take local damage only from shots which actually impacted its submodel. 2012-03-17 17:40:53 +00:00
karajorma 5dbb9c3295 Make it possible to localise a couple of extra sentences. 2011-11-30 03:12:06 +00:00
Echelon9 21c2449f0b Documentation: Changes such that the Doxygen log reports clean, in anticipation of 3.6.14 release 2011-11-28 13:03:38 +00:00
Goober5000 6dff3d4179 fix compilation on MSVC 6 2011-11-13 03:52:01 +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 5b7883128c From zookeeper: [FotG] makes hyperspace warp type use a longer distance for the collision check 2011-10-08 15:15:46 +00:00
Echelon9 7d9ea6b21c Documenation: Code cleanup of keycontrol.cpp 2011-09-24 01:34:25 +00:00
Echelon9 911025d835 A small code cleanup patch from Eli2. Thanks. 2011-09-24 01:19:29 +00:00
Zacam c88660eca9 Also from Eli2: Code cleanup 2011-09-18 01:03:23 +00:00
Valathil 7a810e1dde From Eli2_: Change cheat codes to not use that useless crypto function anymore 2011-09-17 23:00:58 +00:00
The_E 704908f74e Since this header and cpp define a single function used in a single place, let's move the function to where it's used, and get rid of these files 2011-09-17 20:25:49 +00:00
Zacam a63dbe572c Part Two: Synchronization pass of Trunk and Antipodes Differences. 
Removes all extraneous ifdefs (Demo, E3, Multi Beta, etc).
Leaves Debug and Inferno.
 2011-09-09 10:23:53 +00:00
Zacam 9678d18bc3 Part One: Synchronization pass of Trunk and Antipodes Differences. 
Whitespace/tab mostly.
aicode does have a change of an Int3 to an Assertion.
bmpman has an update to bm_next_handle.
 2011-09-09 09:37:45 +00:00
karajorma 04348d856d Ignore-key SEXP and the changes needed to support it. 2011-07-30 18:54:02 +00:00
The_E 2eab7d90f2 From m!m: Patch for Mantis 2446: Scripts not pausing when game is paused. 2011-05-30 18:47:27 +00:00
Goober5000 315bd423dc rename subsystem type fields so as to better distinguish them 
some consistency checks
add "no aggregate" flag to exclude a subsystem from aggregate hitpoint calculations
 2011-02-14 08:33:23 +00:00
The_E 76e7f656d1 Adds "no ets" ships.tbl flag. 2011-01-23 16:03:04 +00:00
Echelon9 7d7ca9eb15 Fix: warning C6246: Local declaration of 'i' hides declaration of the same name in outer scope. 2011-01-23 12:47:08 +00:00