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,495 Commits 73 Branches 88 Tags 752 MiB
7a261773e2
Commit Graph

15495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
johnb432
7a261773e2 Merge branch 'master' into pr/9273 2024-07-20 08:42:52 +02:00
johnb432
a7ce63a536
Fire - Remove medical_engine dependency (#10122) 
* Remove medical dependency from fire

* Update initSettings.inc.sqf
 2024-07-20 08:37:04 +02:00
johnb432
5d133bd793
Dogtags - Code cleanup (#10097) 
* Clean up dogtags

* Only allow taking of dogtags if unit has space

* Fixed upper case T

* Stop throwing error

* Reverted to case insensitive method of checking

* Remove unused files

* More cleanup & fixes

- Better check for taking dog tags until 2.18 comes
- Changed parent condition from `canTakeDogtag` to `canCheckDogtag`
- Register EH only where necessary

* Update CfgEventHandlers.hpp

* More header cleanup
 2024-07-20 08:29:17 +02:00
johnb432
05ab1bbe99
Dragging - Fix dragging/carrying failing for items in ViV (#10128) 
* Unload ViV before dragging/carrying

* Update addons/dragging/functions/fnc_carryObject.sqf

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

* Use lazy eval to check if item was unloaded

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-20 08:26:53 +02:00
johnb432
8ab36f64ff
Quickmount - Fix quickmount for vehicle interactions (#10126) 
* Fix quickmount for vehicle interactions

* Update addons/quickmount/functions/fnc_getInNearest.sqf
 2024-07-20 08:15:15 +02:00
johnb432
5cada7d397
General - Remove "SwitchWeapon" spam (#10113) 
* Remove "switchWeapon" spam

* Update fnc_startDragLocal.sqf

* Don't add invalid fire modes

* Tweaks & fix
 2024-07-20 08:13:42 +02:00
johnb432
68738316c2
Dragging - Remove weight calculation workaround (#10117) 
* loadAbs has been fixed

* Update fnc_getWeight.sqf
 2024-07-19 19:13:44 +02:00
johnb432
37d7c4c544
Interaction - Hide push interaction if target is in ViV cargo (#10127) 
Hide push interaction for ViV cargo
 2024-07-19 18:26:14 +02:00
OverlordZorn
2c3396a4e8
Documentation - Add ACE_suture entry to list of classnames (#10125) 
Update class-names.md
 2024-07-19 14:36:37 +02:00
Dart
8f84df77d0
Sitting - Add config overwrite for random animation pool (#10120) 
* Add config property animation overwrite

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

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

* Fix header

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

* Update function call

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-07-18 16:53:34 -05:00
johnb432
f4272f0e36
Spectator - Remove spectator lights when exiting spectator (#10114) 
Remove spectator lights when exiting spectator
 2024-07-17 10:42:37 +02:00
Dart
66c31928ab
General - Fix case in event handler commands (#10121) 2024-07-17 01:12:01 -05:00
johnb432
5ee64781ea Merge branch 'master' into pr/9273 2024-07-16 20:30:15 +02:00
V1nsyara
ec5b84c278
Translation - Small update Russian (#10115) 
* Translation - Update Russian for new features

* Up to date translate RU

* Small update medical treatment

* resolve problem

* i`m cry

i hate this conflict
 2024-07-14 21:46:14 -05:00
Apricot
63d1ab82a7
Translations - Improve Japanese (#10112) 
* Improve Japanese

* Tweaks

* bit tweak

* even more tweak

* Update stringtable.xml

* Update stringtable.xml
 2024-07-13 19:22:06 -05:00
johnb432
f65138f65e
Casings - Fix settings (#10110) 2024-07-07 11:41:10 -03:00
johnb432
edc7e9af3e
Dogtags - Add context menu action to check dog tag (#10101) 
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Add context menu option for dogtags
 2024-07-04 00:39:08 -07:00
johnb432
3745305323
Dogtags - Fix arsenal not showing dogtag info in multiplayer (#10095) 
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Update addons/dogtags/XEH_postInit.sqf

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

* Update addons/dogtags/functions/fnc_getDogtagItem.sqf

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

* Add EH only on necessary machines

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-04 00:32:37 -07:00
johnb432
4d0641abb8
Dogtags - Improve displaying dogtags from bodies with no name (#10096) 
Improve displaying dogtags from bodies with no name
 2024-07-03 09:50:08 -07:00
johnb432
dae2c5b465
Common - Clean up ace_common_fnc_hasItem & ace_common_fnc_hasMagazine functions (#10108) 
* Clean up hasItem & hasMagazine functions

* Replace EFUNC

* Update fnc_hasItem.sqf
 2024-07-03 08:39:04 -07:00
johnb432
7b0e5b6416
Common - Fix ace_common_fnc_uniqueItems (#10107) 
Fix `ace_common_fnc_uniqueItems`
 2024-07-03 08:30:41 -07:00
johnb432
b714c8bce2
Nametags - Only display talking waves when unit is alive and conscious (#10106) 
Only display waves when unit is alive and conscious
 2024-07-03 02:02:43 -07:00
johnb432
ee0e947611
General - Use ace_common_fnc_isAwake where possible (#10098) 
* Use `ace_common_fnc_isAwake` where possible

* Revert bad change
 2024-07-02 12:38:14 -07:00
johnb432
516eb48c93
Dogtags - Stop throwing error when trying to take dog tags (#10103) 
Stop throwing error
 2024-07-02 11:16:28 -07:00
Psycool
45f9301019
Korean translation updated (#10104) 
* 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

* Korean translation updated

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-02 13:14:19 -05:00
Fabio Schick
aecafe673b
Aircraft - Drone "Follow Unit" Waypoint Action (#9889) 
* Fix "Recharge" interaction showing on destroyed drone

* Add "Follow Unit" action

* Improve condition check

* UGV Following via PFH that updates WP Pos

* Use HOLD WP for all Follow Actions

Since FOLLOW WP would stop working on AI Soldiers after some time.

* Allow selecting a follow distance

* Follow Distance under separate interaction, just like Loiter Alt

Only visible when a HOLD waypoint is selected, which is pretty much always going to have been created by the "Follow" interaction.

* Localize "Follow" Interaction

* Show structuredText Hint when following/changing distance

* Variable for cursorTarget Reuse

* Better isKindOf condition use

* Make "Ship"-kind vehicles followable

* Clean up Comments and systemChat Debugs

* Comment explanation for custom PFH solution over vanilla "Follow"-WP

* Trim excess brackets from setWaypointPosition argument

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

* Broader determination for UGV follow distances

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Prevent infinite PFH loop if follow target is deleted

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Delete Follow WP when PFH terminates

* The ternary rules

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

* Various requested changes

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>
 2024-07-02 02:16:48 -07:00
johnb432
ba47c12a97
Dogtags - Drop dogtag on ground if unit doesn't have inventory space (#10094) 
* Drop dogtag on ground if unit doesn't have inventory space

* Only allow taking of dogtags if unit has space
 2024-07-02 02:16:27 -07:00
johnb432
471d33ae32 More cleanup 2024-07-01 19:15:37 +02:00
johnb432
b5205c1fd0
Update addons/dragging/XEH_postInit.sqf 
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
 2024-07-01 10:13:01 -07:00
johnb432
71afce53c1
Dogtags - Make "Dog Tag" consistent (#10099) 
Make Dog Tag consistent
 2024-07-01 09:56:00 -07:00
johnb432
28560b9ad9 Sync corpses when JIP to avoid weird hitbox collision, renamed function and added API 
The idea behind the API is for 3rd party mods that include garbage collectors to exclude corpses that are being dragged/carried.
 2024-07-01 18:36:37 +02:00
johnb432
9c65030b41 Merge branch 'master' into pr/9273 2024-06-29 11:30:00 +02:00
johnb432
cb40c8ec5d
Vehicle damage - Add missing documentation (#10093) 
Update vehicledamage-framework.md
 2024-06-28 10:43:13 -07:00
johnb432
a30afe69b7
Interaction - Disable magazine passing to dead and unconscious units (#10091) 
* Disable magazine passing to dead units

* Disable for unconscious units as well
 2024-06-28 05:41:04 -07:00
johnb432
bfa23f01db
Refuel - Remove unused variable (#10089) 
Update XEH_postInit.sqf
 2024-06-26 05:02:19 -07:00
Apricot
ad4af0d553
Translations - Improve Japanese (killtracker/overpressure) (#10088) 
killtracker/overpressure
 2024-06-25 21:43:24 -05:00
Fabio Schick
b013ab81d5
Translations - Italian and German (#10087) 
* Grenades italian+german translation

* Fix english typo in MicroDAGR

* Medical Treatment italian+german translations

* Realisticnames italian+german translations

* Hitreactions italian+german translations

* Fix italian typo in 3 addons

* Cookoff italian+german translations

* Killtracker italian+german translations

* Zeus italian+german translations

* Overpressure italian+german translations

* Compat RF italian+german translations

* Realisticnames Fix italian+german oversight

* Compat WS italian+german translations

* Compat CUP-CSW italian translations

* Compat CUP-NVG italian translations

* Fixup overpressure
 2024-06-24 16:44:41 -05:00
PabstMirror
5c8ea65f7c
Common - Update header for addPlayerEH (#10086) 2024-06-23 18:12:30 -05:00
Fabio Schick
bdb6c7c69c
Compat RHS/Hellfire - Use RHS models when loaded (#10076) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-06-23 00:36:41 -03:00
PabstMirror
aed2222b81
Artillery Tables - Support for ammo that has native airFriction (#10059) 
* Artillery Tables - Support for ammo that has native `airFriction`

* fix comment

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

* Update addons/artillerytables/functions/fnc_rangeTableOpen.sqf

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

* replace if block with select const

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-06-22 22:34:34 -05:00
V1nsyara
05d6327e5e
Translation - Update Russian for small features (#10085) 
* Translation - Update Russian for new features

* Up to date translate RU
 2024-06-22 20:24:00 -05:00
Psycool
c9e82afff7
Korean translation updated (#10077) 
* 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

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-06-22 14:47:23 -05:00
johnb432
56016a4816
Vehicle Damage - Add turret tossing again (#9989) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2024-06-22 15:08:43 -03:00
johnb432
f45dff8a09
Fire - Mini-Rewrite (#9757) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-22 15:07:36 -03:00
johnb432
f86e882b18
Advanced Fatigue - Various improvements (continuation of #5723) (#9714) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: ulteq <ulteq@web.de>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-06-22 14:53:08 -03:00
johnb432
cd66f495ad
CSW - Improve tripod and weapon disassembly (#9915) 
* Add disassembly for tripods when players have occupied launcher slots

* Update fnc_assemble_canDeployWeapon.sqf

* Update fnc_assemble_canPickupWeapon.sqf

* Revert file renaming (see #9777)

* Correct headers

* Update fnc_canPickupTripod.sqf

* Fixed checks and eject dead bodies

* Invert checks
 2024-06-22 19:39:36 +02:00
johnb432
1f5044aabd
CSW - Improved weapon attachments handling (#9904) 2024-06-22 14:03:32 -03:00
johnb432
18ea360b1e
Cargo - Add check for invoking ace_cargoAdded EH only if cargo was actually added (#10084) 
Only invoke cargoAdded EH if cargo was actually added
 2024-06-22 12:18:28 -03:00
johnb432
7ea2aab2c9
Common - Improve PBO checking (#9266) 
* Update PBO checking

* Added kicking of clients without ACE loaded

* Update fnc_errorMessage.sqf

* Update fnc_checkVersionNumber.sqf

* More compatibility for #9568

* Cleanup

* Minor cleanup + added server source

* update outdated/not present error message

* check version number fixes

* Update fnc_errorMessage.sqf

* Changed error names

Server is always right, client has either older or newer versions, or missing or additional addons

* Improved ACE detection method

* Tweaks and fixes

* Try another approach

* Update events-framework.md

* Update XEH_postInit.sqf

* Update fnc_checkVersionNumber.sqf

* Removed check for non-ACE clients

* Update XEH_postInit.sqf

* Cleanup

* Remove rogue change

* Improved message display in systemChat

* Update fnc_checkPBOs.sqf

* Removed loop variable initialisers

* Fixed header

* Updated headers

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-06-22 15:52:59 +02:00
Cyruz
db6c4a72a6
Cookoff - Fix incorrect parent class in cookoff sounds (#10083) 
Fix incorrect parent

Co-authored-by: Cyruz143 <root.cyruz@gmail.com>
 2024-06-21 12:06:44 -03:00