Fabian Woltermann
ed84ac348e
Merge with master
2016-08-22 11:37:50 +02:00
m!m
38fb41909b
Merge pull request #861 from The-E/ai_profile_flags
...
Ai profile flags converted
2016-08-22 11:32:55 +02:00
Goober5000
d87babfd92
remove the SIF_BALLISTIC_PRIMARIES flag
...
See also my comments on #762 . The flag is almost entirely redundant, so this PR removes it in all instances where it's used in the ballistic primaries code. There are one or two places where removing it was not a no-op, so I adjusted the rest of the code accordingly (most notably in the parsing validation when it checks that primary weapon cargo has been assigned). I also added a few divide-by-zero checks and slightly tweaked the support ship rearm code. The use of the SIF_BALLISTIC_PRIMARIES flag in the ingame_join code was replaced with a dummy value to avoid bumping the multiplayer packet version number.
2016-08-21 17:38:42 -04:00
Fabian Woltermann
0591b7ef49
ai profile flags
2016-08-19 22:44:39 +02:00
Fabian Woltermann
1acfaa8157
Converts model subsystem flags
2016-08-19 14:59:15 +02:00
Fabian Woltermann
1a060aa6d7
Converts the other weapon flags
2016-08-19 09:24:54 +02:00
Fabian Woltermann
127976cd74
Weapon info flags conversion ( #851 )
2016-08-18 23:17:41 -07:00
Fabian Woltermann
98f72f9378
Finishes converting the remaining ship-related flags ( #843 )
2016-08-17 05:49:40 -07:00
Fabian Woltermann
418c47e426
Merge with master
2016-08-16 09:58:09 +02:00
Fabian Woltermann
3160bdaa00
Changes ship exit flags to the new system
2016-08-14 16:48:11 +02:00
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
MageKing17
c76c1cb4ff
Add an AI flag to enable old, unused behavior when attacking big ships.
...
Coverity defects 1320483, 1320484, 1320485, and 1320486 noted that several values were being set and then immediately overwritten before they could do anything. These appear to be related to behavior that Volition disabled before release that would allow the AI to slow down while attacking capital ships. It seemed a shame to waste this code, so I've added a flag to enable the behavior.
2016-08-07 14:27:59 -07:00
asarium
1bcd5400d3
Move build system to CMake
2016-07-22 12:07:19 +02:00
DahBlount
50496c8143
Add OF_COLLIDES check to avoid OBJ_RECALC_PAIRS
...
OBJ_RECALC_PAIRS unsets then sets the OF_COLLIDES flag, so when a ship
with "no collide" set on it warps out, the flag is essentially ignored
and the ship can collide during the warp sequence.
2016-05-24 22:54:10 -06:00
Goober5000
e302f0e456
convert the rest of the model instance functions to have model_instance_num parameters instead of object parameters
2016-02-10 23:23:44 -05:00
Goober5000
da812f9433
modify the actual function calls
2016-02-06 18:05:33 -05:00
SamuelCho
4a4486c9be
Merge branch 'master' into kill_ship_model_start
2016-01-03 13:02:47 -08:00
Goober5000
b1ac0876d4
add no-disabled-self-destruct ship flag
...
Normally, ships whose weapons or engines subsystems are destroyed will
self-destruct after 90 seconds if they are part of a wing (see
ai_maybe_self_destruct). This adds a ship flag to prevent that from
happening.
2015-12-20 23:12:59 -05:00
SamuelCho
0f0f6377d0
Killed the last vestiges of ship_model_start/stop.
2015-12-13 23:51:24 -08:00
The E
487f769064
Renaming vm_copy_transpose_matrix to vm_copy_transpose
2015-12-01 20:38:30 +01:00
The E
7604e82f05
Renaming vm_transpose_matrix to vm_transpose
2015-12-01 20:37:33 +01:00
The E
e0defd287a
Renaming vm_vec_crossprod to vm_vec_cross
2015-12-01 20:36:34 +01:00
The E
a413255728
Renaming vm_vec_dotprod to vm_vec_dot
2015-12-01 20:35:47 +01:00
asarium
032aa154de
Re-enable two warnings
...
The unknown pragmas have been fixed by wrapping them in a visual studio ifdef
2015-09-03 15:38:33 +02: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
f625df5c38
Fix format warning in aicode.cpp
2015-08-19 11:26:26 +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
Goober5000
1bf6f822ae
* remove an incorrect comment (the *= multiplies the variable by the entire RHS; it doesn't multiply and then add)
2015-08-18 00:35:51 -04: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
d029b82d98
Fix: ai/aicode.cpp:11855:9: warning: variable ‘dist_to_f2’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:04:41 +10:00
Echelon9
ad8064ef81
Fix warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-11 21:58:07 +10:00
Echelon9
1787b95498
Fix: ai/aicode.cpp:14896:75: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:28:59 +10:00
Echelon9
f12dc5478b
Fix: ai/aicode.cpp: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-06 22:19:28 +10:00
Echelon9
039ad64a33
Fix: ai/aicode.cpp:10715:9: warning: variable ‘dist’ set but not used [-Wunused-but-set-variable]
2015-07-04 19:03:09 +10:00
Echelon9
c83a2ea2e8
Fix: ai/aicode.cpp:8169:24: warning: variable ‘time_to_enemy’ set but not used [-Wunused-but-set-variable]
2015-07-04 18:58:10 +10:00
Echelon9
edbedeb84a
Fix: ai/aicode.cpp:8017:10: warning: variable ‘eshipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 17:39:44 +10:00
Echelon9
58f7fb247b
Document ai_update_aim() after touching the function
2015-07-01 23:07:17 +10:00
Echelon9
aa1feb0799
Refrain from unnecessarily passing a pointer to global object to ai_update_aim()
2015-07-01 23:07:17 +10:00
Echelon9
833e7b1d7a
Ensure consistent capitalisation of ai_update_aim() parameter.
2015-07-01 23:07:17 +10:00
Echelon9
b2a07f19c2
Remove redundant parameter to compute_time_to_enemy(). Function doesn't need a pointer to the enemy objp, where it uses distance directly instead.
2015-07-01 23:07:17 +10:00
Echelon9
39188f7926
Remove redundant parameter to ai_ignore_wing().
2015-07-01 23:07:17 +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
Lari Nieminen
4acad3b126
Added a "no-secondary-lock-on" ship flag to disable secondary homing.
2015-06-14 22:25:54 +03:00
MageKing17
16229a9950
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
2015-05-18 10:04:21 -07:00
Lari Nieminen
2c1d1b12cc
Allowed bay path speed modifiers to function in both pathing modes.
2015-05-13 00:35:40 +03:00
Lari Nieminen
c9ec754eb6
Fixed $bay arrive/depart speed multiplier not working correctly.
2015-05-11 19:09:55 +03:00
Lari Nieminen
ffed62372f
Added ai_profiles and path metadata options to force AI ships flying bay paths to gradually accelerate/decelerate instead of flying the path at max speed.
2015-05-10 11:52:09 +03: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
Fabian Woltermann