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,116 Commits 73 Branches 88 Tags 752 MiB
1a876afe37
Commit Graph

58 Commits

Author SHA1 Message Date
johnb432
1a876afe37 Merge branch 'master' into pr/9234 2023-12-17 23:13:59 +01:00
Grim
3f61a41be3
Common/CSW - Use status effect for enableWeaponDisassembly (#9413) 
* uuse weaponDisassemblyEnabled

* convert to status effect

* fix edge conditions

* Update addons/common/functions/fnc_claim.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update XEH_postInit.sqf

* Update addons/common/functions/fnc_claimSafeServer.sqf

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

* Update fnc_claimSafeServer.sqf

* change status effect key

* status effect key

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-11-22 21:16:42 -03:00
PabstMirror
d70c049b4f
CSW/Dragging - Handle null objects causing script errors (#9529) 
* CSW - Handle static weapon be deleted

* add same fix to dragging
 2023-10-18 22:17:07 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02: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
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
Salluci
b51efb15fc add support for getting vehicle magazine from magwells 2023-07-24 00:34:51 +03:00
Salluci
3c767c6025 skip magazines with no ammo 2023-07-16 21:43:43 +03:00
Salluci
1cf254a752 fix condition 2023-07-14 19:36:40 +03:00
Salluci
2b52fee1bf fix container creation 2023-07-14 19:27:13 +03:00
Salluci
fac2e6151a add example to header 2023-07-14 19:21:04 +03:00
Salluci
b7abfeaeb5 add ai_switchMagazine 2023-07-14 19:04:42 +03:00
Salluci
22d45be421 function header 2023-07-14 18:43:19 +03:00
Salluci
18187621d3 i should squash these 2023-07-14 00:59:50 +03:00
Salluci
bb9ac714ce fix derp part 2 2023-07-14 00:48:14 +03:00
Salluci
ef93a61e13 fix derp 2023-07-14 00:37:27 +03:00
Salluci
87586459bc fix stupid, add turretPath bool 2023-07-14 00:12:18 +03:00
Salluci
4e8c69e08a make public 2023-07-13 20:01:33 +03:00
Salluci
7647123683 add forcedMag and ai_unloadMagazines 2023-07-13 19:53:57 +03:00
Salluci
73bc331701 function header 2023-07-13 19:52:56 +03:00
Salluci
078857b5a9 add getAvailableAmmo 2023-07-13 14:51:26 +03:00
Salluci
17156d5480 missing semicolon 2023-07-13 13:56:40 +03:00
Salluci
e5a9fadcec add check for invalid proxyWeapon 2023-07-13 13:53:50 +03:00
Salluci
4b92ef2ade remove systemChat 2023-07-13 13:48:11 +03:00
Salluci
aa8fff3041 fix case sensitivy, move container creation 2023-07-13 13:45:52 +03:00
Salluci
ed44c0d445 more headers 2023-07-13 13:20:21 +03:00
Salluci
6c2a8a2117 add container property 2023-07-13 13:16:15 +03:00
Salluci
c46dc339c5 _staticWeapon > _vehicle, StaticWeapon > CSW 2023-07-13 13:01:28 +03:00
Salluci
c96a9daf7b remove unnecessary change 2023-07-13 10:50:06 +03:00
Salluci
d00c9ca2a0 all the things 2023-07-13 10:42:30 +03:00
Salluci
5d62ab4125 fix undefined variable 2023-07-02 19:48:01 +03:00
Salluci
76a20760f5 cache nearby ammo sources 2023-07-01 20:33:42 +03:00
Salluci
f3c393f50c fix TRACE 2023-07-01 18:52:29 +03:00
Salluci
aca90fb187 this took way too long 2023-07-01 18:39:42 +03:00
Salluci
01dffca9c1 progress bar text changes 2023-06-30 04:06:50 +03:00
Salluci
78800be9ab fix unloading to units with full inventory 2023-06-30 03:57:20 +03:00
Salluci
39f200b941 fix belt linking issues 2023-06-30 03:43:09 +03:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers (#9223) 
* secret handshake?

* fix my name

* new github username
 2023-06-19 16:31:17 +03:00
GhostIsSpooky
c241f2e2a2
fix config lookup (#9106) 2022-12-10 14:15:28 -06:00
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995) 
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
 2022-08-14 17:09:01 +01:00
Dystopian
89badcc71f
CSW - Fix missing magazine on assembling (#8880) 
* Fix missing magazine on assembling

* Fix adding mag when csw is empty

* Fix missing magazine when player has launcher
 2022-05-04 17:28:58 -05:00
Dystopian
54c13c5f42
Move carry mag getting code to function (#8888) 2022-05-02 18:54:04 -05:00
Wakbub
dd07b0fa30
Fix Error Type String, expected Array (#8871) 
Pass an array instead of a string to insert.
 2022-04-09 13:50:47 -05:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795) 
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* optimize condition

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* capitalization

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* use object in getVehicleIcon

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* remove extra brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add missing brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment pt2

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-08 21:41:21 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776) 
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

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

* fix TRACE

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-07 12:29:19 -06:00
Bailey Danyluk
7958f1dd9b
change name (#8805) 2022-01-30 11:54:30 -06:00
Salluci
a4f24cbe3d
CSW - Fix AI reloading from GroundWeaponHolder (#8399) 
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
 2021-09-25 10:39:03 -05:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00