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
14,904 Commits 73 Branches 88 Tags 752 MiB
537487522f
Commit Graph

12169 Commits

Author SHA1 Message Date
Assanali Mukhanov
537487522f
Compat SOG - Add barrel swap for MGs and belt linking for drum magazines (#9439) 
* Add barrel swap support to SOG MGs

* Set SOG MG drum mags as belts, allow belt linking

* Remove tracer mag configs

Since they inherit from the "normal" magazines, these config entries, indeed, seem pointless.

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

* Remove barrel swap from RPD and M1918

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-28 15:20:46 -04:00
Grim
8e464744a1
Medical - Increase pain from bullet-inflicted bruises (#9438) 
increase bruise pain
 2023-09-28 15:17:42 -04:00
Krzyciu
08d0bd09c4
Translations - Add Polish Translations (#9437) 
* Translations - Add Polish Translations

When merged this pull request will:

**When merged this pull request will:**
- Add missing polish translations
- Fix spelling in existing translations

### IMPORTANT

- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.

* Update stringtable.xml

---------
 2023-09-27 13:54:12 -05:00
Psycool
94ceed201c
Korean translation Updated (#9436) 
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated
 2023-09-27 13:28:04 -05:00
Björn Dahlgren
5d2c6eb948
Medical GUI - Fix cross_grave.paa building with pboProject (#9435) 2023-09-26 17:01:39 +02: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
cf4fe835c3
Repair - Fix adding actions for hitpoints with the same name (#9430) 2023-09-25 20:55:23 +02: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
Fabio Schick
11bc2695f5
Captives - Blindfold captive units (#9361) 
* Fixed typo

* Added "Blindfold Captive" interaction

* Changed comment readability as requested

* Better handling of captive goggle replacement

if the capturer's inventory cannot contain the captive's goggles, move them to the captive's inventory, if that also can't fit them, drop them on the ground.

* Removed extra new line

* Make "validBlindfolds" a CBA Setting

* Add remaining localizations

I speak German and Italian fluently and can also infer the proper sentence structure and conjugations in French/Spanish/Portuguese, the other eastern languages are completely foreign to me though and I have to trust Google/DeepL.

* Removed non-verified translations

* Use GVAR(blindfold) config entry

* Remove unused "_state" parameter

* Check if captive isn't already blindfolded before blindfolding

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

* Added "remove blindfold" interaction

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

* Correct Error Message

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

* Optimized duplicate code

* Apply suggestion to fix script_component includes

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-09-24 17:45:43 -04:00
Grim
aee47c9bc6
Medical - Add damage handling for explosive damage while inside vehicles (#9246) 
* Add vehicle explosion handling

* Missing semicolon

* scale armor damage using passthrough

* add - to comment

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

* improve condition

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

* remove extra brackets

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

* remove extra brackets

* fix damage sorting

* whitespace

* comment

* fix function header

* fix infinite armor when no item equipped

* modify condition & handling for vehicle explosion

* add vehiclehit woundHandler

* finalize

* add vehiclehit woundHandler

* finalize

* cleanup

* more cleanup

* name

* randomize hitpoints

* finalize

* don't scale structural damage

* fix undefined var

* remove _i

* fix script error, tone down scaling

* add AVD checks

* Update addons/medical_damage/functions/fnc_woundsHandlerVehiclehit.sqf

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

* nuke AVD crew damage handling

* get rid of aircraft crash lethality compensation

---------

Co-authored-by: James Woods <pterolatypus@gmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-24 15:58:59 -04: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
Mike-MF
6fd24c1455
Compat WS RealisticNames - XMS (#9429) 
* Compat WS - XMS

* add modified original translations

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-24 14:56:04 -04:00
Grim
77a73aee71
Backpacks - Add extra condition for backpack checking (#9428) 
Update fnc_isBackpack.sqf
 2023-09-24 12:06:20 -05:00
Grim
bf6dc5a7a1
Backpacks - Code cleanup (#9409) 
backpacks
 2023-09-24 00:13:33 -04:00
PabstMirror
0d9bcdd708
Nightvision - Fix detecting if vehicle's turret has NVGs (#9421) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-09-23 21:00:04 +02:00
PabstMirror
bd0dfe4b30
compat rhs - fix SUBCSTRING and check_strings.py (#9424) 2023-09-23 12:40:48 -05:00
Mike-MF
b4940e6fa3
Cargo - Improve cargo space values (#9418) 
Alter Cargo values
 2023-09-23 13:08:28 -04:00
Mike-MF
ab6dd0164e
Compat WS - Realistic Names (#9419) 
* Compat WS - Realistic Names

* use cba subcstring

* cleanup python

* Update script_macros_common.hpp

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-23 13:07:52 -04:00
Grim
da60a1b39d
Medical Engine - Improve damage calculation for explosive-resistant armor (#9216) 
* scale armor damage using passthrough

* add - to comment

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

* improve condition

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

* remove extra brackets

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

* remove extra brackets

* fix damage sorting

* whitespace

* comment

* fix function header

* fix infinite armor when no item equipped

* cleanup

* more cleanup

* name

* don't scale structural damage

* add setting

* fix key name

* add cap to passThrough

* fix script error in setting

---------

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-09-23 13:07:06 -04:00
Grim
ec96cdf12c
Medical Treatment - Fix clearing trauma after stitch with multiple wounds (#9420) 
fix clear trauma on stitch
 2023-09-23 12:59:10 -04:00
PabstMirror
d8eb97f4ec
Tools - Fix configs for hemtt1.9.0 (#9423) 2023-09-23 11:37:41 -05: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
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
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
jonpas
7cbdb7f410
General - Use subcomponent macro (CBA 3.16.0) (#9375) 2023-09-12 20:40:38 +02: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
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
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