Commit Graph

13943 Commits

Author SHA1 Message Date
commy2
f8fbc6988f
Merge pull request #7557 from Laid3acK/dispersion_removed
Ballistics - Remove dispersion changes
2020-02-28 17:45:54 +01:00
Laid3acK
1d9361c503
fix_brace 2020-02-28 11:08:40 +01:00
Laid3acK
4a6d32774e
space_atragmx_initgunlist 2020-02-28 10:13:59 +01:00
Laid3acK
09332d333f
polish_atragmx_initgunlist 2020-02-28 10:11:07 +01:00
Laid3acK
3a3e0c53a0
dispersion_removed 2020-02-28 10:09:06 +01:00
Laid3acK
02b7b6d2c3
dispersion_removed 2020-02-28 10:02:51 +01:00
Laid3acK
06f2c8e1d5
Pistol_Base_F_cleanup 2020-02-28 09:42:31 +01:00
Laid3acK
a1adf73d4b
Rifle_Short_Base_F_cleanup 2020-02-28 09:12:26 +01:00
Laid3acK
85a5e5ab8c
rifle_base_cleanup 2020-02-28 08:21:30 +01:00
Laid3acK
b64d988aa8
Rifle_Base_MX variants 2020-02-27 19:11:50 +01:00
Laid3acK
0a5f87df8c
Rifle_Long_Base_Sniper_Marksman 2020-02-27 17:30:04 +01:00
Laid3acK
f9674b3ef9
realisticdispersion 2020-02-27 06:17:15 +01:00
Laid3acK
8be0a8b1ca
dispersion_removed 2020-02-25 15:02:39 +01:00
Laid3acK
957df3b2d0
Wiki - Remove requirements for item usability (#7555) 2020-02-25 09:47:52 +01:00
PabstMirror
60155f2ab8
NightVision - Fix border missing while in FFV (#7554)
Fix #6769
2020-02-24 12:13:24 -06:00
Elgin675
92a987059c
French translation (#7550)
* French translation: Fracture chance

* French translation: AdvancedBandages_EnabledCanReopen key

* French translation: BloodVolumeEffectType keys
2020-02-23 09:26:51 -06:00
commy2
2715ef954a
Merge pull request #7549 from acemod/clamp-TreatmentAnimationSpeedModifiers
Medical Treatment - Prevent extremely slow or fast animations
2020-02-23 16:10:56 +01:00
commy2
ae7feae433
Merge pull request #7548 from acemod/fix-AimDownSightsBlur
NightVision - Don't apply AimDownSightsBlur on optics with integrated night vision
2020-02-23 16:10:19 +01:00
commy2
9ef5ce8191
Merge pull request #7546 from acemod/fix-MenuClosed-event
Interaction Menu - Fix MenuClosed event may not fire on menu type replacement
2020-02-23 15:16:15 +01:00
commy2
754a9e09af values, simplify 2020-02-23 14:25:11 +01:00
commy2
27ecfc6a5b prevent extremely slow or fast animations 2020-02-23 14:14:11 +01:00
commy2
42f710cdd0 reset effect on magnifaction transition 2020-02-23 13:52:32 +01:00
commy2
f9f1d634ae remove a debug line 2020-02-23 13:32:50 +01:00
commy2
a375e068f7 don't apply AimDownSightsBlur on optics with integrated night vision 2020-02-23 13:29:38 +01:00
commy2
a6373e936d fix MenuClosed event may not fire on menu type replacement 2020-02-23 11:59:14 +01:00
jonpas
7069cb82c9
Documentation - Add spaces between array elements coding guidel… (#7524) 2020-02-23 02:12:15 +01:00
jonpas
3145a31d00
Remove requirements for usable items to be in backpack (#7545) 2020-02-23 02:11:20 +01:00
commy2
f7a880e81b
Merge pull request #7544 from acemod/fix-unconscious-interact
Common - Add isNotUnconscious canInteractWith condition
2020-02-22 23:12:08 +01:00
mharis001
58a0cd860b Common - Add isNotUnconscious canInteractWith condition 2020-02-22 17:07:32 -05:00
jonpas
f6af95b4a1
Arsenal - Optimize non-scope 2 mags filtering (#7543) 2020-02-22 22:26:55 +01: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