Merge ACEX #8415

jonpas · 2021-09-01T10:18:29Z

When merged this pull request will:

Merge ACEX into ACE3
Keep backwards compatibility with any items, settings and config entries.
- Add X set of macros (XADDON, (QQ)XGVAR).
- Add ACEX-prefixed CfgPatches.
Convert ACEX component's ACE Settings into CBA Settings
Merge Convert all true/false in configs to 0/1 ACEX#254
Merge Sitting - Add more objects configs ACEX#255
Merge Update of Japanese translation ACEX#259
Merge Add killtracker.inc include file ACEX#251

Idea of ACEX was good, but it still today isn't large enough to really warrant it being its own mod, it always felt like it added more work (maintenance, updating dependencies, doing another release etc.) than it was worth it.

Instead, after some internal discussion, this PR is opened as a proof of concept to merge ACEX and ACE3. All ACEX components come with settings to disable them, and any future components that would be deemed "out of scope for ACE3" and would instead go into ACEX, will be able to go into ACE3 either in this similar way (disabled by default) or optional, which we distribute separately on Steam and in launchable @mod folders anyways.

ACEX doesn't have the benefits it used to have, especially with CBA Settings, the way we now handle optionals in ACE3 and reduced workforce as Arma 3 is less and less interesting for the lack of a better word.

The idea to merge ACEX was approved by the ACE-Team, but this PR now needs some love from the community, testing it on old missions, verifying backwards compatibility is there and generally reviewing it.

Left to do after initial approvals/tests:

Documentation refactor Documentation - Merge ACEX #8526
News post Add ACEREP #00011 #8519

Backwards compatibility with XGVAR set of macros used on all settings and config entries Public API functions not taken into account yet, many other things probably still missed

…agazine

jonpas · 2021-09-01T10:22:45Z

One internal worry that was brought up by @BaerMitUmlaut is a potential problem with the X family of macros. Other components referencing those variables could be easily mistaken.

I don't think it's a big issue, PRs should be tested anyways. But as an alternative idea, we could also change do ace_var = acex_var; on setting change (each time setting changes). That would just require the settings to retain ACEX-prefix for backwards compatibility, but all use of it could use the standard set of macros.

As for config entries, we could also just ignore backwards compatibility for them, I am not sure how many people used those in their own mods, assuming not many.

addons/field_rations/functions/fnc_handleRespawn.sqf

addons/fortify/Cfg3DEN.hpp

jonpas · 2021-10-10T16:52:57Z

Note: Remove "Maintainers" part from README.mds as well.

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

jonpas · 2021-10-13T14:26:29Z

Test on a missions saved with ACE3 and ACEX stable (right) and loaded on this PR (left).

acemod/ACEX#255

acemod/ACEX#259

acemod/ACEX#251

jonpas · 2021-10-13T15:13:42Z

Merged ready open PRs from ACEX, acemod/ACEX#258 as I was not sure that was approved, it currently lives on https://github.com/acemod/ACE3/tree/acex-merge-pr-258.

…Control' and 'acex-merge' into tac-3.14.0-pre acemod#8245 acemod#7565 acemod#8064 acemod#8273 acemod#8415

mharis001

No obvious issues when looking through the code. Just a minor discussion point in the suggestions.

addons/field_rations/XEH_postInit.sqf

* acex - handle old funcs * replace thirst/hunger setvars to acex naming fix macro Revert "fix macro" This reverts commit d807e5e. Revert "replace thirst/hunger setvars to acex naming" This reverts commit bafc607. x

Seb105 · 2021-10-14T19:55:19Z

fyi acemod/ACEX#258 was never properly reviewed to my knowledge.

jonpas · 2021-10-14T22:16:08Z

fyi acemod/ACEX#258 was never properly reviewed to my knowledge.

And it was not merged either as I said above.

@Dystopian

* Merge ACEX - first attempt Backwards compatibility with XGVAR set of macros used on all settings and config entries Public API functions not taken into account yet, many other things probably still missed * Resolve issues * Switch to addSetting, backward compatible CfgPatches, missed XGVAR. * Remove unnecessary backwards compat * Convert ACEX Categorised settings to initSettings / Fix Intel items magazine * Apply suggestions from code review Co-authored-by: PabstMirror <pabstmirror@gmail.com> * Remove maintainers from merged ACEX components * Cleanup unused module and faction classes * Sitting - Add more object configs by @Dystopian acemod/ACEX#255 * Translations - Add Japanese by @classicarma acemod/ACEX#259 * Kill Tracker - Add killtracker.inc public include file by @Freddo3000" acemod/ACEX#251 * Add ACEX authors and sort authors file * acex - final tweaks (acemod#8513) * acex - handle old funcs * replace thirst/hunger setvars to acex naming fix macro Revert "fix macro" This reverts commit d807e5e. Revert "replace thirst/hunger setvars to acex naming" This reverts commit bafc607. x Co-authored-by: TyroneMF <TyroneMF@hotmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>

