Commit Graph

92 Commits

Author SHA1 Message Date
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
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
PabstMirror
52915e1104 Common func to run config tests (#5170)
* Common func to run config tests

* Add map config testing, malden data and reverse map config's latitude

* Headers

* Simplify config levels

* Header

* fix example
2017-08-22 16:21:41 -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
305c5a7be7 1.70 FCS - Remove ACE_FCS from most vics (#5152)
* Handle 1.70 FCS

* Cleanup CfgWeapons

* Add warning for discreteDistance
2017-05-16 00:30:47 +02:00
esteldunedain
4df561e13a Fix airburst ammo when the ACE_FCS is not enabled (the code is not reached anyway) 2016-11-15 23:11:34 +01:00
ulteq
9641d306e6 Reused already calculated initSpeed 2016-11-15 23:11:34 +01:00
esteldunedain
4854b963db Apply a correction to the FCS based on vanilla zeroing 2016-11-15 23:11:34 +01:00
PabstMirror
618d3a2e96 Block FCS when controlling a UAV
Fix doing FCS keyUp calculations/setVariable
when controlling a UAV while also in a turret with FCS enabled.

Normal rangefinder on the UAV will still work as FUNC(canUseRangefinder)
is still true
2016-06-24 16:53:13 -05:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
0d5385ffaf Update FCS hud when manually setting range. 2016-05-19 21:50:51 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
PabstMirror
84c5a0d266 FCS - Minor firedEH optimization 2016-04-01 21:51:22 -05:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
commy2
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
VKing
f1cc2ddd51 Change to apply in fcs 2016-02-07 13:08:31 +01:00
esteldunedain
fe66d93275 Added ignore private warnings + trace 2016-02-06 17:07:05 -03:00
esteldunedain
efbff8cc23 Pass the turret path too 2016-02-06 16:49:53 -03:00
esteldunedain
59cbc6da10 Remove unneeded test in FCS fireEH 2016-02-06 16:49:27 -03:00
esteldunedain
b2bd11ed77 Apply the ufeh to ACE_FCS 2016-02-06 16:29:58 -03:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202
Fix laser_selfdesignate does not measure the distance
2016-02-04 20:17:06 +01:00
SzwedzikPL
03fca3c372 fix fcs keyup/down forced params #3202 2016-01-25 09:49:47 +01:00
VKing
299baf1e4a Fix shotbullet checking (lost in merge) 2016-01-21 15:56:53 +01:00
VKing
fedfa94dcd Clean up 2016-01-21 15:01:41 +01:00
VKing
4406f270e2 Fix infantry rangefinders (again) 2016-01-21 14:44:23 +01:00
VKing
bf5eb78788 Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions
# Conflicts:
#	addons/fcs/functions/fnc_keyUp.sqf
2016-01-21 02:14:51 +01:00
VKing
b83be88571 Enhance ranging.
KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal.
Sorry in advance for the merge conflicts
2016-01-21 02:02:50 +01:00
VKing
7d3044a5c2 Move display update stuff to fnc_getRange 2016-01-21 00:20:21 +01:00
VKing
5f14d17f98 Another fix for BIS' inconsistent implementations 2016-01-20 22:30:22 +01:00
VKing
43c9444fb8 Didn't need that isNil check, anyway 2016-01-20 15:51:07 +01:00
VKing
a9511936fd LayZ evaluation 2016-01-20 12:35:53 +01:00
VKing
05ce4f824c Rewrite fnc_getRange to work with specified minimum and maximum ranges
Also cleaning up fnc_keyUp a bit
2016-01-20 00:10:27 +01:00
VKing
968f7c000b Simplify 2016-01-19 21:16:41 +01:00
VKing
ae576e57e3 Fix the magazine name being broken in later code 2016-01-19 20:21:37 +01:00
VKing
59923710b7 Fix FCS not taking weapon initSpeed into account in some circumstances 2016-01-19 19:52:18 +01:00
PabstMirror
6d6cbec5ef Add missing FUNC to FCS key (Rangefinders)
#3160
2016-01-19 09:02:51 -06:00
commy2
077b9827e8 code cleanup fcs 2015-12-10 16:00:14 +01:00
PabstMirror
a621eaab24 #2750 - Update FCS display after distance adjust 2015-11-13 02:57:06 -06:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
VKing
a899c74133 ace_fcs_ace_time -> ace_fcs_time 2015-10-21 22:17:28 +02:00
VKing
0936238862 Fix lead calculation for vehicle FCS 2015-10-21 21:52:48 +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
582ea318d4 Merge remote-tracking branch 'origin/superTime'
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00