Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,154 Commits 73 Branches 88 Tags 752 MiB
a3aef6a066
Commit Graph

344 Commits

Author SHA1 Message Date
BrettMayson
464ab0cefb
Tools - Add HEMTT SQF support and fix commas are not semicolons (#9663) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-12-07 03:20:47 +00:00
BrettMayson
95e06254eb
Tools: HEMTT ignore has_include (#9613) 
* Tools: HEMTT ignore has_include

* Fix make.py and sqfvmChecker.py for changes

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-03 12:30:20 -05:00
BrettMayson
836be21f2d
Tools - HEMTT PW3 fixes (#9585) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-01 02:29:59 +01:00
PabstMirror
902e365536
Tools - Update addon.toml to HEMTT 1.9.1 (#9511) 
Tools - Update addon.toml to hemtt1.91
 2023-10-18 14:19:20 -05:00
PabstMirror
7b418b7731
Tools - Update publisher for compats moving to main (#9339) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-10-17 20:40:24 +02:00
Grim
31a64a33b6
Compat SOG - Add explosives support to 1.3 mines (#9450) 
* add fuse claymore

* add WP mines

* missing semicolon

* add dummy
 2023-10-01 14:30:24 -04:00
BrettMayson
d2f5c2de02
Spearhead 1944 Compatibility (#9292) 
* compat(spe): initial

* --changed csw/turrets

* disable spe disassemble

* csw: all mortars done

* more cleanup

* add missing hearing protection

* final cleanup

* goofed and removed too much

* ok all done

* formatting

* remove adt

* -+ updated frameworks

- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)

* formatting

* Require HEMTT v1.7.2

* cleanup tabs / formating

* Apply suggestions from code review

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: ZluskeN <pontux@gmail.com>

* split to subcomponents, fix ubcs

* swap has_include for skipWhenMissingDependencies

* fix explosives

* add pdumies for ww2

* Apply suggestions from code review

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* cleanup sten duplicate configs

* move hearing to macro

* fix macro repaclement

* Use `SUBADDON`

* Move `addonRootClass` to bottom of CfgPatches

* Relative includes

* move config macro includes to config.cpp

* comment off csw changes for now

* Update .hemtt/project.toml

---------

Co-authored-by: Coldfront15 <born2toot2@gmail.com>
Co-authored-by: Brett Mayson <brett@joinoffstreet.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-09-25 15:37:59 -05:00
PabstMirror
bd0dfe4b30
compat rhs - fix SUBCSTRING and check_strings.py (#9424) 2023-09-23 12:40:48 -05:00
Mike-MF
ab6dd0164e
Compat WS - Realistic Names (#9419) 
* Compat WS - Realistic Names

* use cba subcstring

* cleanup python

* Update script_macros_common.hpp

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-23 13:07:52 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
PabstMirror
a34d9455d2
Tools - Update setup.py for hemmt dev filepatching (#9231) 
* Update setup.py

* Update setup.py
 2023-09-12 13:47:21 -05:00
PabstMirror
ebef82d10b
Tools - Fix make.py failing when pboProject\Settings folder missing (#9393) 2023-09-12 13:04:26 -05:00
Grim
e5a49f3acf
Compat RHS - Make compats autoload if mod is present (#9294) 
* autoload RHS USAF compat

* whoops

* fix filepatching builds

* pboProject pls

* add ONE semicolon.

* remove meta.cpp

* add AFRF, move stringtables

* add addon.toml

* stringtable validation

* change subconfig folder names for stringtables

* macros

* sigh

* macros

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* add SAF compat

* missing file

* config brackets

* Update addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp

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

* Update addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp

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

* capitalization

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* fix double class

* gref and fastroping

* fix functions

* Update CfgVehicles.hpp

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-03 11:36:19 -05:00
PabstMirror
6c674533b3
Tools - make.py will try running pboProject once if it's not in registry (#9356) 2023-08-30 19:09:46 -05:00
PabstMirror
882294e9f7
Tools - make.py print tail of packing log on error (#9351) 2023-08-29 15:41:56 -05:00
PabstMirror
9c25fea548
Tools - Update includes tools, ignore .hemttout in str validator (#9337) 
Tools - update includes tools, ignore .hemttout in str validator
 2023-08-21 00:00:24 -05:00
PabstMirror
ad1f50304f
Tools - fix toml file read (#9277) 2023-07-21 14:53:49 -05:00
BrettMayson
12bb5aced4
Tools - HEMTT preprocess is now an object (#9275) 
* hemtt: preprocess is now an object

* error on deprecated usage
 2023-07-21 11:23:03 -05:00
PabstMirror
efe1ecd4cd
workflow/tools - trivial cleanup (#9274) 
* workflow - trivial cleanup

* Add Validate headers to vscode tasks
 2023-07-20 16:15:21 -05:00
PabstMirror
fbe23ee45f
Optionals - Load dynamically based on presence of mod (__has_include) (#9116) 
* Optionals - Load dynamically

* Update XEH_preStart.sqf

* Update pboproject.yml

* Update script_macros.hpp

* use addon.toml for hemtt

* Update pboproject.yml

* update all actions

ref
Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2, actions/upload-artifact@v2.

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Apply suggestions from code review

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update settings.json

* cleanup interm hemtt changes

* Update .github/workflows/arma.yml

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

---------

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-04-30 16:53:43 -05:00
jonpas
76e1aafb33
Use function documentation script (#6897) 
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
 2023-04-30 23:03:35 +02:00
jonpas
f67ae06d21
Add HEMTT setup script for Windows and document HEMTT use (#9184) 2023-04-30 23:01:45 +02:00
Filip Maciejewski
10881fc5bd
SOG Compat - Add 1.2 update support (#8974) 
* Update vn_mine_tripwire_m16_02_ammo base class

* Fix fnc_handlePunjiTrapDamage

Hopefully once and for all

* Remove placement actions from punji traps

* Add Explosives compat for 1.2 content

TODO testing

* Add quoting to stringtable config usage

* Prevent bike mine placement object from swinging all over the place

* Add non attachable ACE_Triggers for big mines

Bike mine looks kinda stupid when it's attached to a car...

* Bike mine triggers

* Cartridge mine triggers

* Lighter mine triggers

* Pot mine triggers

* Jerrycan mine triggers

* Mortar shell mine triggers

* Grenade board mine triggers

* Inheritance fixes

* Update damage handler for new punji traps

* Improve interaction points and dig distances

* Dh10 mine triggers

* Bump damage of vn_mine_cartridge_ammo

* Add incendiary features to lighter and jerry can explosives

WIP

* SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (#8978)

* Added fuel tank volumes for SOG update 1.2 vehicles

* Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR

* Add missing EOLs

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Improve placement feedback of Whip punji

* Add inheritance to custom wound handlers

* Fix doorway punji position

* Add spikes offset for affected units of doorway trap

* Prevent spiderholes from being loaded into cargo

* Add missing continue digging action to spiderholes

* Fix spiderholes physics while being dug up via trenches system

Depends on #8998

* Add missing params

* Fix parenthesis

* Add pDrive dummy files

This is stupid.

* Enable Melee weapons in the arsenal

* Add Entrenching tool capabilities to Shovel and ETool

Depends on #8999

* Add incendiary features to Molotov and M14

* Tweak chance of being set ablaze

Now sums all hitpoints damage.

* Add ACE_damageType to napalm and he bombs

* Do not change cartridge mine damage and range if no ACE Medical

* Simplify variable config values

* Swap cartridge mine hit values

Whoopsie.

* Add overpressure configs to launchers

* Fixed an issue preventing the M1919A6 CSW from being disassembled (#8970)

* Remove disassembleTo from CSW weapons

This config property is meant for tripods.

* Add CSW config for MG42

* Simplify requiredAddons

* Remove proxy weapons from most of the CSW, adjust loading times

The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar.

* Add vn_pavn_30_can.p3d pDrive dummy

* Fix missing MG42 mag icon

* Add field_rations values to food props/mags

Needs #9008 to be usable.

* Add more field_rations values to food props/mags

Send help.

* More food configs

* Even more food configs

Fooooood.

* More fooood

Even more foooooood.

* Fix food inheritance

* Add SGM CSW compatibility

* Various fixes for CSW

Wrong tripods for opfor guns, missing translation

* Improve TOW interaction position

* Add dragging and interaction configs to recoilles rifles

* Cleanup SGM CSW config

* Add MK18 CSW config

* Add H-12 MLRS CSW config

* Add missing Mk18 stringtable

* Add function header and logging to fnc_woundsHandlerIncendiary

* Add missing weapons in CfgPatches array

* Add entrenching tool config to backpacks

* Fix Hammer and Fire axe melee weapons

* Add missing CSW images

Thanks @BaerMitUmlaut

Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
 2022-09-08 14:41:52 +02:00
PabstMirror
89b8ed4b56
Tools - Fix string check false positive on tagging macro (#8917) 2022-05-18 14:36:05 -05:00
Filip Maciejewski
c66304daf9
Explosives - SOG Compat - Fix Spiked ammo box placing wrong ammo type (#8914) 
* Explosives - SOG Compat - Fix Spiked ammo box placing wrong ammo type

* Add vn_pavn_ammo pDrive dummy file
 2022-05-15 18:48:39 -05:00
Jo David
a20110874c
replace urls (#8875) 2022-04-14 09:22:23 +02:00
Björn Dahlgren
38a308ee24
Remove pDummies for decrypted PBOs in 2.08 patch (#8838) 2022-03-08 21:00:04 -06:00
TyroneMF
59fe345f60
Documentation - Add dependencies page (#8706) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-12-02 15:40:46 +01:00
PabstMirror
53f8577122
Tools - Increase timeout on sqfvmChecker.py (#8703) 2021-11-26 22:49:37 -06:00
PabstMirror
986b7e3f97
Tools - Binarize configs in make.py (#8662) 2021-11-11 12:47:52 +01:00
Björn Dahlgren
6234c05645
Tools - Update Mikero to public version 2021-11-06 (#8675) 2021-11-11 12:47:18 +01:00
PabstMirror
dfe346260c
Tools - Update sqf_linter.py to ignore parse/macro errors (#8566) 
* Tools - Update sqf_linter.py to ignore parse/macro errors

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update sqf_linter.py

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-26 18:44:42 -05:00
PabstMirror
5321efe6db
Tools - Add sog/gm compats to steam workshop (#8568) 2021-10-21 12:23:08 -05:00
jonpas
c29ae977fc
Documentation - Merge ACEX (#8526) 
* Documentation - Merge ACEX

* Only show ACEX prefix note on framework pages

* Documentation - Use ACEX prefix in Fortify events
See #8553

* Cleanup acex from config.yml

* English is weird

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-21 11:27:25 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
PabstMirror
916346ae59
General - Format config class defines to coding guidelines (+tool) (#8520) 
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update tools/config_style_checker.py

Co-authored-by: jonpas <jonpas33@gmail.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-15 13:47:05 -05:00
PabstMirror
495a9b6fb9
Tools - Cleanup all old keys in release/optionals (#8523) 2021-10-15 12:22:12 -05:00
nomisum
7009404d39
Add Global Mobilization Compatibility (#7835) 
* GM Compat

add GM Compat addon - it's #7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>

* add ACE CSW dep (see script_component.hpp)

* warn about missiong compat_gm if GM is loaded

* move medic tents to EGVAR(medical,facilities) array thing

* add pDumbs

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-14 10:48:54 -05:00
PabstMirror
4b593f85d3
Tools - Add sog compat pDumbies (#8493) 2021-10-08 17:11:36 +02:00
PabstMirror
efe09682cc
Add SQFC support (#8235) 
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-09-03 19:08:34 -05:00
Björn Dahlgren
2513ef25de
Add optionals to validation tools (#8290) 2021-06-29 13:21:08 -05:00
PabstMirror
2fc352f461
Vscode - Add test/build tasks (#8298) 
Delete tasks.json
 2021-06-28 00:01:04 -05:00
Dystopian
b04b92c505
Fix make after hemtt pack (#8264) 2021-05-23 16:55:30 -05:00
PabstMirror
49b9b174ba
Extensions - Various Improvments (#8227) 2021-04-22 14:11:56 -05:00
PabstMirror
88b1c5b917
Tools - Add script to check sqf/config with sqfvm (#8137) 2021-04-20 12:39:05 +02:00
PabstMirror
28cad69947
Tools - Add script to update HEMTT include folder (#8134) 2021-04-20 12:28:11 +02:00
Dystopian
88e08dc130
Fix make.py temp files cleanup (#8189) 2021-04-17 12:08:18 -05:00
Björn Dahlgren
d55529041a
Apply needed pboProject settings in make.py via Windows Registry (#8128) 2021-02-26 19:55:01 -06:00
PabstMirror
f72175f823
Tools - Don't let mikro tools touch configs (#8093) 2021-02-18 12:53:22 -06:00
PabstMirror
8b8abec70e
Tools - Build dev (filepatching) with hemtt if installed (#8061) 
* Build dev (filepatching) with hemtt if installed

* Update build.py
 2021-01-10 13:28:29 -06:00