Commit Graph

9802 Commits

Author SHA1 Message Date
PabstMirror
1be926f3db Make rotation key a client setting
Improve compatibility with other addons
2016-06-07 11:52:28 -05:00
PabstMirror
aea086b75e Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-07 11:12:52 -05:00
jonpas
3124270254 Quote the unquoted 2016-06-04 21:07:24 +02:00
jonpas
5a20f1286b Change internal event framework names to contain prefix and be as short as possible 2016-06-04 21:05:26 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
1b6bbff139 Revert event names for synced events framework
Keeping these names as short as possible for network traffic purposes.
2016-06-04 09:46:50 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
SilentSpike
5b8fa4d4f1 Update common status effect framework
Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.
2016-06-03 20:53:43 +01:00
SilentSpike
bd985d57ff Run event renaming script for new additions 2016-06-03 20:53:43 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
39456003ee Merge branch 'cbaEventSystem' into removeLineDrawing 2016-06-03 12:55:37 -05:00
PabstMirror
4915637601 Few more in common 2016-06-02 20:13:09 -05:00
PabstMirror
59ffff406e Fix missing ; 2016-06-02 20:05:03 -05:00
PabstMirror
240cf4f0b5 Fix merge 2016-06-02 20:02:16 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
PabstMirror
7970979a18 Fix removed var in Map Gestures 2016-06-02 15:04:03 -05:00
PabstMirror
73215b707d Remove Line Drawing from MapTools
And change map tools key to ALT from CTRL
2016-06-02 14:36:25 -05:00
jonpas
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc
Replace execRemoteFnc with events
2016-06-02 17:08:01 +02:00
PabstMirror
b6aaba7f90 Integrate 1.60 marker shape color map interface (#3860)
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
2016-06-02 09:28:52 -05:00
PabstMirror
637b5e02e9 Update 3den attributes to use 1.60 scaling (#3857) 2016-06-02 09:26:57 -05:00
PabstMirror
675214cfb9 Allow drivers of vehicles to show microDagr (#3808) 2016-06-02 09:26:43 -05:00
PabstMirror
68d6c1969b Cleanup transistion to CBA's waitAndExec (#3858) 2016-06-02 09:22:40 -05: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
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
Glowbal
2e54310ff4 Merge pull request #3844 from acemod/fixShowHud
Fix showHud if set before display loaded
2016-06-02 10:39:46 +02:00
Glowbal
5c7148de1f Merge pull request #3851 from acemod/huntIR-multipara-fix
Fixed HuntIR deployment
2016-06-02 10:38:37 +02:00
Glowbal
5a50751eda Merge pull request #3856 from acemod/fixGogglesCba
Goggles - Fix script error from CBA_fnc_waitAndExecute
2016-06-02 10:38:14 +02:00
PabstMirror
b949440eb1 Goggles - Fix script error from CBA_fnc_waitAndExecute 2016-06-01 17:27:55 -05: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
ba27c8f914 Fix WEB_URL end of line error (#3854)
* Fix WEB_URL end of line error

* Change location of quote macro

* Fix medical_menu VERSION_CONFIG error
2016-06-01 14:41:33 +02:00
commy2
9d61dd6159 Merge pull request #3850 from acemod/fixCfgPatchesAuthor
Fix CfgPatches author/ is not a value
2016-06-01 14:24:17 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
commy2
e6000807ee Merge pull request #3849 from acemod/fix160ubc
Fix 1.60 UBC (slingloads)
2016-06-01 13:57:07 +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
commy2
13d55313d3 Merge pull request #3848 from acemod/fixCCIP
Fix vanilla CCIP on A-10
2016-06-01 11:38:07 +02:00
BaerMitUmlaut
7a8506cefd Update handleFired header comment 2016-05-31 23:12:57 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
BaerMitUmlaut
f3fbb6cbdd Fixed HuntIR deployment 2016-05-31 22:13:01 +02:00
jonpas
fa9384ffb4 Fix vanilla CCIP on A-10 2016-05-31 20:35:38 +02:00
Glowbal
d7b239f487 Merge pull request #3795 from acemod/deprecate-components
Add Deprecate components support
2016-05-31 10:40:24 +02:00
PabstMirror
6905e6f97f Fix showHud if set before display loaded 2016-05-31 01:53:28 -05:00
PabstMirror
598c3dc181 Fix 1.60 UBC (slingloads) 2016-05-30 17:11:06 -05:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
f6359907a3 Merge pull request #3669 from acemod/useQuotedPathMacros
Use new quoted path macros
2016-05-30 21:23:44 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
commy2
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00