2 Commits

Author	SHA1	Message	Date
BrettMayson	a40b0d48f2	HEMTT v10 Compatibility (#9105) ... * HEMTT v10 Compatibility * Update addons/field_rations/CfgUIGrids.hpp Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix PabstMirror review * optionals * End empty macro definitions with semi-colon (HEMTT v0.10) * Adapt to HEMTT v0.10.0-a14 * Revert End empty macro definitions with semi-colon * Disable old HEMTT build step in CI * Add missing include and fix macro usage and include casings * End empty macro definitions with semi-colon (HEMTT v0.10) * Update addons/disarming/functions/fnc_showItemsInListbox.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * cleanup test code * arty - keep style same as before * fix fire screams * Update script_component.hpp * Keep old hemtt/workflow/sqfc * Update arma.yml * Update arma.yml * Update CfgUIGrids.hpp --------- Co-authored-by: PabstMirror <pabstmirror@gmail.com> Co-authored-by: jonpas <jonpas33@gmail.com>	2023-02-01 23:28:55 -06:00
jonpas	6ca9d59443	Merge ACEX (#8415) ... * 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 https://github.com/acemod/ACEX/pull/255 * Translations - Add Japanese by @classicarma https://github.com/acemod/ACEX/pull/259 * Kill Tracker - Add killtracker.inc public include file by @Freddo3000" https://github.com/acemod/ACEX/pull/251 * Add ACEX authors and sort authors file * acex - final tweaks (#8513) * acex - handle old funcs * replace thirst/hunger setvars to acex naming fix macro Revert "fix macro" This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad. Revert "replace thirst/hunger setvars to acex naming" This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868. x Co-authored-by: TyroneMF <TyroneMF@hotmail.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>	2021-10-14 10:46:43 -05:00