Commit Graph

63 Commits

Author SHA1 Message Date
PabstMirror
98f957e787 move cam func 2024-07-29 12:32:33 -05:00
PabstMirror
b5d0ae600a Merge branch 'master' into pr/8215 2024-03-28 14:45:59 -05:00
johnb432
415d2f685c
General - Change FUNC to LINKFUNC where appropriate (#9882)
FUNC -> LINKFUNC
2024-03-28 13:57:23 -05:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
PabstMirror
477bdd0184 Merge branch 'master' into pr/8215 2023-10-06 19:41:13 -05:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Brandon Danyluk
20ad6283b7 more SACLOS tweaks 2022-01-01 21:28:54 -07:00
Brandon Danyluk
175652456b add the ability to see a light trail 2021-05-08 02:49:16 -06:00
Brandon Danyluk
f3bea7bb30 change how IR seeker performs
The angle check is better now. Relative velocites guarenteed
2021-05-01 22:58:11 -06:00
Brandon Danyluk
de05c68f99 Process all navigation onFired. Send the correct array to function 2021-05-01 20:55:26 -06:00
Brandon Danyluk
f5b316176c Add paremter to allow weathervaning
Weapons usually tend toward the velocity vector due to aerodynamics - calculate side slip and use calculation to do this
2021-05-01 20:19:22 -06:00
Brandon Danyluk
19dcf00aff Fix NLAW and PLOS
The missile pitches up due to initial angle stuff. I don't know if this is behaviour we want to fix or not?
2021-04-21 00:23:21 -06:00
Brandon Danyluk
9d26335271 Fix SACLOS missiles 2021-04-20 18:11:44 -06:00
Brandon Danyluk
fe1e6d45cb update dragon to not use new guidance 2021-04-16 19:02:03 -06:00
Brandon Danyluk
1b000d658a Allow for debug info to be displayed via variable 2021-04-16 15:43:31 -06:00
Brandon Danyluk
abc5babb50 Implement optical mavericks 2021-04-16 00:33:38 -06:00
Brandon Danyluk
d0775283e3 implement course state machine 2021-04-14 02:29:27 -06:00
Brandon Danyluk
a2d2dd0df9 chane navigation profiles to go for attack direction instead of target 2021-04-13 20:05:28 -06:00
Brandon Danyluk
1873467deb Add zero-effort miss. Seeker now feeds data to navigation 2021-04-13 16:10:39 -06:00
Brandon Danyluk
187c6d35c3 Implement some generic modes of flight 2021-04-12 23:14:22 -06:00
Brandon Danyluk
8948e8ac77 add camera tool to observe projectile in flight 2021-04-12 17:03:21 -06:00
Brandon Danyluk
e54e6ec254 Fix hellfire firing without lock. Change LOS navigation type 2021-04-12 16:44:59 -06:00
Brandon Danyluk
46abb93cb8 add GBU-12 to missile guidance 2021-04-12 02:51:02 -06:00
Brandon Danyluk
cf40622b52 Fix metis and HOT to use new scheme 2021-04-12 00:12:16 -06:00
Brandon Danyluk
450d1a2a09 allow for bang bang guidance 2021-04-10 19:02:31 -06:00
Brandon Danyluk
4d5d395f61 adjust hellfire attack profile to work with pro-nav 2021-04-10 18:32:55 -06:00
Brandon Danyluk
5cd61d1301 set default navigation type 2021-04-10 13:16:08 -06:00
Brandon Danyluk
fd8a55addf make navigation a modifyable system 2021-04-10 13:11:20 -06:00
Brandon Danyluk
53ff3bb1f5 proportional navigation now "works" 2021-04-03 21:04:16 -06:00
Brandon Danyluk
17175db48e v2 of proporitonal nav 2021-03-31 17:16:00 -06:00
Brandon Danyluk
365860dd09 attempt at missile dynamics 2021-03-26 23:15:29 -06:00
Brandon Danyluk
51542f9053 Basic proportional navigation and PID controller 2021-03-18 23:28:55 -06:00
Brandon Danyluk
316fbfe7b9 Implement Metis SACLOS guidance (#6997)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Begin transfer of SACLOS into Missile Guidance

* Allow seeker and attack profiles to have their own "OnFired" functions

* Fix bugs with SACLOS

* Implement Metis wire guidance. Add "Beam" guidance

* add missing parenthesis

* Update how Wire/Beam guidance works. Add compatability for SACLOS planes. Move all base missile changes out of missileguidance and into their own files.

* try to cleanup merge

* minor stuff
2019-12-16 20:01:30 -06:00
Brandon Danyluk
abe2ce2f6f Implement M47 Dragon (#6773)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Ports over NouberNou's dragon guidance

* Add Dragon model

* Make the Dragon CSW capable

* Fix bugs regarding argument order

* Add Dragon Attack Profile. Change how missileGuidance guidance_pfh works in order to allow for different types of missiles besides continious thrust

* Fix bug regarding missile direction. Add official US Army training manual for the dragon for reference purposes

* Adjust model to reflect real-life one

* Add attackProfile and guidanceProfile onFired functions

* Change Dragon "onFired" to reflect missileGuidance changes

* Only implementing the Super-Dragon. Remove Tabs. Add new lines to all files. Add string-table. Tweak missile flight dynamics

* Add sight description

* Fix inheritance issues. Missile damage values tweaked. Fix String Table. Add backblast area.

* Add feature wiki page.

* Fix picture issues

* Remove Dragon manual

* add missing semi-colon

* Tweak damage values. Fix formatting. Add lazy evaluation where applicable

* Disable the ability to switch to the unusable launcher. Convert rvmat numbers to equivalent but more readable numbers. Multiple code fixes. ace_csw required. Formatting fixes. TGA -> PAA. Remove unused comments in missile guidance code

* Dragon flight dynamics tweaked. Now assuming there is a booster angle creating wobble. Add a slight delay when the wire breaks to fire all of the service charges

* hpp newline fixes. Case sensitivity for model and rvmat references

* Update Wiki dependencies

* Revert "Update Wiki dependencies"

This reverts commit efc298c481.

* fix dependency component

* Changed inheritance structure to be more rigid. Remove un-needed config values. Fix script issues regarding positioning and the launchers aliveness

* get rid of the optic for the base dragon. fucking bi configs not making sense

* Lock non-useable dragon on initialization

* Add model.cfg for animations

* Fix formatting. Fix M47 Dragon Optic zoom

* Change LOD selection names

* Revert indentation, keep parenthesis. "Start, stop, start stop! Jesus! I'm starting to think Mattis is just a big cock tease"

* Re-update indentation of model.cfg

* Path fix. Whitespace fix

* Sight attach/detach on same vehicle

* If the sight gets detached, make sure the dragon goes dumb. Remove resetting of resting position when gunner gets out - looks stupid, but when the dragon is fired weird stuff happens

* disable debug

* Add EOF

* Maybe finally fix EOF problem
2019-06-07 23:48:37 -05:00
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key (#6732)
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
2019-01-30 22:11:01 -06:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
PabstMirror
49374feb2a NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791)
* NLAW Prototype

* Make AI Compatible

* Add Overfly Top Attack Mode

* Limit Max Deflection

* Base prediction on AI skill

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Configure for attack cycle key

* Finish OTA ammo effects

* Cleanup

* Arm at 20m

* Disable Debug

* No models for short lived sub-ammos

* Fix Korean strings

* Change AI randomization to use skillFinal

* Add wiki doc for nlaw

* Cleanup

* Cleanup

* Cleanup
2017-06-02 16:51:20 -05:00
PabstMirror
63f3673a65 Missile Guidance Overhaul 2016-10-17 16:08:23 -05:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
PabstMirror
3ae8a494c4 Add javelin configs for new apex launchers
Fix #4007
2016-06-28 22:46:04 -05:00
PabstMirror
20376385ca Fix #4007 - Handle bad target when using apex titans 2016-06-27 13:43:05 -05:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
ab2ebf5fcf MissleGuidance - Move PARAMS up to top 2015-07-03 21:06:13 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00