Mike-MF
f6eb30ec08
Fix build failure, add stringtable entries.
2023-09-22 18:39:55 +01:00
Mike-MF
459f884564
Merge branch 'master' into coldHeartedOrb
2023-09-22 18:20:38 +01:00
Grim
0ba67ea173
Optics - Add items to new vanilla rails ( #9410 )
2023-09-22 18:10:22 +02:00
PabstMirror
0b695be841
Laserpointer - Block switching to unsupported visible lasers ( #9416 )
2023-09-22 18:09:46 +02:00
Will/KJW
51e6134b71
Grenades - Improve flashbang sound ( #9415 )
2023-09-22 18:08:34 +02:00
Mike-MF
5eab95d984
Casings - Add Western Sahara Casings ( #9417 )
...
* Add WS Casings
* Minor formatting fix
2023-09-22 12:03:07 -04:00
Jasper
6f58830603
Common - Add lockInventory status effect ( #9402 )
...
Add lockInventory status effect
2023-09-22 12:02:09 -04:00
johnb432
11664b0040
Dragging - Improve featureCamera
handling ( #9389 )
...
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Different approach
* Updated to new script_component
* fix variable lookup
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-19 23:56:20 -04:00
Grim
37be6130f2
RHS Compat - Readd basic 5.56 suppressor to 5.56 muzzle slot ( #9412 )
...
bleh
2023-09-19 23:13:38 -04:00
Grim
bd4d1a7a50
IR Lights - Fix visible pointers for DBAL ( #9414 )
...
* fix dbal visible pointer
* fix dbal visible pointer
* remove unused macro
* tweak numbers, move define to single file
* change max range
2023-09-19 22:55:15 +02:00
Grim
b84a84c0ff
Laser Pointer - Use engine method for visible lasers ( #9411 )
...
* initial commit
* tweak numbers
* nuke framework
* cleanup JR
2023-09-19 15:29:13 -04:00
BaerMitUmlaut
18739c23ce
Misc - Add workshop images source files ( #9405 )
...
* Add workshop images source files
* Use white logo with dark themes
2023-09-19 07:15:22 +02:00
johnb432
748f9aff31
Dragging - Enabled dragging whilst limping ( #9379 )
...
Enabled dragging whilst limping
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-18 22:43:10 -04:00
BaerMitUmlaut
ad5d351474
Docs - Fix IR Lights docs ( #9404 )
2023-09-17 21:45:25 +02:00
BaerMitUmlaut
1fd47237d8
Docs - Fix missing sitting property in docs ( #9403 )
...
Fix missing sitting property in docs
2023-09-17 12:43:40 +02:00
BaerMitUmlaut
d6faac5881
Add IR Flashlights ( #6563 )
...
* Initial IR flashlight tests
* More experiments
* Rewrite using engine IR lights
* Rework ranges, fix bugs, add docs
* Fix uncommented DISABLE_COMPILE_CACHE
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Use baseWeapon instead of custom property
* Add baseWeapon to SPIR
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-17 09:32:39 +02:00
johnb432
a0dd4400e6
Cargo - Fix/Improve FUNC(paradropItem) ( #9399 )
...
paradropItem fixes
2023-09-14 17:54:06 -04:00
Grim
f7b520b56b
Markers - Fix issues with custom channels ( #9383 )
2023-09-13 05:05:42 +02:00
johnb432
7a3e5dd3e0
Dragging - Add config support for weight ignoring ( #9396 )
...
* Update fnc_initObject.sqf
* Update dragging-framework.md
2023-09-12 18:57:55 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp
includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
PabstMirror
a34d9455d2
Tools - Update setup.py for hemmt dev
filepatching ( #9231 )
...
* Update setup.py
* Update setup.py
2023-09-12 13:47:21 -05:00
jonpas
7cbdb7f410
General - Use subcomponent macro (CBA 3.16.0) ( #9375 )
2023-09-12 20:40:38 +02:00
PabstMirror
ebef82d10b
Tools - Fix make.py failing when pboProject\Settings folder missing ( #9393 )
2023-09-12 13:04:26 -05:00
Pepijn Holster
ea783b6c7a
Advanced Ballistics - Fix _mapSize
sometimes 0 by using engine command ( #9394 )
...
Update fnc_initializeTerrainExtension.sqf
2023-09-12 13:04:06 -05:00
johnb432
119702a189
Zeus - Fix Group Side module ( #9388 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-12 17:41:38 +02:00
Krzyciu
4a12f61352
Translations - Add Polish Translations ( #9391 )
...
Translation - Add Polish Translation
When merged this pull request will:
Add Missing Polish Translations
Fix Spelling in existing translations
2023-09-11 21:33:48 -05:00
PabstMirror
07ab8751a6
XM157 - Fix spin drift offset when using advanced ballistics ( #9392 )
...
xm157 - Fix spin drift calc when using ab
2023-09-11 20:44:25 -05:00
Nilia119
4ce6fcb3cc
Translation - Add German Translation ( #9390 )
...
Added German Translation
2023-09-11 20:37:20 -05:00
johnb432
5b1491278d
Dragging - Fix for #9385 ( #9387 )
2023-09-11 14:29:56 +02:00
Grim
de8940af9b
Medical Treatment - Add setting to rollover bandage effectiveness ( #8426 )
...
* use leftover bandage effectiveness on other wounds in same limb
variable naming
* Comments
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
* variable naming, fix part index check in findMostEffectiveWound
trace 4
* fix function header
* Account for multiple wounds in time calculation
* fix trace, remove systemChat
* update for hashmaps
* compile cache
* Update addons/medical_treatment/functions/fnc_findMostEffectiveWounds.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* add bandage effectiveness setting
* stupid
* remove limit on bandageRemaining
* Update addons/medical_treatment/functions/fnc_bandageLocal.sqf
Co-authored-by: BrettMayson <brett@mayson.io>
* Update fnc_getBandageTime.sqf
* Update fnc_bandageLocal.sqf
* fix header / debug
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-10 02:06:15 -04:00
jonpas
f7e247c87e
Misc - Add more workshop logos, Update README.md ( #9377 )
...
* Assets - Move and add more workshop logos
New workshop logos by @BaerMitUmlaut
* Use png logo in README.md
Better looking for both dark and light themes
* Update testing and building instructions in README.md
2023-09-09 19:20:42 -05:00
PabstMirror
29ba42bfb5
Markers - Don't try to move poly-line markers ( #9381 )
2023-09-09 16:29:57 -05:00
Grim
56e905ab7a
Fire - Fix macro ( #9376 )
...
Update fnc_burnReaction.sqf
2023-09-09 02:24:41 -04:00
Broström.A | Evul
eaea6f29b8
Medical - Add setting to drop weapon on unconsciousness ( #8433 )
...
* added chance of dropping weapon on unconsciousness
* Moved throwWeapon to common
* Fixed spelling error
* wording changes
* typo
* fix usgae in burn reaction
* Update addons/medical_status/stringtable.xml
* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf
* Update addons/medical_status/stringtable.xml
* move condition
* derp
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-09 02:17:24 -04:00
Grim
81daaba3ea
Docs - Add note in documentation regarding medical internal variables ( #9373 )
...
* add note in documentation
* Update docs/wiki/framework/medical-framework.md
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update medical-framework.md
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-09 00:21:00 -04:00
Grim
dbd5fbaf31
Medical - Add internal variable for wake-up timer and stable blood volume ( #9374 )
...
* Medical - Allow changing SPONTANEOUS_WAKE_UP_INTERVAL via var
* add variable for minimum blood volume
* change variable name
* update pain comment
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-09 00:15:43 -04:00
PabstMirror
f644e7516c
Compats - Make rest of compats auto load if mod present ( #9372 )
...
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-08 16:57:33 +02:00
PabstMirror
c163d6d53a
Laserpointer - Block laser attachments if setting disabled (CBA 3.16.0) ( #9346 )
...
* Laserpointer - Block laser attachements if setting disabled
req https://github.com/CBATeam/CBA_A3/pull/1595
* Apply suggestions from code review
* Update addons/main/script_mod.hpp
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-07 14:05:24 -05:00
Grim
017e097ac4
Advanced Fatigue - Fix metabolic cost mass multiplier for walking ( #9368 )
...
4 -> 2
2023-09-07 00:42:33 -04:00
PabstMirror
be4f7147d9
Update include\script_xeh.hpp ( #9370 )
...
Update script_xeh.hpp
2023-09-06 23:07:45 -05:00
Grim
c2ab5a24bc
Night Vision - Change Apex and Wide NVGs to Gen 4 ( #9369 )
...
make Apex and Wide NVGs gen 4
2023-09-06 20:44:30 -04:00
PabstMirror
25b8fd6d54
Medical AI - Add setting to require items for treatment ( #9362 )
...
* Medical AI - Add setting to require items for treatment
* all ivs
* invert setting
* Update addons/medical_ai/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* move item hash to preStart
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:37:26 -04:00
Grim
f75d237d47
Tagging - Fix tagModel not being utilized for custom tags ( #9366 )
...
fix tagModel
2023-09-06 12:20:04 -04:00
jonpas
576e6b7d55
Compat WS - Add No Uniform Restrictions subconfig ( #9365 )
...
* Compat WS - Add No Uniform Restrictions subconfig
* Update addons/compat_ws/compat_ws_nouniformrestrictions/config.cpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:03:20 -04:00
Grim
99c7bea6fe
Compat GM - Make compat autoload when mod is present ( #9364 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-06 02:33:13 +02:00
PabstMirror
9d745da465
Compats - Use 2.14 skipWhenMissingDependencies
( #9363 )
2023-09-06 02:32:44 +02:00
Grim
aa107ed517
Medical - Add treating with items from vehicle inventory ( #9286 )
...
* allow pulling items from vehicle inventory
* use vehicle items first
2023-09-05 11:20:56 -03:00
jonpas
938f421ac3
AI - Add automatic NVG equip/unequip ( #9313 )
...
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-05 16:20:06 +02:00
Mike-MF
5417a18d7f
Compat WS - Make compat auto load if DLC is present ( #9205 )
2023-09-05 16:19:09 +02:00
Grim
88e0c8f27b
Common - Improve FUNC(removeSpecificMagazine)
with 2.14 changes ( #9227 )
2023-09-05 16:14:42 +02:00