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,570 Commits 73 Branches 88 Tags 752 MiB
59314edf62
Commit Graph

15570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
ac09cea0d0 Prepare 3.17.0 Build 82 2024-04-01 15:49:54 +02:00
jonpas
64e16a2136 Merge branch 'acerep-12' into release-3.17 2024-04-01 15:49:35 +02:00
jonpas
c8eebf461b Merge branch 'master' into release-3.17 2024-04-01 15:48:07 +02:00
BaerMitUmlaut
7ddd62f4d3 Documentation - Fix typo (#9608) 2024-04-01 15:43:24 +02:00
PabstMirror
0c589c2346
Interaction - Check canInteractWith before taking dropped weapons (#9783) 
* Interaction - Block interaction on carried ground weapon holders

* Don't check if cargo container is claimed
 2024-04-01 09:11:14 -03:00
jonpas
d9f6beacc5 Prepare 3.17.0 Build 81 2024-04-01 13:34:39 +02:00
jonpas
dd256bfb18 Merge branch 'master' into release-3.17 2024-04-01 13:32:48 +02:00
PabstMirror
0365565efc
Yardage - Fix broken display in 2.16 (#9892) 2024-04-01 13:28:08 +02:00
Mike-MF
0d45a85db6
Casings - Add CUP Casings (#9888) 2024-04-01 13:27:15 +02:00
jonpas
6c52cfa95f Link to acemod.org 2024-04-01 04:31:13 +02:00
jonpas
193f52222b Remove docker compose version (deprecated) 2024-04-01 04:18:43 +02:00
jonpas
686498680f Fix 'Fork me on GitHub' ribbon 2024-04-01 03:50:47 +02:00
jonpas
134951f331 Update Anvil logo 2024-04-01 02:45:40 +02:00
jonpas
b919da797b Merge branch 'master' into release-3.17 2024-04-01 02:42:18 +02:00
jonpas
3ddf147238 effect -> affect 2024-03-31 00:42:06 +01:00
jonpas
cfbadca621 Add ACEREP 12 2024-03-31 00:16:56 +01:00
PabstMirror
9293623d9e
CUP Compats - Cleanup temp __has_include (#9832) 2024-03-30 20:33:28 +01:00
PabstMirror
a4dbff3ff8
Common - Add word weapon to sway setting (#9887) 
* Common - Add word `weapon` to sway setting

* Update stringtable.xml
 2024-03-28 17:12:27 -05:00
PabstMirror
9daf71edd0
Options Menu - Fix main-menu news setting not working (#9886) 2024-03-28 14:55:07 -05:00
Psycool
cbb160c1e0
Korean translation updated (#9883) 
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-03-28 13:58:02 -05:00
johnb432
415d2f685c
General - Change FUNC to LINKFUNC where appropriate (#9882) 
FUNC -> LINKFUNC
 2024-03-28 13:57:23 -05:00
jonpas
2a52ad14c4
Improve GitHub labels and Release Drafter (#9884) 2024-03-28 18:29:08 +01:00
johnb432
48bdc6fbcd
Repair/UI - Minor code cleanup (#9879) 2024-03-28 14:11:26 +01:00
Mr. Zorn
46cc49dc1e
Documentation - Add info about Plotting Board (#9838) 
* Update maptools.md

* Update maptools.md

* Update docs/wiki/feature/maptools.md

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-28 08:49:45 -03:00
johnb432
3bba9735c7
Mk6mortar - Remove return values from FUNC(handleFired) (#9880) 
Update fnc_handleFired.sqf
 2024-03-27 22:37:59 -05:00
johnb432
512ceaa1a1
Missile Guidance - Rename preInit and postInit files (#9881) 
Renamed preInit and postInit files
 2024-03-27 22:37:36 -05:00
jonpas
dc7d7b1429 Prepare 3.17.0 Build 80 2024-03-27 23:01:47 +01:00
Apricot
4952c09f41
Translations - Improve Japanese localization part 4 (sway factor) (#9877) 2024-03-26 19:58:19 +01:00
Fabio Schick
c88e1abd0e
Weather - More permissive wind info indicator + auto-enabling when throwing grenades (#9820) 
* More permissive displaying of Wind Info

* Temporary Wind Info while throwing Grenades

* Add Temporary Wind Info Setting

* Safer reading of EGVAR from addon that may not be loaded

* Show Wind Info only in Static Vehicles

* Improve Exclusion Check

Co-Authored-By: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Improve Abort Checks on Keybind Statements

Co-Authored-By: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Raise eyePos when inside Static Weapon

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-26 09:59:48 -03:00
Mike-MF
cee187adac
General - Convert vehicle to objectParent (#9801) 
Convert vehicle to objectParent
 2024-03-26 09:54:06 -03:00
johnb432
a8ed533004
Dragging - Minor code cleanup (#9859) 
* Dragging minor code cleanup

* Update fnc_startCarryPFH.sqf

* Revert UAV changes
 2024-03-26 09:50:21 -03:00
ZluskeN
5ca81b7ef3
Interaction - Make magazine passing animation optional (#9875) 
* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update addons/interaction/functions/fnc_passMagazine.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-26 09:50:04 -03:00
Dart
31217ae5d0
Fortify - Add onDeployStop event for cancelling before confirming (#9854) 
* onDeployStop event

* Updated wiki with new event

* Fixed params

* Revert "onDeployStop event"

This reverts commit c3dae82915.

* Uses deployCanceled

* Re-added fortify stop event

* Update fnc_deployObject.sqf

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-25 09:08:06 -07:00
johnb432
80417b114d
Advanced Fatigue - Move sway to common and add enable sway setting (#9872) 
* Move sway from fatigue to common

* Added enable sway setting

* Update addons/common/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/common/stringtable.xml

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-24 14:28:14 -07:00
PabstMirror
86f1b6b142
AB/Scopes - Fix script errors on profiling branch (#9869) 
* AB/Scopes - Fix script errors on profiling branch

* Update addons/scopes/functions/fnc_calculateZeroAngleCorrection.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-24 09:32:28 -07:00
johnb432
58f6430bb6
Arsenal - Revert unicode support for sorting (#9871) 
Revert unicode sorting
 2024-03-23 06:29:26 -07:00
Mike-MF
2456c445b2
Compat CUP Weapons - Fix Metis UBC (#9870) 2024-03-23 14:28:20 +01:00
PabstMirror
9a5cb8bd91
Maverick - Cleanup config (#9868) 2024-03-21 22:56:44 +01:00
BrettMayson
3c5b46c42d
Medical - Support Magazine Treatment Items (#9816) 
* count treatment items

* getCountofItem

Co-Authored-By: Blue <itzblueman@gmail.com>

* getCountofItem fix

Co-Authored-By: Blue <itzblueman@gmail.com>

* convert painkillers to magazine

* use isclass

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

* forget to change variable

* Update addons/medical_treatment/functions/fnc_hasItem.sqf

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

* better magazine adjustment

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Update addons/medical_treatment/functions/fnc_medication.sqf

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

* Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf

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

* Update docs/wiki/framework/arsenal-framework.md

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

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Header

* use switch statement in fnc_useItem

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* only check adding to mags that are not full

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update fnc_getCountOfItem.sqf

* Optimisations & header fix

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Fixed vehicle implementation

---------

Co-authored-by: Blue <itzblueman@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-03-21 22:56:24 +01:00
johnb432
50978efa46
Hearing - Removed remoteExec & added microoptimisations (#9853) 
* Removed remoteExec. added microoptimisations

* Update addons/hearing/XEH_preInit.sqf

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

* move EH to after !hasInterface

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-03-21 20:26:46 +01:00
johnb432
b4eaa1e270
Advanced Fatigue - Disable sway when Advanced Fatigue is off (#9867) 
Disabled sway when advanced fatigue is off
 2024-03-21 20:24:49 +01:00
Dart
af3c95a5a6
Fire - Add ability to disable screams for individual units (#9863) 
* Disable screams for individual units

* Update addons/fire/XEH_postInit.sqf

* Changed wording

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

* isGlobal instead of true

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-21 20:20:23 +01:00
Cyruz
8c69bd25ea
Rearm - Show distance to target on actions (#9866) 
* Show rearm distance in action

* Update addons/rearm/functions/fnc_addRearmActions.sqf

---------

Co-authored-by: Cyruz143 <root.cyruz@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-20 05:06:45 -07:00
johnb432
017d47f8c9
Fortify - Skip placement animation for no cost fortifications (#9861) 
Skip placement animation for no cost fortifications
 2024-03-19 08:57:09 +01:00
BrettMayson
c5b54c65a8
Medical Treatment - Fix bandage effectiveness (#9865) 
* fix broken bandages

* update params
 2024-03-19 08:56:05 +01:00
Apricot
e7827813ee
Translations - Improve Japanese localization 3 (#9864) 
Japanese
 2024-03-18 21:59:54 -05:00
johnb432
11844ef05e
Dragging - Fix dropping incorrect object when carrying fails (#9860) 
Update fnc_startCarryPFH.sqf
 2024-03-18 14:17:05 -03:00
johnb432
0856e58ae9
Dragging - Release ownership when target is too heavy to drag/carry (#9858) 
Release ownership when target is too heavy to drag/carry
 2024-03-18 14:16:34 -03:00
johnb432
3cafac2f67
Common - Fix players sliding when holstering weapons (#9846) 
Update CfgMoves.hpp
 2024-03-17 04:47:46 -07:00
Mike-MF
de106c3418
Grenades - Fix Flashbang in epilepsy mode (#9855) 
Fix Flashbang in epilepsy mode
 2024-03-17 04:47:24 -07:00