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
14,637 Commits 73 Branches 88 Tags 752 MiB
cac223c6ec
Commit Graph

924 Commits

Author SHA1 Message Date
PabstMirror
cac223c6ec
Common - Use hashmap variable for canDig surfaces (#9147) 
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf
 2023-02-09 13:16:42 -06:00
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility (#9105) 
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

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

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

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

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-02-01 23:28:55 -06:00
mharis001
b4005bca43
Common - Fix disableUserInput blocking respawn (#9053) 2023-01-31 17:14:50 -06:00
JonBons
6b3aa3e0a2
Common - Hide cursor during progress bar (#9128) 
* Common - Hide cursor during progress bar (w/ CBA setting)

* Fix base class define

* Removed CBA setting for disabling hiding of the cursor for the ACE progress bar

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-01-24 13:57:10 -06:00
PabstMirror
cc3bad3c56
XM157 (NGSW-FC Smart Scope) Framework (#8897) 
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

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

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

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

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2022-09-01 13:44:19 -05:00
Drofseh
86f08af250
Common - Add keybind and function to unload unit's weapon/muzzle (#8735) 
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-18 13:07:47 -05:00
Tim Beswick
27c5464654
Common - Add separate blockSpeaking status for acre direct (#8904) 
* Add separate blockSPeaking status for acre direct

* Move TFAR code to new blockSpeaking handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-08 13:20:15 -05:00
jonpas
3442a47942
General - Remove deprecated functions (#8878) 2022-04-17 08:27:19 +01: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
Brett
90d63475d5
Medical Treatment - Add preferred seats for loading patients (#8789) 
* Medical Treatment - Add preferred seats for loading patients

* load patients in reverse order

* add option for reverse fill

* Update addons/medical_treatment/functions/fnc_loadUnit.sqf

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

* Update docs/wiki/framework/medical-treatment-framework.md

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-02-17 11:14:39 -06:00
GhostIsSpooky
9ff5d34ce7
Common - Add cache to fnc_isModLoaded (#8794) 
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-01-30 11:56:20 -06:00
Serg Vergun
af86109c2b
General - Utilize isNotEqualTo command (#8732) 
* Utilize isNotEqualTo command

* fix pr validation
 2021-12-18 17:15:32 -06:00
GhostIsSpooky
a9296f66d5
Medical - Update setDead to use setHitpointDamage instigator param (#8397) 
* Redoing this

* Revert "Redoing this"

This reverts commit 80ff709676.

* Do this properly

* Update fnc_handleKilled.sqf

* use setDead function directly

* Handle scripted camera

* redo #8387

I'm dumb.

* try this

* if construct outside of ctrlSetEventHandler

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

* tweak disableUserInput / handleKilled

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-15 09:31:56 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
PabstMirror
8cdf0b2c68
Revert "Common - Fix calling getVar on null object in canInteractWith (#8532)" (#8564) 
This reverts commit a0e9f6015b.
 2021-10-19 13:17:59 -05:00
PabstMirror
a0e9f6015b
Common - Fix calling getVar on null object in canInteractWith (#8532) 
* Common - Fix calling getVar on null object in `canInteractWith`

* why was this added dedman?
 2021-10-16 17:15:37 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461) 
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-11 15:48:30 -05:00
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468) 
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
 2021-10-10 18:55:14 +02:00
GhostIsSpooky
1b318433a2
Common - Add settings for additional progress bar information (#8428) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-10 18:49:41 +02:00
BaerMitUmlaut
6128b8ef06
Common - Only switch side if necessary on person loading (#6334) 
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-10 16:26:36 +02:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-10 15:37:05 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items (#8379) 
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
 2021-10-07 00:10:19 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode (#8452) 
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
 2021-10-05 12:29:22 -05:00
Salluci
48912be73c
Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388) 
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-09-25 11:16:15 -05:00
Salluci
f9d064e5f4
Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05: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
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05:00
PabstMirror
0c1d7177c0
Common - Block user input on headbug fix (#8398) 
* Common - Block input on headbug fix

* keep return
 2021-08-28 14:56:13 -05:00
Joko
08eadc7c19
Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon (#8329) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-07-23 22:35:52 +02:00
Kyle Mckay
e870e2f1f9
Common - Improve vehicle icon caching implementation (#8318) 
* Use native hashmap for common vehicle icon caching

Should be more optimised
 2021-07-18 18:26:23 +01:00
BaerMitUmlaut
9291d9b714
Medical - Hide cursor when unconscious (#8269) 
* Hide cursor when blocking inputs

* Update addons/common/DisableMouseDialog.hpp

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

* Update addons/common/functions/fnc_disableUserInput.sqf

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

* Update addons/common/DisableMouseDialog.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-06-27 15:39:17 -05:00
Dystopian
69c3d2bb65
Add Weapon Attachments interaction (#7706) 
* Add Weapon Attachments interaction

* Apply recommended changes

* Format addPEH

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Remove toLower

* Update required CBA version

* Rename category to Accessories

* Change setting var name

* Add setting description

* Fix notification size

* Optimize with new commands

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-03-04 11:43:11 -06: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
mharis001
5bc43fe247
Common - Improve getPylonTurret by using getAllPylonsInfo (#8087) 
* Improve getPylonTurret by using getAllPylonsInfo

* Fix indentation

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-23 10:57:57 -06:00
PabstMirror
0570c0b861
Update fnc_cbaSettings_loadFromConfig.sqf (#8118) 2021-02-19 11:18:21 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -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
BaerMitUmlaut
ad75c7c9b8
Common / Medical - Fix loading patients into turret only seats (#7980) 
* Fix loading patients into turret only seats

* Fix cargo logic, adjust function for captives (#8000)

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-15 12:57:27 -06:00
mharis001
553bba8ece
Common - Fix disableUserInput blocking already open Zeus display (#7757) 2020-06-19 10:36:24 -05:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
PabstMirror
1e2b88f170
Minor RPT cleanup (#7658) 2020-04-22 10:05:22 -05:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit (#7529) 2020-02-22 21:24:47 +01:00
Whigital
8c2f53ac14 Revert quotation on string args 2020-02-12 22:07:19 +01:00
Whigital
80352519e1 conform isnil checking: common 2020-02-12 17:28:18 +01:00
PabstMirror
dd7ae389f9 Common - Fix canDig returning non-bool (#7516) 2020-02-08 19:43:42 -06:00