Glowbal
52f8def590
Merge pull request #3991 from acemod/uavFCS
...
Block FCS when controlling a UAV
2016-06-26 10:47:19 +02:00
PabstMirror
5589ef2bb8
Fix Target lead indication for B_APC_Tracked_01_AA_F
2016-06-25 00:13:07 -05: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
commy2
bf098ec70e
fix some rogue mission dependencies, fix #3954
2016-06-20 21:07:10 +02:00
commy2
3fdc0dd521
Merge pull request #3955 from acemod/add_name
...
add 'name' to components
2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
Josuan Albin
7c9dcf6bdb
Merge branch 'pr/3480'
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/cargo/stringtable.xml
addons/flashlights/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/main/stringtable.xml
addons/map/stringtable.xml
2016-06-18 16:26:46 +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
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
PabstMirror
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
jonpas
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
jonpas
4c995d4c5c
Improve selective UI API ( #3805 )
...
* Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI
* Upgrade Selective UI framework for controls that share IDCs for gunner and soldier
* Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore
* Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load
* Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function)
* Do location check in function, Rename condition to location, change to number
* Use macros in ACE_UI location
2016-06-02 14:32:39 +02:00
jonpas
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
jonpas
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
jonpas
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +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
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
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
Alessandro Foresi
e97c7c0f65
Translation: IT completed (with BOM)
2016-03-27 21:22:15 +02:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
NorXAengell
772c4cc100
Another batch of translations and corrections (Fr)
2016-03-01 02:27:19 +01:00
commy2
c45523475f
manual merge
2016-02-22 16:06:30 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
commy2
4c0a817ba8
use precompiled function for optics display
2016-02-21 22:56:35 +01:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +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
Thomas Kooi
dd3613c357
Merge pull request #3190 from acemod/fcs_enableGMG
...
Add FCS to more things
2016-02-04 20:03:19 +01:00
Thomas Kooi
6cf02bd06b
Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions
...
Cleaning up the FCS code
2016-02-04 19:39:32 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
SzwedzikPL
03fca3c372
fix fcs keyup/down forced params #3202
2016-01-25 09:49:47 +01:00
VKing
8482d45d8b
Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty.
...
Lower max range to 5500m (9990 is too damn high!)
2016-01-21 16:00:55 +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
