mharis001
58a0cd860b
Common - Add isNotUnconscious canInteractWith condition
2020-02-22 17:07:32 -05:00
Elgin675
d63c7685b4
Update French Translations ( #7440 )
2020-02-22 22:15:28 +01:00
PabstMirror
1ee2e6adb2
Arsenal - Filter non-scope 2 mags from being auto-added ( #7445 )
2020-02-22 22:15:09 +01:00
jonpas
f6dda745c2
Medical - Combine advancedBandages and woundReopening settings ( #7392 )
...
* Medical - Combine advancedBandages and woundReopening settings
* Improve German translation
Co-Authored-By: Jo David <github@jonathandavid.de>
* restore strings lost in merge
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-22 22:09:56 +01:00
Sycholic
d5f8f93a9a
Mine Detector - Updated mine detector audio from -20db to -2db ( #7460 )
2020-02-22 22:09:10 +01:00
mharis001
d7f12eb49a
Medical - Use percentage sliders for chance settings ( #7542 )
2020-02-22 21:57:04 +01:00
padddyyy
056560e798
Update German Translations ( #7469 )
2020-02-22 21:53:35 +01:00
Filip Maciejewski
46e4f7c6ec
Medical Damage - Improve description of "DamageThreshold" ( #7436 )
2020-02-22 21:48:40 +01:00
10Dozen
b30f023c04
Adds Icon option for Low blood volume at Medical Feedback ( #7507 )
...
* Adds Icon option for Low blood volume at Medical Feedback
- Adds setting to switch Low blood volume effect with 3 options: Color fading, Icon, Color fading + Icon
- Adds icon to UI on low blood
- Adds icon PAA files
* Review fixes
- Added ACE tags to added controls
- Added defines for GUI position/size
- Added missing newline at EOF
- Updated fnc_effectBloodVolumeIcon (removed usage of uiNamespace and minor changes)
- CBA_fnc_addSetting is now used to init settings
- Icon path macro updated to return formatted path
* Review fixes vol.2
- Removed `disableSerialization` and added default value for indicator control and not null checks to effectBVI function
- Removed defines from RscInGameUI and used a3 defines instead
- Changed formatting of macroses
* Review fixes vol.3
- Fixed exec code of BV setting
- Removed ctrlCommit from eBVI function
- Changed initEffects function to be able to update pain and BV effects only
- Changed control name from `BloodVolumeInfoIndicator` to `bloodVolumeIndicator`
- Various formatting tweaks (spaces/lines/uppercase/periods)
* Review fixed vol.4
- Remove extra checks from eBVI func
- Restores contol's onLoad script using ARR_2(QQGVAR())
2020-02-22 14:42:59 -06:00
diwako
bd040ca19d
Medical - Fix being stuck in unconscious animation after ragdoll ( #7499 )
2020-02-22 21:39:14 +01:00
BaerMitUmlaut
3bc727f960
Grenades - Make flashbang reaction more authentic ( #6034 )
2020-02-22 21:36:25 +01:00
commy2
af777a40db
Merge pull request #7497 from Whigital/csw_mags_zeus
...
CSW - Minor fixes for CSW + RHS Compats
2020-02-22 21:33:00 +01:00
mharis001
a7bd05ddd3
Medical - Add fracture chance setting ( #7396 )
2020-02-22 21:31:14 +01:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit ( #7529 )
2020-02-22 21:24:47 +01:00
Laid3acK
e1f6db8a69
Ballistics - B_93x64_Ball updated ( #7474 )
...
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
* 93x64_svdk
2020-02-22 14:15:39 -06:00
Brandon Danyluk
5172e7717c
fix static weapon ammo check ( #7541 )
...
For some reason ARMA never returns any muzzle for crewed/non crewed static weapons. Work around this by always returning whatever weapon the static weapon has no matter what
2020-02-22 14:09:15 -06:00
Rutger "RedBery" Meijering
d6753250d1
Fixes typo in splint comparison ( #7518 )
2020-02-22 14:09:04 -06:00
commy2
1758b66ac0
Merge pull request #7538 from NMAUS2019/master
...
Use macros
2020-02-21 14:20:55 +01:00
NMAUS2019
93bd7f2e00
Use macros
...
Use the defined macros
2020-02-21 16:28:20 +11:00
commy2
9e2a2f2f01
Merge pull request #7536 from acemod/fix-fastrope-deployAI
...
Fastroping - Fix deployAI not unwinding ropes
2020-02-20 18:11:01 +01:00
mharis001
e2725e52ec
Add check for empty _ropeClass
...
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2020-02-20 00:48:03 -05:00
mharis001
2dcbf2ba26
Fastroping - Fix deployAI not unwinding ropes
2020-02-20 00:28:57 -05:00
commy2
c73f64617f
Merge pull request #7523 from Whigital/isnil_conformity
...
Various - Conform isNil checks across the codebase
2020-02-19 18:09:05 +01:00
PabstMirror
c44360bd19
Medical - Unlock air controls when going uncon ( #7533 )
...
* Medical - Unlock air controlls when going uncon
* remove unneeded parentheses
* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-02-19 10:05:05 -06:00
Dedmen Miller
e0d4583be9
Don't mark help wanted as stale ( #7535 )
2020-02-18 12:15:42 +00:00
commy2
5a4487f1ea
Medical - fix the Enoch pilot uniform not taking damage, fix hitpoints test ( #7527 )
...
* fix the medical hitpoints test
* fix the Enoch pilot
* readd optional test for all units
* Run test at preStart
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-16 18:34:46 -06:00
commy2
85709d51b3
Merge pull request #7443 from acemod/hitreactions_throwWeapon
...
add function to throw current weapon
2020-02-14 00:28:57 +01:00
commy2
d6c26eb89d
macro for throw angle
2020-02-14 00:27:01 +01:00
commy2
2d071f459f
macro for lateral offset
2020-02-13 23:47:59 +01:00
commy2
0572ead9ca
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
...
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-02-13 23:15:41 +01:00
commy2
0fc3cb0201
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
...
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-02-13 23:15:28 +01:00
Whigital
78d79f2761
More excessive brackets
2020-02-13 17:16:35 +01:00
Whigital
6244975316
Remove extraneous whitespaces
...
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-02-13 10:33:31 +01:00
Whigital
ab7bb11091
Remove excessive brackets
2020-02-12 22:07:57 +01:00
Whigital
8c2f53ac14
Revert quotation on string args
2020-02-12 22:07:19 +01:00
shukari
7c296c96ac
Map - Allow enabling BFT setting after mission start ( #7519 )
...
* Update initSettings.sqf
* Bracjet
* Update XEH_postInitClient.sqf
* Update addons/map/initSettings.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-12 13:27:58 -06:00
Whigital
ce329de784
Fix formatting for BIS evh warning ( #7522 )
2020-02-12 13:26:01 -06:00
Whigital
56ef0c6d65
conform isnil checking: zeus
2020-02-12 17:29:28 +01:00
Whigital
69480998ae
conform isnil checking: tagging
2020-02-12 17:29:24 +01:00
Whigital
275b5edd95
conform isnil checking: spectator
2020-02-12 17:29:21 +01:00
Whigital
a24c3d52ad
conform isnil checking: scopes
2020-02-12 17:29:17 +01:00
Whigital
6a8c9f0ea8
conform isnil checking: respawn
2020-02-12 17:29:13 +01:00
Whigital
1872b06235
conform isnil checking: repair
2020-02-12 17:29:08 +01:00
Whigital
22c44629f7
conform isnil checking: rearm
2020-02-12 17:29:04 +01:00
Whigital
84649c8c8d
conform isnil checking: overpressure
2020-02-12 17:29:00 +01:00
Whigital
b5a0908824
conform isnil checking: modules
2020-02-12 17:28:56 +01:00
Whigital
0439cd8738
conform isnil checking: medical_treatment
2020-02-12 17:28:49 +01:00
Whigital
dbd6f39794
conform isnil checking: medical_feedback
2020-02-12 17:28:46 +01:00
Whigital
7fe5401f6a
conform isnil checking: laser
2020-02-12 17:28:41 +01:00
Whigital
1def9cbcb7
conform isnil checking: interact_menu
2020-02-12 17:28:33 +01:00
