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
14,834 Commits 73 Branches 88 Tags 752 MiB
5417a18d7f
Commit Graph

14834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike-MF
5417a18d7f
Compat WS - Make compat auto load if DLC is present (#9205) 2023-09-05 16:19:09 +02:00
Grim
88e0c8f27b
Common - Improve FUNC(removeSpecificMagazine) with 2.14 changes (#9227) 2023-09-05 16:14:42 +02:00
PabstMirror
03c3e74636
Maptools - Cleanup pre-2.14 compatibility code (#9342) 
ref #9219
 2023-09-05 10:38:38 -03:00
Will/KJW
e3d6d6cc4e
Fastroping - Remove 2.12 compatibility (#9329) 
Update fnc_deployAIWaypoint.sqf
 2023-09-05 10:37:56 -03:00
johnb432
c11e7690bf
Arsenal - Remove redundant fix for hand guns and binoculars with secondary muzzles (#9305) 
Update fnc_onSelChangedRight.sqf
 2023-09-05 10:37:02 -03:00
Dystopian
10ffcea9b7
Optionals - Add No Medical and No Realistic Names components (#8187) 
* Add nomedical and norealisticnames components

* Add fire component disabling

* Make it work

* remove headlight skipping

* update preprocess syntax

* fix git screwup

* Apply suggestions from code review

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-09-03 21:56:54 -04:00
Grim
36f34ec551
Medical - Add 'Open (Backpack)' action to dead units (#9239) 
* add open bag interaction

* only add actions to uncon/dead

* improve assembly backpack check

* Fixes

* Removed test code

* move to postInit

* fix locality

* locality edge case

* Fix double actions on dead units

* improve comment

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-03 21:48:09 -04: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
Filip Maciejewski
a7d8c3eb3a
Compat SOG - Make compat auto load if DLC is present (#9204) 
* Move SOG compat to addons/

* Set component to skip loading when SOG not present

* Use skipWhenMissingDependencies for GRAD Trenches compatiblity

* Tools - Add SOG dlc launch config

* move trenches to sub config, handle grad with 2nd subconfig

* fix `Land_vn_b_prop_fueldrum_01` UBC

* use ifndef

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-03 11:31:45 -05:00
Björn Dahlgren
1a3bce1a23
Add compatibility mod for CSLA CDLC (#8839) 
* Add compatibility mod for CSLA CDLC

* Fix syntax issue

* Add open bolt property to machine guns

* Move to addons and update UBC

* Update addon.toml

* Update addons/compat_csla/CfgWeapons.hpp

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/compat_csla/CfgMagazines.hpp

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* split explosives to sub config

* ifndef

* reduce range on stinger backblast (is soft-launch)

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-09-03 11:31:26 -05:00
Grim
cc26f00df3
Common/Adv. Fatigue/Medical - Add unified sway calculation (#9226) 
* fix adv fatigue sway interaction with medical

* change medical sway scaling

* move to common

* function header

* number tweaks

* baseline is always at least 1

* Add error msgs and warn if using old ACE_setCustomAimCoef

* Update addons/common/functions/fnc_addSwayFactor.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-02 18:09:19 -04:00
Grim
8439a931e4
Gunbag - Add check for weapon in virtual items on loadout set (#9358) 
* add check for weapon in arsenal virtual items

* fix variable

Co-authored-by: BrettMayson <brett@mayson.io>

* add INFO

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

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-01 17:52:45 -03:00
Will/KJW
beb4ec8f06
Explosives - Add modded defusal kit support (#9353) 
* Update CfgWeapons.hpp

* Update XEH_preStart.sqf

* Update XEH_preInit.sqf

* Update fnc_canDefuse.sqf

* Update fnc_canDefuse.sqf

* fix condition

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

* Update fnc_interactEH.sqf

* Update addons/explosives/functions/fnc_interactEH.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-01 17:52:28 -03:00
Apricot
c1c1433c44
Translations - Improve and Add Japanese (#9357) 
* update japanese

* full-width to half-width

* more tweak
 2023-08-31 11:24:35 -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
Grim
8f24884f73
Arsenal - Use regex matching for searchbars (multi-word searching) (#9348) 
* use regex

* remove extra brackets

* add regex pattern, change refill condition

* add missing quote

* change pattern again

* bleh, we'll just go with this

* use pattern quote (thanks veteran)

* remove comment

* use escapeRegex function

* add regex to 3DEN attribute
 2023-08-30 19:41:35 -04:00
Grim
8b3b265d87
Common - Add FUNC(escapeRegex) (#9355) 
* add function

* add source
 2023-08-30 19:31:10 -04:00
Will/KJW
c88695fb82
Captives - Add modded cable tie support (#9350) 
* Update fnc_canApplyHandcuffs.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update XEH_preStart.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update XEH_preInit.sqf

* Update fnc_doApplyHandcuffs.sqf

stray bracket

* Update addons/captives/XEH_preStart.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update fnc_canApplyHandcuffs.sqf

* Change to restraints

Update XEH_preInit.sqf

* Update XEH_preStart.sqf

* Update fnc_canApplyHandcuffs.sqf

* Update fnc_doApplyHandcuffs.sqf

* Update CfgWeapons.hpp

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-30 17:03:44 -04:00
PabstMirror
bee0362921
Hellfire - Add support for MELB hardpoint (1x) (#9352) 2023-08-30 12:44:43 -05:00
PabstMirror
882294e9f7
Tools - make.py print tail of packing log on error (#9351) 2023-08-29 15:41:56 -05:00
PabstMirror
fdb7330385
Arsenal - Add stat to show how AI will use ammo (#8434) 
* Arsenal - Show AI Usage

* Add condition and move to ballistics

* Add stringtables

* add getVar
 2023-08-29 14:34:24 -05:00
PabstMirror
e6a8222966
Map - Update map lighting effect every frame (#9349) 
Map - Update lighting effect every frame
 2023-08-29 12:32:44 -03:00
johnb432
528539210e
Reload/Reload Launcher - Fix headers (#9347) 
Header fixes
 2023-08-28 17:20:53 -03:00
johnb432
b90d0379ca
Reload Launcher - Improve various aspects (#9335) 
* Add notifications to reloadLauncher

- Add notifications to reloadLauncher
- Also set _reloadTime to `magazineReloadTime min 2.5` instead of just 2.5 if there is no `buddyReloadTime` set

* Change message format

* Add setting displayStatusText for reloadLaunchers

* reloadlauncher improvements

* Comments

* Updated so it's similar to reload addon

* Added failure message

* Update addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf

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

* Changed reload conditions

* Tweaked notifications

---------

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-28 15:14:45 -03:00
johnb432
59ee36560f
Reload Launchers - Code cleanup (#9334) 
* reloadlaunchers cleanup

* Update fnc_canLoad.sqf
 2023-08-28 14:27:01 -03:00
johnb432
44e0fdb6fa
Reload - Code cleanup and various improvements (#9343) 
* Reload code cleanup

* Update fnc_startLinkingBelt.sqf

* Update addons/reload/functions/fnc_getAmmoToLinkBelt.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-28 14:26:24 -03:00
johnb432
519b1cbeb4
Repair - Improve wheel repair interaction position (#9345) 
Update fnc_addRepairActions.sqf
 2023-08-28 09:52:21 -03:00
johnb432
0bee7614ad
Common - Improve weapon unloading (#9344) 
Fix weapon unloading
 2023-08-26 12:04:31 -04:00
PabstMirror
582f6e32ed
Slideshow - Add support for maps as textures (#9150) 
* Slideshow - Add support for maps as textures

* Update script_mod.hpp

* Update fnc_mapImage.sqf

* cleanup

* Update fnc_mapImage.sqf

* Apply suggestions from code review

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

* mapImage_init comments

* Update fnc_mapImage.sqf

* Apply suggestions from code review

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

* add support for mission config maps

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-25 10:33:42 -05:00
PabstMirror
65d5ccf600
Medical GUI - Dynamically create any number of action buttons (#9332) 
* Medical Gui - Dynamically create any number of action buttons

* Fix right alignment, add h-spacing, fix 2.14 select
 2023-08-25 10:32:39 -05:00
PabstMirror
59fa842527
Map Tools - Fix for 2.14 aspect ratio changes (#9219) 
Close #9176
 2023-08-25 10:25:00 -05:00
olimolly
6c0797eaa2
Add french translation for new painUnconsciousTreshold setting (#9341) 2023-08-24 09:37:13 -05:00
JonBons
2709490efd
Cookoff - Move canHaveFireJet logic into vehicle_damage (#9060) 
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity

* Use original arg order

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-23 12:37:17 -05:00
PabstMirror
8e25472d5b
Night Vision - Use default effects when controlling UAVs (#9338) 2023-08-21 14:23:53 -05:00
PabstMirror
fabd9c5fdb
Weather - Fix number in fnc_calculateWindChill.sqf (#9340) 
Update fnc_calculateWindChill.sqf
 2023-08-21 14:23:21 -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
Grim
d33a158e2e
Arsenal - Favorites System (#9307) 
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

* favorites var

* function prep

* favorites only

* improve favorites adding, add include

* fix stupid

* fix color setting (todo: lnb color)

* add button, finalize

* setting tooltip

* stringtable again

* fix setting overwrite, improve tooltip

* fix losing weapon items

* fix macro

* fix setting to intended overwrite

* remove unnecessary private

* docs

* more docs

* is

* improve button text

* docs

* fix tooltip not showing unless menuBar was clicked

* improve weapon accessory lookup

* empty line

* update refresh calls

* fix left panel

* cleanup currentCargo

* use BI string for favorites

* BI strings again

* no favorites for face/voice/insignia

* stringtable again

* add missing setColorRight

* Add comment for favorites setup

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-19 23:56:59 -04:00
Grim
2f8d92701f
Arsenal - Fix magazine misc items categorization (#9336) 
fix stupid
 2023-08-20 00:43:22 -03:00
Grim
8f3a1c5694
Arsenal - Fix changing stats via script (#9312) 
* fix addStat

* fix removeStat

* improve priority sorting

* change append to pushBack
 2023-08-19 22:45:07 -04:00
Grim
007995612d
Arsenal - Fix virtual non-weapon magazines in inventory being treated as unique (#9309) 
* sigh

* add comment in scanConfig

* fix misc magazines

* improve magazine misc items check

* check player loadout first for uniqueItems
 2023-08-19 22:38:06 -04:00
PabstMirror
4b7ee55588
Nametags - Cleanup unused crew info component (#9333) 2023-08-19 21:20:27 -05:00
Grim
42101e8fa2
Fastroping - Fix equipping FRIES during vehicle init (#9299) 
* delete fries with vehicle

* FUNCK -> FUNC

* Delay 1 frame so setVar won't fail if ran before initpost

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-19 01:38:47 -04:00
johnb432
682ae05f59
Medical Status - Remove status effects upon death/featureCamera (#9301) 
* Update fnc_handleKilled.sqf

* move to function

* Removed skipSetHidden

* Revert "Removed skipSetHidden"

This reverts commit 452c5216a7.

* Update addons/medical_status/XEH_postInit.sqf

* add comment, force git to run actions

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-18 13:16:20 -04:00
Grim
55cc755542
CSW - Disable non-CSW rearm actions for CSW vehicles (#9255) 
* improve CSW integration

* do this more cleanly

* code style

* revert ammo handling check change
 2023-08-18 13:10:15 -04:00
johnb432
a168330550
Arsenal - Add arsenal actions addition and removal via functions (#9318) 
* Add and remove arsenal actions via functions

* Fixed header

* Update addons/arsenal/functions/fnc_addAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_addSort.sqf

* Update addons/arsenal/functions/fnc_removeAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_removeAction.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-18 12:33:56 -04:00
PabstMirror
d290ca3d63
Aircraft - Use COMPILE_SCRIPT macro (#9331) 2023-08-17 21:52:29 +02:00
Kyle Mckay
e47e18001f
Docs - Update my display name everywhere (#9330) 
* Update display name in team

* Update display name everywhere

* order

https://youtu.be/VYycQTm2HrM

---------

Co-authored-by: BrettMayson <brett@mayson.io>
 2023-08-17 12:02:17 +02:00
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
PabstMirror
8517a6ef73
Fastroping - Add compatibility with 2.12 (#9327) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-16 21:00:52 +02:00
Will/KJW
3e35984610
Medical GUI - Improve Selected Category colouration (#9324) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-08-16 20:32:53 +02:00