Commit Graph

11484 Commits

Author SHA1 Message Date
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
jonpas
111202971b
Goggles - Allow wiping in more states (#8111) 2021-02-14 04:28:58 +01:00
PabstMirror
cb870693fd
CSW - use preferred XEH format (#8112) 2021-02-13 15:37:26 -06:00
Filip Maciejewski
b8820eb3da
Arsenal - Fix custom categories not working for some Misc item types (#8088) 2021-02-08 04:26:40 +01:00
PabstMirror
b50a49c287
Convert all true/false in configs to 0/1 (#8095) 2021-02-08 04:14:45 +01:00
TyroneMF
7a65acdc15
Medical Damage - Add setting for unconscious chance from pain (#8092)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2021-02-08 04:13:59 +01:00
Dystopian
08472f6343
Interact Menu - Combine parent menu with single child (#8060)
* Combine parent menu with single child

* Adapt fastroping Cut ropes action for the setting

* Change setting name and description

* Fix action object when child action has different object

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

* Adapt quickmount Change Seat actions

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-04 11:01:35 -06:00
PabstMirror
091d0d2449
Tripod - Fix blocking mouse wheel input handler (#8090) 2021-02-04 10:48:58 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Dystopian
4acfc35e77
Cleanup unused variable (#8074) 2021-01-28 11:14:28 -06:00
jonpas
6522dba87e
Dragging - Fix mass synchronization (#8071)
* Dragging - Fix mass synchronization

* Cleanup redundant argument
2021-01-20 14:49:38 -06:00
Björn Dahlgren
fe544a274d
Ballistics - Add 30rnd 556 magazines to SCAR EGLM magwell (#8054) 2021-01-05 10:54:52 +01:00
Cyruz143
8eccabbc0a
Grenades - Use fnc_addToInventory (#8016)
* Try and put converted item back in the same container

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Less hacky handling of container names

* Return value convention

Co-authored-by: Dystopian <sddex@ya.ru>
2020-12-21 00:15:46 +01:00
Dystopian
50f740f9be
Optimize interaction menu conditions (#8037) 2020-12-17 21:28:54 +01:00
Brandon Danyluk
4058a7e42b
MissileGuidance - Active Radar Homing: Use AGL for nearestObjects check (#8045)
* Use AGL for `nearestObjects` check

* remove empty line
2020-12-15 21:01:53 -06:00
Smith
5a6b21dd0b
Map Gestures - Fix briefing mode group (#8025)
* fix getting players from a group

* add brackets

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

* small refactoring

* remove useless parentheses

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
2020-12-02 08:49:35 -06:00
Dedmen Miller
a64ba9f7a5
Arsenal - Remove useless isClass check in configClasses (#8018) 2020-11-29 19:21:53 +01:00
Dedmen Miller
0e88479220
Tagging - Remove useless isClass check in configClasses (#8017) 2020-11-29 19:21:41 +01:00
Cyruz143
2ec28c5946
Medical Engine - Hide actions that have ACE interactions (#8003) 2020-11-29 19:21:02 +01:00
Dystopian
9dc82ee187
Fix fnc_common_addToInventory using (#8013) 2020-11-25 13:22:25 -06:00
mharis001
137af792d2
Arsenal - Fix sort by load (#8011) 2020-11-24 15:29:43 +01:00
PabstMirror
109e12cc2b Prep 3.13.5 Build 57 2020-11-16 17:46:16 -06:00
PabstMirror
d887b4a635 Merge branch 'master' into release-3.13.5 2020-11-16 17:45:54 -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
BaerMitUmlaut
629942885e
Fix players occasionally being invincible after respawning (#7999) 2020-11-10 10:07:42 -06:00
PabstMirror
a621d2eb72
Medical Statemachine - Ensure bleedout condition string is code (#7998) 2020-11-10 10:06:45 -06:00
Elgin675
92cd367765
Translations - Add French "Medical_Statemachine_CardiacArrestBleedout" keys (#7997) 2020-11-08 17:46:13 -06:00
Dedmen Miller
1efa25fe2b
Explosives - Add clackerAdded event (#7994)
* Add clackerPlaced event

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 17:26:02 -06:00
BaerMitUmlaut
0c84cdd375
Fix unconscious medics not being healed by other AI medics (#7995) 2020-11-08 16:32:02 -06:00
BaerMitUmlaut
d27122fa16
Medical Status - Fix unconscious AI aiming at enemies (#7977)
* Fix unconscious AI aiming at enemies

* Improve handling when locality changes

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 16:27:10 -06:00
Laid3acK
718d282263
Ballistics - Update the B 556x45 dual (#7982)
* B_556x45_dual

* B_556x45_dual
2020-11-08 16:26:30 -06:00
BaerMitUmlaut
0e642758d6
Medical Statemachine - Add setting to disallow bleedout in cardiac arrest (#7547)
* Add setting to disable bleedout in cardiac arrest

* Improve setting name and description
2020-11-08 16:24:44 -06:00
BaerMitUmlaut
119450f4e9
DAGR / Interaction Menu / Repair - Fix overwriting globals (#7990)
* Remove global DAGR_NEXT variable

* Remove global ERR variable

* Fix overwriting global this variable

* Fix overwriting global total and hitpoint variables

* fix condition

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 15:54:14 +01:00
Elgin675
5d1aa28419
Translations - Add French "Medical_Treatment_bodybagWhileStillAlive" key (#7993) 2020-11-07 17:08:01 -06:00
Elgin675
95d4dc811b
Translations - Update French Translations (Arsenal, Markers and Medical GUI) (#7987)
* Translation - Add french "Arsenal_sortByProtection" keys

* Translation - Add french "Markers_Timestamp" keys

* Translation - Add french "Medical_GUI_InteractionMenuShowTriage" keys
2020-11-07 09:36:12 -06:00
Elgin675
712a27788f
Translations - Update / Fix French Translations (Medical Treatment) (#7988)
* Translations - Fix French "TreatmentTime" keys.

* Translations - Add French "TreatmentTime" keys.

* Translations - Fix some french keys (medical_treatment).

* Translation - Add french "Treatment_WoundStitchTime" and "AllowBodyBagUnconscious "keys

* Translations - Fix french "Medical_Treatment_AllowSelfStitch_DisplayName" key

* Fix french "Medical_Treatment_MedicIV_Description" key

* Fix french "Medical_Treatment_AllowSelfIV_DisplayName" key
2020-11-07 09:35:40 -06:00
PabstMirror
bc7194942f
Update fnc_sortStatement_protection.sqf (#7989) 2020-11-05 18:42:41 +01:00
PabstMirror
12ad406fa3 Prep 3.13.5 Build 56 2020-11-02 23:01:40 -06:00
BaerMitUmlaut
af2973a9f0
Fix spare wheels receiving fall damage (#7978) 2020-11-02 21:43:49 -06:00
PabstMirror
ff2136c98f
Update fnc_fillSort.sqf (#7981) 2020-11-02 21:42:48 -06:00
Brett
9226035d59
Arsenal - Conditional on sorts (#7889)
* Arsenal - conditional on sorts

* fix: zero divisor

* update fnc_addSort

* Update fnc_fillSort.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-02 12:23:44 -06:00
BaerMitUmlaut
260706cb9f
Fix door opening for buildings with 10+ doors (#7975) 2020-11-02 12:22:53 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup (#7973) 2020-10-30 23:40:10 -05:00
PabstMirror
2ca13fc022
Medical - Cleanup preload debugging, bump to 2.00 (#7976) 2020-10-30 13:29:13 -05:00
mharis001
aab8d8eb32
Medical Treatment - Title case autoinjector item names (#7974) 2020-10-30 14:45:28 +01:00
PabstMirror
b991fe1343
Arsenal - Sort by protection (helm, uniform, vest) (#7952)
* Arsenal - Sort by protection (helm, uniform, vest)

* Update fnc_sortStatement_protection.sqf

* split to 2 different sorts
2020-10-29 11:38:31 -05:00
BaerMitUmlaut
b389740a29
Medical AI - Fix AI healing itself too fast when hit (#7955)
* Fix AI healing itself too fast when hit

* make time constants gvars

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:38:24 -05:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions (#7951)
* adjustable times for most constant treatment times

* add new line, formatting

* cleanup merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag (#7941)
* medical: allow placing unconscious in a bodybag

* Always show body bag action on non-awake units

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:36 -05:00