Commit Graph

59 Commits

Author SHA1 Message Date
PabstMirror
74fd0f507f Add EH for UAV control, Add Hellfire support (#5305)
* Add EH for UAV control, Add Hellfire support

* cycle guidance keybind

* Handle broken PlayerViewChanged

* humps

* UAV Self-interactions (#5379)

* Switch ACE_Player to uav AI on valid seat change

* Different approach to UAV interactions

* Forgot to remove a variable

* Changed param to select
2017-08-22 16:07:45 -05:00
Tim Beswick
a0b5f9f2d5 Laser seeker range improvements (#5365)
* Workaround for laser max range. Made laser hud seeker use ammo values.

* Nested ifs for optimization of check
2017-08-03 12:50: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
3898202091 Hellfire missiles (#4679)
* Hellfire

* Cleanup dev macros

* Cleanup some debug

* Add base interaction node for firemode actions

* Handle bad data in attack profile variable

* Skip ammo checks (returns bad data on added weaps)

* Add mags sizes for apache

* Add Hellfire Wiki Doc

* Cleanup doc

* Add pylon support

* Add support for pilot controlled weapons

* Add label to pylon mags

* Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver
2017-06-02 16:51:38 -05:00
PabstMirror
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176)
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
PabstMirror
491aaa89cb Update laser code if laser is already on (#4677) 2016-11-17 13:28:25 -06:00
PabstMirror
63f3673a65 Missile Guidance Overhaul 2016-10-17 16:08:23 -05:00
Nicolás Badano
ab6fc8efca Laser guidance for all designators (#3308)
* Fix laser and missileguidance over water

* Return a normalized vector in EFUNC(common,getTurretDirection)

* Make laser dispersion simulation optional, default off

* Prototype for ace_laser_designate

* Remove vanilla laser handling from ace_laser in favor of the new code on ace_laser_designate

* Simplify laser into one module

Rewrite large parts of laser
Merge laser_designate
Delete lase_selfDesignate

* Cleanup missile guidance

* Headers, fix laser over water

* Cleanup

* Test

* Change setting to scalar, more cleanup

* Add seeker debug drawing
2016-10-08 12:55:30 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02: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
commy2
1f6b10c4cb convert laser to cba hashes (#4186) 2016-07-30 17:16:29 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
jonpas
7ede53bbdd QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics 2016-05-25 02:09:11 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01: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
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
Glowbal
275b0c4300 Merge branch 'release'
Conflicts:
	README.md
	addons/finger/stringtable.xml
2015-08-04 22:29:05 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
822115214f Laser - Handle Bad Data Returns 2015-07-31 03:06:27 -05:00
jonpas
66ceaa1d31 Fixed IS_STRING error due to regex replacing it with LSTRING 2015-05-30 20:09:53 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
jaynus
991ecdfe01 Removed: Debug sidechat in laser seeker code. 2015-05-11 13:37:50 -07:00
jaynus
dfbfb4ace2 Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751 2015-05-01 11:31:37 -07:00
jaynus
8361ec3812 ace_lasers 2015-04-18 10:57:11 -07:00
jaynus
26e2917f79 Merge remote-tracking branch 'origin/master' into laserCodes
Conflicts:
	addons/javelin/CfgWeapons.hpp
2015-04-18 10:36:07 -07:00
jaynus
fb6553a7a7 Only show distance if laser is on. 2015-04-14 16:57:01 -07:00
jaynus
934f2ce097 Display current laser code. Standardize GVARs 2015-04-14 16:29:49 -07:00
jaynus
2ec74a6a3e align correctly, create event, remove FCS from laserDesignator. 2015-04-14 16:20:03 -07:00
jaynus
971566fc3e Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER 2015-04-14 16:05:01 -07:00
Nou
dc5028275a Seeker FOV implemented, fast FOV check. 2015-04-12 19:16:58 -07:00
jaynus
db5d54dffd Only allow for laser designator for vanilla compensation. 2015-04-12 16:38:43 -07:00
jaynus
509b5e1a05 Integration of lasers for vanilla laser designation as well. Remove debug. 2015-04-12 14:12:21 -07:00
jaynus
2317a3c988 Visually hide laser targets. 2015-04-12 14:03:15 -07:00
jaynus
5251de8447 break out seeker angle check. more laser code cleanup. 2015-04-12 12:16:26 -07:00
jaynus
16cd05edc8 Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers 2015-04-12 11:01:27 -07:00
jaynus
01797fd3b9 Integarate laser code into SALH guidance + self_designate. Note todo items. 2015-04-12 11:01:22 -07:00
Nou
4a23b8be00 Allow string function names. 2015-04-12 10:52:50 -07:00
Nou
40c5de8cfb Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:14:03 -07:00