jonpas and others added 5 commits August 13, 2021 17:17

Merge ACEX - first attempt

30c6543

Backwards compatibility with XGVAR set of macros used on all settings and config entries Public API functions not taken into account yet, many other things probably still missed

Resolve issues

7325725

Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

a748925

Remove unnecessary backwards compat

a6ac806

Convert ACEX Categorised settings to initSettings / Fix Intel items m…

9e46623

…agazine

jonpas added status/needs-testing impact/large kind/refactor labels Sep 1, 2021

This was referenced Oct 2, 2021

Remove/adjust duplicate loadout transfer logic in headless acemod/ACEX#256

Open

Overheating - Add cook off and rate of fire features and additional customization settings #8064

Merged

Merge branch 'master' into acex-merge

831dc5d

jonpas mentioned this pull request Oct 10, 2021

General - Move to CBA Settings #8461

Merged

PabstMirror reviewed Oct 10, 2021

View reviewed changes

addons/field_rations/functions/fnc_handleRespawn.sqf Outdated Show resolved Hide resolved

PabstMirror reviewed Oct 10, 2021

View reviewed changes

addons/fortify/Cfg3DEN.hpp Outdated Show resolved Hide resolved

jonpas and others added 3 commits October 10, 2021 20:33

Apply suggestions from code review

71d3671

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Remove maintainers from merged ACEX components

65a632f

Merge branch 'master' into acex-merge

bfd3e38

jonpas added this to the 3.14.0 milestone Oct 13, 2021

jonpas removed the status/needs-testing label Oct 13, 2021

jonpas added 3 commits October 13, 2021 16:31

Cleanup unused module and faction classes

862e7dc

Sitting - Add more object configs by @Dystopian

148b72f

acemod/ACEX#255

Translations - Add Japanese by @classicarma

84858cd

acemod/ACEX#259

jonpas force-pushed the acex-merge branch from 1bb155e to 84858cd Compare October 13, 2021 15:02

jonpas added 2 commits October 13, 2021 17:03

Kill Tracker - Add killtracker.inc public include file by @Freddo3000"

66823b0

acemod/ACEX#251

Add ACEX authors and sort authors file

bce03c5

jonpas added a commit to Theseus-Aegis/ACE3 that referenced this pull request Oct 13, 2021

Merge branches 'TCVMFire', 'VehicleDamage', 'hot-hot-hot', 'setCruise…

3117283

…Control' and 'acex-merge' into tac-3.14.0-pre acemod#8245 acemod#7565 acemod#8064 acemod#8273 acemod#8415

PabstMirror approved these changes Oct 14, 2021

View reviewed changes

mharis001 approved these changes Oct 14, 2021

View reviewed changes

addons/field_rations/XEH_postInit.sqf Outdated Show resolved Hide resolved

PabstMirror mentioned this pull request Oct 14, 2021

ACEX - Final tweaks #8513

Merged

acex - final tweaks (#8513)

836a176

* acex - handle old funcs * replace thirst/hunger setvars to acex naming fix macro Revert "fix macro" This reverts commit d807e5e. Revert "replace thirst/hunger setvars to acex naming" This reverts commit bafc607. x

jonpas added kind/added feature kind/feature Release Notes: **ADDED:** and removed kind/added feature labels Oct 14, 2021

PabstMirror merged commit 6ca9d59 into master Oct 14, 2021

PabstMirror deleted the acex-merge branch October 14, 2021 15:46

This was referenced Oct 14, 2021

Update of Japanese translation acemod/ACEX#259

Closed

Add killtracker.inc include file acemod/ACEX#251

Closed

Sitting - Add more objects configs acemod/ACEX#255

Closed

Convert all true/false in configs to 0/1 acemod/ACEX#254

Closed

jonpas removed the kind/refactor label Mar 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge ACEX #8415

Merge ACEX #8415

jonpas commented Sep 1, 2021 •

edited

Loading

jonpas commented Sep 1, 2021

jonpas commented Oct 10, 2021

jonpas commented Oct 13, 2021 •

edited

Loading

jonpas commented Oct 13, 2021

mharis001 left a comment

Seb105 commented Oct 14, 2021 •

edited

Loading

jonpas commented Oct 14, 2021

Merge ACEX #8415

Merge ACEX #8415

Conversation

jonpas commented Sep 1, 2021 • edited Loading

jonpas commented Sep 1, 2021

jonpas commented Oct 10, 2021

jonpas commented Oct 13, 2021 • edited Loading

jonpas commented Oct 13, 2021

mharis001 left a comment

Choose a reason for hiding this comment

Seb105 commented Oct 14, 2021 • edited Loading

jonpas commented Oct 14, 2021

jonpas commented Sep 1, 2021 •

edited

Loading

jonpas commented Oct 13, 2021 •

edited

Loading

Seb105 commented Oct 14, 2021 •

edited

Loading