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,329 Commits 73 Branches 88 Tags 752 MiB
6972f02bc4
Commit Graph

371 Commits

Author SHA1 Message Date
johnb432
2a3ff8e185
Medical Treatment - Fix low SpO2 making units go into cardiac arrest again (#10003) 
* Set SpO2 after successful CPR

* Update fnc_cprLocal.sqf

* Add API

* Update fnc_cprLocal.sqf
 2024-05-10 20:39:41 -05:00
johnb432
3987c62acc
Grenades - Add missing documentation on flares and incendiaries (#9984) 
Update grenades-framework.md
 2024-04-29 00:34:35 -07:00
johnb432
60b87f0b41
Medical - Add _createLitter to medical events (#9959) 
Added `_createLitter` to medical events
 2024-04-26 17:35:57 -05:00
Crowdedlight
5a6d6a73df
Wiki - Fix search being broken by the attach-framework page (#9969) 2024-04-22 19:08:49 +02:00
OverlordZorn
97257ca77a
Documentation - minor fix (#9967) 
a -> an
 2024-04-21 07:15:07 -07:00
Dart
ac9ffb5276
Docs - Fix tables and inconsistencies (#9952) 
Co-authored-by: LinkIsGrim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-19 20:53:33 +00:00
Tim Beswick
23842aab39
Medical - Fix script error when bandaging (#9956) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-04-19 16:57:41 -03:00
BrettMayson
f3f7f2c492
Medical Status - API to modify getBloodLoss (#9926) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-06 22:18:07 -03:00
Fabio Schick
ccb3e65734
Map Tools - Show GPS on Map when equipped with UAV Terminal (#9885) 
* Show Map GPS when equipped with UAV Terminal

* Update Maptools Documentation

* Reword documentation

* Reword docs, remove dash

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

* Allow GPS when terminal slot is not empty

* Allow GPS on map when GPS sidepanel is available

* Reword docs

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

* Return statement - remove ; and add comment

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-04-04 08:09:02 -03:00
Sotirios Pupakis
558849b91c
Interaction - Add door events (#9910) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2024-04-03 17:47:51 -03:00
Mr. Zorn
46cc49dc1e
Documentation - Add info about Plotting Board (#9838) 
* Update maptools.md

* Update maptools.md

* Update docs/wiki/feature/maptools.md

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-03-28 08:49:45 -03:00
Dart
31217ae5d0
Fortify - Add onDeployStop event for cancelling before confirming (#9854) 
* onDeployStop event

* Updated wiki with new event

* Fixed params

* Revert "onDeployStop event"

This reverts commit c3dae82915.

* Uses deployCanceled

* Re-added fortify stop event

* Update fnc_deployObject.sqf

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-25 09:08:06 -07:00
BrettMayson
3c5b46c42d
Medical - Support Magazine Treatment Items (#9816) 
* count treatment items

* getCountofItem

Co-Authored-By: Blue <itzblueman@gmail.com>

* getCountofItem fix

Co-Authored-By: Blue <itzblueman@gmail.com>

* convert painkillers to magazine

* use isclass

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

* forget to change variable

* Update addons/medical_treatment/functions/fnc_hasItem.sqf

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

* better magazine adjustment

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Update addons/medical_treatment/functions/fnc_medication.sqf

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

* Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf

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

* Update docs/wiki/framework/arsenal-framework.md

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

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* Header

* use switch statement in fnc_useItem

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

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

* only check adding to mags that are not full

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Update fnc_getCountOfItem.sqf

* Optimisations & header fix

* Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

* Fixed vehicle implementation

---------

Co-authored-by: Blue <itzblueman@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-03-21 22:56:24 +01:00
Dart
af3c95a5a6
Fire - Add ability to disable screams for individual units (#9863) 
* Disable screams for individual units

* Update addons/fire/XEH_postInit.sqf

* Changed wording

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

* isGlobal instead of true

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-21 20:20:23 +01:00
johnb432
017d47f8c9
Fortify - Skip placement animation for no cost fortifications (#9861) 
Skip placement animation for no cost fortifications
 2024-03-19 08:57:09 +01:00
Grim
8e975a6b91
Medical Treatment - Add hook to modify bandaging treatment (#9814) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-09 14:15:24 -03:00
BrettMayson
67fa53fd2c
General - Events for Mods (#9813) 
* full heal local

* update body image

* log list

* better _enable in categories

* update injury list

* cardiac output internal variable

* typo

* remove duplicate event

* rename event

* add docs

* Update docs/wiki/framework/events-framework.md

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-04 15:08:12 -06:00
Grim
64538f2ad0
Arsenal - Native baseWeapon support for CBA items (#9799) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-02 14:29:20 -03:00
johnb432
fd5e56ffbc
Arsenal - Improved sorting, insignia detection, identity info verification and minor cleanup (#9795) 
* Changed sorting + minor cleanup

* Update addons/arsenal/functions/fnc_fillLeftPanel.sqf

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

* check and log missing extended info

* fix extended loadout logging

* Made voice stuff config case

* use lowercase voice everywhere

* check loadout voice against configCase

* Update fnc_verifyLoadout.sqf

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

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

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

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

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 11:22:27 -08:00
BrettMayson
1002dfe31b
Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
Grim
1e1d1d63f2
Arsenal - Add ace_arsenal_loadoutVerified event (#9792) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-11 20:25:12 -03:00
Laid3acK
41c7b12acb
Documentation - Fix Wiki AtragMx links (#9780) 2024-02-10 12:52:36 -03:00
Fabio Schick
2f9b7002c3
Explosives - Add Cellphone/Detonator Keybinds (#9687) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 17:47:01 -03:00
johnb432
28e45c2979
Laser - Public getter and setter for laser codes (#9772) 
* Getter and setter for laser codes

* Documentation

* Sanitising input
 2024-02-07 08:49:36 -08:00
Laid3acK
6637a15af9
Documentation - Update Wiki AtragMx (#9608) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-07 07:30:50 -03:00
Grim
e69ffb6f21
Arsenal Actions - Add support for multiline text & updating on cargo event (#9771) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-06 20:34:52 -03:00
Grim
676a4b97a6
Add documentation for Medical Vehicles & Facilities (#9724) 
* add doc on medical facilities and vehicles

* fix typo

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

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

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-13 11:44:21 -03:00
johnb432
79c43179ea
Map Tools - Add Plotting Board (#9653) 
* Initial Commit to unfuck whatever I fucked in Git.

* Update initSettings.sqf and stringtable.xml

* Implements stringtable.xml suggestion

* Fixes for plotting board

* Update addons/maptools/functions/fnc_handleMouseButton.sqf

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

* Update addons/maptools/CfgWeapons.hpp

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

* Update addons/maptools/XEH_postInitClient.sqf

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

* Update addons/maptools/XEH_postInitClient.sqf

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

* Cleanup

* Redid calculations

* Updated docs

* More updated docs

* Update maptools.md

* Fix error and warning

---------

Co-authored-by: LorenLuke <LukeLLL@aol.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-01-07 10:02:05 -08:00
johnb432
dababe84b9
Captives - Add listenable event handler for escorting (#9709) 
Added escorting EH
 2024-01-02 18:50:29 -03:00
Jaffa
5458fdfe83
Wiki - Fix spelling in vehicle lock framework wiki page (#9680) 2023-12-17 03:54:06 +01:00
johnb432
1b86f909e8
General - Removed silent Options Menu dependencies (#9677) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-12-11 18:05:22 +01:00
PabstMirror
11c1917e7b
Wiki - Update cargo-framework.md (#9672) 
* Update cargo-framework.md

* Update cargo-framework.md
 2023-12-09 11:52:07 -06:00
Mr. Zorn
65be883eea
Weather - Add variable to temporarily pause wind simulation (#9057) 
* added exit condition

This would enable mission maker to temporarily disable the execution of setWind every second.
Currently, a temporary pause isnt possible.

* Update weather-framework.md

* Apply suggestions from code review

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

* actually disable wind simulation

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-11-23 15:16:55 -03:00
johnb432
ac9044f2d6
Zeus - Add medical menu module (#9367) 
* open medical menu from Zeus

* fix function header

* Zeus can use every action, add room for more buttons in medical menu

* Update addons/medical_treatment/functions/fnc_treatment.sqf

* Added zeus treatment time coeff

* Update addons/medical_gui/functions/fnc_canOpenMenu.sqf

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

* Update fnc_canOpenMenu.sqf

* Update initSettings.sqf

* Update fnc_moduleMedicalMenu.sqf

* Added check + documentation

* Update fnc_canTreat.sqf

---------

Authored-by: Brett <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-20 13:52:29 -08: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
Crowdedlight
548ab810df
Attach - Add config property to set object orientation (#9623) 
* added possibility to define orientation on attach items in config

* added documentation on attach framework

* whitespace

* changed to use roll and yaw parameters instead of vectordir for easier usage, and to support placement view with rolled objects. Changed vector calculations

* Update addons/attach/functions/fnc_attach.sqf

* Docs and comments

* fix derp

* Update docs/wiki/framework/attach-framework.md

* Update attach-framework.md

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-11-10 21:04:22 -03:00
Grim
bbcec5c468
Arsenal - Add param to skip refresh animation (#9546) 
* add animate param

* add refresh param

* remove param from event

* add 3DEN handling, update docs

* derp

* fix doc numbering
 2023-10-26 11:59:00 -05:00
Jo David
9641fe490b
Documentation - Improve svg handling (#9575) 
* fix tabs in xm157

* use rollup, remove grunt, fix scss build

* add svg bundler. rework to use svg element instead of images
 2023-10-24 14:04:58 +02:00
Jo David
697a4b75ca
Documentation - Improve and move to a modern build system, Fix search not working (#9574) 
* fix tabs in xm157

* use rollup, remove grunt, fix scss build
 2023-10-24 11:53:42 +02:00
Jo David
bd908bbce6
Documentation - Fix column sizes on wiki page (#9572) 
fix column sizes on wiki page
 2023-10-24 00:49:49 -05:00
Jo David
02acb93d20
Documentation - Update x icon, remove font awesome, replace with svg (#9566) 
update twitter icon, remove font awesome, replace with svg
 2023-10-24 00:01:53 -05:00
Grim
58e4476b7d
Documentation - Add arsenal snippets (#9567) 
add snippet
 2023-10-23 17:19:41 -04:00
Mike-MF
262b7fe5c6
Night Vision - Add prefix to colorPreset (#9520) 
* Add ACE Prefix to colorPreset, update docs.

* remove pointless bwc
 2023-10-18 15:03:21 -04:00
Tim Beswick
bd377c49fc
Repair - Allow setting spare wheels/tracks count in config (#9481) 
* Allow setting spare wheels/tracks count in config

* Update repair framework docs
 2023-10-12 12:45:56 -04:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging (#9455) 2023-10-02 11:05:56 -04:00
BrettMayson
66deb59037
Medical Treatment - Add event and setting for grave creation (#9441) 
graves: event and setting for markers

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-10-01 14:31:38 -04:00
BrettMayson
d2f5c2de02
Spearhead 1944 Compatibility (#9292) 
* compat(spe): initial

* --changed csw/turrets

* disable spe disassemble

* csw: all mortars done

* more cleanup

* add missing hearing protection

* final cleanup

* goofed and removed too much

* ok all done

* formatting

* remove adt

* -+ updated frameworks

- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)

* formatting

* Require HEMTT v1.7.2

* cleanup tabs / formating

* Apply suggestions from code review

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: ZluskeN <pontux@gmail.com>

* split to subcomponents, fix ubcs

* swap has_include for skipWhenMissingDependencies

* fix explosives

* add pdumies for ww2

* Apply suggestions from code review

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

* cleanup sten duplicate configs

* move hearing to macro

* fix macro repaclement

* Use `SUBADDON`

* Move `addonRootClass` to bottom of CfgPatches

* Relative includes

* move config macro includes to config.cpp

* comment off csw changes for now

* Update .hemtt/project.toml

---------

Co-authored-by: Coldfront15 <born2toot2@gmail.com>
Co-authored-by: Brett Mayson <brett@joinoffstreet.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-09-25 15:37:59 -05:00
Grim
ac29287542
Arsenal/Compat RHS - Improve support for RHS attachments (#9386) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-25 18:36:46 +02:00
Drofseh
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal (#9276) 
* Add grave digging

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Add setting to enable/disable

* improvements

- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions

* fix typo in variable

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* add to XEH_PREP and fix event for non-local patient

* Add interaction to check name on headstone

* Update addons/medical_treatment/XEH_postInit.sqf

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

* Simplify Setting

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>

* Make placeInBodyBagOrGrave more generic and use any grave class

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

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

* Update medical-treatment-framework.md

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

Co-authored-by: jonpas <jonpas33@gmail.com>

* update docs

* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

* fix includes

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-09-24 15:57:08 -04:00
PabstMirror
0b695be841
Laserpointer - Block switching to unsupported visible lasers (#9416) 2023-09-22 18:09:46 +02:00