Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge ACEX #8415

Merged
merged 15 commits into from
Oct 14, 2021
Merged

Merge ACEX #8415

merged 15 commits into from
Oct 14, 2021

Commits on Aug 13, 2021

  1. 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
    @jonpas
    jonpas committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    30c6543 View commit details
    Browse the repository at this point in the history

  2. Resolve issues

    @Mike-MF
    Mike-MF committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    7325725 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2021

  1. Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

    @Mike-MF
    Mike-MF committed Aug 28, 2021
    Configuration menu
    Copy the full SHA
    a748925 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. Remove unnecessary backwards compat

    @Mike-MF
    Mike-MF committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    a6ac806 View commit details
    Browse the repository at this point in the history

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

    …agazine
    @Mike-MF
    Mike-MF committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    9e46623 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2021

  1. Merge branch 'master' into acex-merge

    @jonpas
    jonpas committed Oct 9, 2021
    Configuration menu
    Copy the full SHA
    831dc5d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2021

  1. Apply suggestions from code review 

    Co-authored-by: PabstMirror <pabstmirror@gmail.com>
    @jonpas @PabstMirror
    jonpas and PabstMirror authored Oct 10, 2021
    Configuration menu
    Copy the full SHA
    71d3671 View commit details
    Browse the repository at this point in the history

  2. Remove maintainers from merged ACEX components

    @jonpas
    jonpas committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    65a632f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. Merge branch 'master' into acex-merge

    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    bfd3e38 View commit details
    Browse the repository at this point in the history

  2. Cleanup unused module and faction classes

    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    862e7dc View commit details
    Browse the repository at this point in the history

  3. Sitting - Add more object configs by @Dystopian 

    acemod/ACEX#255
    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    148b72f View commit details
    Browse the repository at this point in the history

  4. Translations - Add Japanese by @classicarma 

    acemod/ACEX#259
    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    84858cd View commit details
    Browse the repository at this point in the history

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

    acemod/ACEX#251
    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    66823b0 View commit details
    Browse the repository at this point in the history

  6. Add ACEX authors and sort authors file

    @jonpas
    jonpas committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    bce03c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. acex - final tweaks (#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
    @PabstMirror
    PabstMirror authored Oct 14, 2021
    Configuration menu
    Copy the full SHA
    836a176 View commit details
    Browse the repository at this point in the history