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,631 Commits 73 Branches 88 Tags 752 MiB
5ea5330c70
Commit Graph

397 Commits

Author SHA1 Message Date
johnb432
5ea5330c70 Update fnc_canDrag.sqf 2024-08-28 14:33:16 +02:00
johnb432
a5d047cdc8
Update addons/dragging/functions/fnc_canCarry.sqf 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-08-28 05:29:27 -07:00
PabstMirror
78adfdf1ba Merge branch 'master' into pr/9273 2024-08-24 22:23:15 -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
f93ac13ca4 Remove ; in headers 2024-07-20 08:44:56 +02:00
johnb432
7a261773e2 Merge branch 'master' into pr/9273 2024-07-20 08:42:52 +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
5ee64781ea Merge branch 'master' into pr/9273 2024-07-16 20:30:15 +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
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
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
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
04564b4e4f setPosATL globally 2024-04-09 22:08:43 +02:00
johnb432
fdbaeabc47 Try syncing individually on each client 2024-04-01 16:33:08 +02:00
johnb432
1a20df808e Merge branch 'master' into pr/9273 2024-04-01 16:06:12 +02: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
johnb432
a627dfd3f9 Merge branch 'master' into pr/9273 2024-03-02 11:03:56 +01:00
V1nsyara
4d487dc33e
Translations - Russian (#9802) 
Update Russian Translate
 2024-02-20 19:22:38 -06:00
johnb432
2d8dc01f2c Cleanup 2024-02-02 23:59:10 +01:00
johnb432
43fb2613be
Update addons/dragging/functions/fnc_createClone.sqf 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-02 14:54:19 -08:00
johnb432
f805604901
Update addons/dragging/functions/fnc_dropClone.sqf 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-02 10:47:47 -08:00
johnb432
824a9f6afe Another attempt 2024-02-02 18:19:43 +01:00
johnb432
c4b29e6ae7 Merge branch 'master' into pr/9273 2024-01-21 09:00:23 +01: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
johnb432
ceb940a124 Merged master 2024-01-14 22:36:10 +01: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
15b581b4cc Update fnc_createClone.sqf 2024-01-11 11:56:25 +01:00
johnb432
594e1187a9 Readd body moving under terrain 2024-01-09 19:37:24 +01:00
LinkIsGrim
884bccf1cb add wound texture handling 2024-01-08 04:40:28 -03:00
johnb432
d1755af35b Remove body moving under terrain 2024-01-07 18:02:12 +01:00
johnb432
3387898441 Check correct ragdoll state 2024-01-07 17:46:20 +01:00
johnb432
573bfbb92d Fix not hidden 2024-01-07 16:48:40 +01:00
johnb432
4a5f056d71 Fixed/improved checks 2024-01-07 16:29:01 +01:00
johnb432
04238fd382 Merge branch 'master' into pr/9273 2024-01-07 13:29:08 +01: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