Commit Graph

1608 Commits

Author SHA1 Message Date
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
8e004741b9 Cleanup 2016-06-07 11:13:42 +02:00
9cfa2f11d9 Stuff
Arguments, Return Value, (optional)
2016-06-06 20:42:20 +02:00
ef4e232664 Merge remote-tracking branch 'master' into rearm_supply 2016-06-06 20:28:27 +02:00
8ed2dd11d2 Merge pull request #3871 from acemod/magRepackImprovements
Add size parameter to displayTextPicture, Improve parameter checking …
2016-06-05 00:05:07 +02:00
3124270254 Quote the unquoted 2016-06-04 21:07:24 +02:00
5a20f1286b Change internal event framework names to contain prefix and be as short as possible 2016-06-04 21:05:26 +02:00
8ff4a2ecaf Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style) 2016-06-04 20:40:55 +02:00
03a56b1f7d Fix goKneeling changing animation inside vehicle (1.60) 2016-06-04 19:58:53 +02:00
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
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
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
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
bd985d57ff Run event renaming script for new additions 2016-06-03 20:53:43 +01:00
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
4915637601 Few more in common 2016-06-02 20:13:09 -05:00
240cf4f0b5 Fix merge 2016-06-02 20:02:16 -05:00
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc
Replace execRemoteFnc with events
2016-06-02 17:08:01 +02:00
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
68d6c1969b Cleanup transistion to CBA's waitAndExec (#3858) 2016-06-02 09:22:40 -05:00
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
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
2e54310ff4 Merge pull request #3844 from acemod/fixShowHud
Fix showHud if set before display loaded
2016-06-02 10:39:46 +02:00
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
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
d7b239f487 Merge pull request #3795 from acemod/deprecate-components
Add Deprecate components support
2016-05-31 10:40:24 +02:00
6905e6f97f Fix showHud if set before display loaded 2016-05-31 01:53:28 -05:00
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
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
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
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
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
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
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
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
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
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
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
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00