Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 12:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,055 Commits 61 Branches 105 Tags
interaction-pullOutBody
Commit Graph

370 Commits

Author SHA1 Message Date
PabstMirror
49a1887891 General - Optimize call in configs (#10797) 2025-03-12 21:54:17 -05:00
johnb432
6477b693c8 CUP Terrains Compat - Add water sources (#10642) 2025-01-13 16:22:05 -03:00
PabstMirror
28ea1b63fb Tools - Update make.py for change to pboProject, remove dummy rtms (#10455) 
* Tools - Update make.py for change to pboProject, remove dummy rtms

* dumb ies
 2024-12-13 12:21:51 -06:00
Will/KJW
25c68e03ca Dragging - Fix clone showing (#10535) 
Update CfgVehicles.hpp
 2024-12-07 15:39:35 -06:00
BrettMayson
bd48a26d55 General - Stringtable terminating newline (#10507) 
add terminating newline
 2024-11-12 19:05:56 +01:00
johnb432
654f2e97c4 General - Sort stringtable entries alphabetically (#10475) 
* Sort stringtables

* Hippity hoppity get off of my property

* Run command again
 2024-11-12 09:35:57 -08:00
Grim
c14056e7b9 General - Cleanup trailing whitespace in config/code (#10478) 
* General - Cleanup trailing whitespace

* cleanup whitespace in .cfg
 2024-11-06 16:01:21 -06:00
Dystopian
609b2fedfd Dragging - Fix dead body weapon carrying (#10435) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-11-02 17:41:15 -03:00
johnb432
149767b60d Dragging - Remove weight workaround fully (#10129) 2024-10-13 13:28:18 -03:00
PabstMirror
631db9d603 Add some lint annotations (#10372) 2024-10-12 18:53:11 -05:00
PabstMirror
1efe823fc2 General - Fix some undefined variables (#10335) 
* General - Fix some undefined variables

* cleanup reminders

* Fix arg to addPublicVariableEventHandler
 2024-09-27 19:02:56 -05:00
some-evil-kitty
fef34a82dc Carrying - Add hookable events to dropping objects (#10304) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-09-11 20:54:51 -03:00
johnb432
e2335c9333 Dragging - Corpse carrying and dragging - continued (#9273) 
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-09-07 15:54:21 -03:00
johnb432
73ed46d36b General - Removed silent Dragging dependencies (#10287) 
Move release string table entry to common
 2024-09-03 16:00:17 -05:00
BrettMayson
f090c71126 General - Fix Command Case (#10286) 
* run 'hemtt utils sqf case'

* fix config as well

* fix event casing

* Update addons/towing/functions/fnc_attachRopePFH.sqf

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

* Update addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf

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

* Update addons/rearm/functions/fnc_takeSuccess.sqf

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

* Update addons/rearm/functions/fnc_grabAmmo.sqf

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

* Update addons/medical_treatment/initSettings.inc.sqf

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

* Update addons/captives/functions/fnc_setSurrendered.sqf

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

* Update addons/captives/functions/fnc_handleZeusDisplayChanged.sqf

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

* Update addons/captives/functions/fnc_handlePlayerChanged.sqf

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

* Update addons/captives/functions/fnc_handlePlayerChanged.sqf

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

* Update addons/arsenal/functions/fnc_onArsenalOpen.sqf

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

* Update addons/arsenal/functions/fnc_onArsenalClose.sqf

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

* Update addons/spectator/functions/fnc_ui.sqf

* Update addons/ui/XEH_clientInit.sqf

* Update addons/ui/functions/fnc_setElements.sqf

* Update addons/fcs/functions/fnc_getAngle.sqf

* Update addons/fcs/functions/fnc_getAngle.sqf

* Update addons/fcs/functions/fnc_getAngle.sqf

* Update addons/captives/functions/fnc_handleZeusDisplayChanged.sqf

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

* Update addons/captives/functions/fnc_setHandcuffed.sqf

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

* Update addons/captives/functions/fnc_setHandcuffed.sqf

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

* Update addons/captives/functions/fnc_setSurrendered.sqf

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

* Update addons/common/functions/fnc_displayTextStructured.sqf

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

* Update addons/medical_treatment/initSettings.inc.sqf

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

* Update addons/medical_treatment/initSettings.inc.sqf

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

* Update addons/medical_treatment/initSettings.inc.sqf

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-09-03 11:52:33 -05:00
johnb432
d56a3a6a95 Dragging - Add parameters for FUNC(setDraggable) & FUNC(setCarryable) to apply globally (#10266) 2024-08-27 18:34:46 -03:00
PabstMirror
c5fb3d4cb0 Dragging - Fix dragging ai turrets via keybind (#10267) 2024-08-27 01:36:29 -03:00
johnb432
3b10396d3b Dragging - Fix dragging breaking via keybind (#10261) 
Fixed dragging breaking via keybind
 2024-08-27 01:36:07 -03:00
johnb432
db7b78c068 Dragging - Add parameters check for FUNC(setDraggable) & FUNC(setCarryable) (#10264) 
* Check params

* Update fnc_setDraggable.sqf
 2024-08-26 22:59:22 -05:00
johnb432
b6e9cabc34 Cargo & Dragging - Disable UAV AI when being dragged, carried or cargo (#10100) 
* Disable UAV AI when being dragged, carried or cargo

* Update addons/common/functions/fnc_disableAiUAV.sqf

* Improve dragging/carrying conditions, fixed duplicate JIP
 2024-07-22 08:38:39 +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
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
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
Grim
95b7951919 General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
Abogado
6972f02bc4 Translation - Add Missing Spanish (#10001) 
Translation to Spanish

Translation to Spanish
 2024-05-10 20:42:55 -05:00
Apricot
b513a110f5 Translations - Improve Japanese localization (3.17.1) (#9977) 
Tweaks
 2024-04-26 17:34:11 -05:00
johnb432
415d2f685c General - Change FUNC to LINKFUNC where appropriate (#9882) 
FUNC -> LINKFUNC
 2024-03-28 13:57:23 -05: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
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
V1nsyara
4d487dc33e Translations - Russian (#9802) 
Update Russian Translate
 2024-02-20 19:22:38 -06:00
PabstMirror
edf627ce51 Dragging - Add logging for claimSafe failure (#9739) 2024-01-16 09:16:51 -06:00
Grim
cb08a7c172 General - Change UAV unit config lookups to unitIsUAV (#9735) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-15 18:39:28 -03:00
Grim
8bc5f513b4 Dragging - Prevent multiple units carrying the same object (#9730) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-13 13:39:39 -03:00
johnb432
e8c10f905e Dragging - Minor optimisation (#9679) 
Minor optimisation for dragging
 2023-12-18 14:02:45 -03:00
Fabio Schick
d70fbd5765 Translations - Complete Italian + almost complete German translation (#9673) 
* medical_gui italian translations

* csw italian translations

* interact_menu italian translations

* switchunits italian translations

* trenches italian translations

* parachute italian translations

* vehicles italian translations

* viewdistance italian translations

* common italian translations

* magazinerepack italian translations

* vehiclelock italian translations

* overpressure italian translations

* ui italian translations

* medical_treatment italian translations

* medical_treatment german translations

* nametags italian translations

* overheating italian translations

* viewrestriction italian translations

* grenades italian translations

* ai italian translations

* aircraft italian translations

* arsenal italian translations

* arsenal german translations

* hellfire italian translations

* reload italian translations

* nightvision italian translations

* medical_damage italian translations

* towing italian translations

* fortify italian translations

* finger italian translations

* dragging italian translations

* viewports italian translations

* explosives italian translations

* killtracker italian translations

* killtracker german correction

* gforces italian translations

* noradio italian translations

* reloadlaunchers italian translations

* cargo italian translations

* medical_engine italian translations

* field_rations italian translations

* maverick italian translations

* slideshow italian translations

* medical_ai italian translations

* advanced_fatigue italian translations

* marker_flags italian translations

* tagging italian translations

* fastroping italian translations

* markers italian translations

* medical_statemachine italian translations

* microdagr italian translations

* novehicleclanlogo italian translations

* realisticnames italian translations

* irlight italian translations

* laser italian translations

* ballistics italian translations

* interaction italian translations

* medical_status italian translations

* medical_feedback italian translations

* medical italian translations

* map_gestures italian translations

* casings italian translations

* logistics_rope italian translations

* repair italian translations

* fieldmanual italian translations

* refuel italian translations

* refuel german translations

* intelitems italian translations

* gunbag italian translations

* fire italian translations

* cookoff italian translations

* smallarms italian translations

* zeus italian translations

* zeus german translations

* vehicle_damage italian translations

* advanced_ballistics italian translations

* advanced_throwing italian translations

* artillerytables italian translations

* captives italian translations

* chemlights italian translations

* compat_sog italian translations

* compat_rhs_usf3 italian translations

* compat_ws italian translations

* compat_ws german translations

* concertina_wire italian translations

* dogtags italian translations

* dragon italian translations

* fcs italian translations

* flashlights italian translations

* flashsuppressors italian translations

* frag italian translations

* gestures italian translations

* hitreactions italian translations

* hot italian translations

* huntir italian translations

* kestrel4500 italian translations

* laserpointer italian translations

* logistics_uavbattery italian translations

* logistics_wirecutter italian translations

* main italian translations

* map italian translations

* maptools italian translations

* medical_blood italian translations

* missileguidance italian translations

* missionmodules italian translations

* mk6mortar italian translations

* nlaw italian translations

* optionsmenu italian translations

* pylons italian translations

* quickmount italian translations

* rearm italian translations

* respawn italian translations

* sandbag italian translations

* scopes italian translations

* spectator italian translations

* spectator german translations

* tripod italian translations

* volume italian translations

* weaponselect italian translations

* weather italian translations

* winddeflection italian translations

* dagr italian translations

* headless italian translations

* hearing italian translations

* towing italian translations

* yardage450 italian translations

* Grammar Suggestion

* Fix Error from merge conflict resolution
 2023-12-11 19:31:02 -06:00
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
Enrico Machado
3f6a93195a Translations - Add & Improve Portuguese entries (#9609) 
* Fixed Portuguese typos

* Partial Portuguese translation

* Partial Portuguese translation

* Update addons/ai/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/gunbag/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/cargo/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/fieldmanual/stringtable.xml

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

* Readded accidently removed entry

* Update stringtable.xml

* "and" -> "e"

* Update stringtable.xml

* Partial Portuguese translation

* Fixed corrupted merge

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-11-22 20:33:30 -03:00
johnb432
2e7f56ee39 Dragging - Fix captives (#9660) 
Fixes and cleanup
 2023-11-21 17:18:19 -03:00
Apricot
5d8978981a Translations - Improve Japanese (#9654) 
Update Japanese
 2023-11-17 19:50:33 -06:00
johnb432
d1f0dc5e83 Cargo - Improve various aspects (#9617) 
* Update CfgVehicles.hpp

* Cargo cleanup

* Update menu.hpp

* Updated status effect key

* Update fnc_onMenuOpen.sqf

* Update fnc_onMenuOpen.sqf

* fix comment from merge

* nil interaction GVARs on menu close

* fix carry bug

* Fix floating objects in MP

* Updated ace_cargoAdded doc

* Fix progress bar prematurely stopping

* Finer cursor object selection

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-11-17 20:07:28 -03:00
Filip Maciejewski
9f9507931f Dragging - Fix being able to load cargo if the system is disabled (#9639) 2023-11-10 14:56:22 -05:00
Filip Maciejewski
7df63ffe2e Dragging - Fix being able to load people into vehicles from any distance (#9638) 2023-11-10 14:54:31 -05:00
Nilia119
d53bc62e27 Translation - German Addition/Improvement (#9587) 
* Added German Translation

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

---------

Co-authored-by: Jo David <github@jonathandavid.de>
 2023-10-26 15:33:41 -05:00
Psycool
25ec67f2fb Translations - Korean updated (#9579) 
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-25 10:34:15 -05:00
Mysteryjuju
0a83b6e840 Translations - Add missing french translations (#9577) 
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
 2023-10-24 16:47:24 -04:00
Grim
406fce2836 Dragging - Add setting for Max Weight Coefficient (#9569) 
* add arcade mode setting

* tweak stringtable

* stringtable

* change to slider

* fix spelling

* Update stringtable.xml

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-24 00:57:05 -04:00
Grim
f35f872963 Dragging - Prevent carrying crewed static weapons (#9491) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-23 19:21:50 +02:00