Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 04:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,582 Commits 61 Branches 105 Tags
81e02a73369d341ef21d0b8fc1ad9c62e1688f2e
Commit Graph

1187 Commits

Author SHA1 Message Date
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02: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
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
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
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +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
commy2
94b5cea3cf Merge pull request #3814 from acemod/cbaBinocularMagazineFnc 
Use new binocular magazine CBA functions and deprecate ACE functions
 2016-05-30 21:00:43 +02:00
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
commy2
882aa26ab2 Merge pull request #3813 from acemod/cbaGetItemObjectConfig 
Use new CBA get config functions and deprecate ACE functions
 2016-05-30 21:00:05 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
PabstMirror
84eca899a9 Add event renaming system 
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
 2016-05-23 14:03:55 +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
SilentSpike
f0b8da33c4 Deprecate ACE events framework 
CBA 2.4.0 entirely replaces the ACE events framework.

Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
 2016-05-22 16:09:49 +01:00
jonpas
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
jonpas
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00
jonpas
4b121480bb Use new binocular magazine CBA functions, deprecate ACE functions 2016-05-22 15:48:03 +02:00
jonpas
d35e89892c Use new get item and object config CBA functions, deprecate ACE functions 2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
jonpas
472e4631d6 Deprecate delayed execution functions 2016-05-22 15:25:59 +02:00
jonpas
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
commy2
c9ea5676ea travis test 2016-05-21 13:29:42 +02:00
commy2
e40c814b04 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-21 13:27:51 +02:00
commy2
d395fcd792 travis pls 2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb fullCrew new parameter to improve FUNC(getTurretX) 2016-05-21 13:07:17 +02:00
PabstMirror
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802) 
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
 2016-05-20 11:23:14 -05:00
commy2
25876d82ca manual merge 2016-05-18 12:21:53 +02:00
commy2
230f0ab85e manual merge 2016-05-18 12:20:33 +02:00
commy2
08bafd535f deleted to much 2016-05-18 12:00:13 +02:00
commy2
655277cc17 remove previously deleted block 2016-05-18 11:58:42 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
Glowbal
32055401d3 Add backwards compatability for InventoryChanged 
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
 2016-05-16 00:09:53 +02:00
Glowbal
487400b142 Add different warning messages based on current version of component 2016-05-15 20:13:10 +02:00
Glowbal
3d74c25c97 Add deprecate component solution 2016-05-15 19:38:24 +02:00
commy2
07caf1b0bd fix for null player 2016-05-14 20:33:33 +02:00