Commit Graph

15854 Commits

Author SHA1 Message Date
Fabio Schick
aecafe673b
Aircraft - Drone "Follow Unit" Waypoint Action (#9889)
* Fix "Recharge" interaction showing on destroyed drone

* Add "Follow Unit" action

* Improve condition check

* UGV Following via PFH that updates WP Pos

* Use HOLD WP for all Follow Actions

Since FOLLOW WP would stop working on AI Soldiers after some time.

* Allow selecting a follow distance

* Follow Distance under separate interaction, just like Loiter Alt

Only visible when a HOLD waypoint is selected, which is pretty much always going to have been created by the "Follow" interaction.

* Localize "Follow" Interaction

* Show structuredText Hint when following/changing distance

* Variable for cursorTarget Reuse

* Better isKindOf condition use

* Make "Ship"-kind vehicles followable

* Clean up Comments and systemChat Debugs

* Comment explanation for custom PFH solution over vanilla "Follow"-WP

* Trim excess brackets from setWaypointPosition argument

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

* Broader determination for UGV follow distances

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Prevent infinite PFH loop if follow target is deleted

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Delete Follow WP when PFH terminates

* The ternary rules

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

* Various requested changes

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-07-02 02:16:48 -07:00
johnb432
ba47c12a97
Dogtags - Drop dogtag on ground if unit doesn't have inventory space (#10094)
* Drop dogtag on ground if unit doesn't have inventory space

* Only allow taking of dogtags if unit has space
2024-07-02 02:16:27 -07:00
johnb432
71afce53c1
Dogtags - Make "Dog Tag" consistent (#10099)
Make Dog Tag consistent
2024-07-01 09:56:00 -07:00
johnb432
cb40c8ec5d
Vehicle damage - Add missing documentation (#10093)
Update vehicledamage-framework.md
2024-06-28 10:43:13 -07:00
johnb432
a30afe69b7
Interaction - Disable magazine passing to dead and unconscious units (#10091)
* Disable magazine passing to dead units

* Disable for unconscious units as well
2024-06-28 05:41:04 -07:00
johnb432
bfa23f01db
Refuel - Remove unused variable (#10089)
Update XEH_postInit.sqf
2024-06-26 05:02:19 -07:00
Apricot
ad4af0d553
Translations - Improve Japanese (killtracker/overpressure) (#10088)
killtracker/overpressure
2024-06-25 21:43:24 -05:00
Fabio Schick
b013ab81d5
Translations - Italian and German (#10087)
* Grenades italian+german translation

* Fix english typo in MicroDAGR

* Medical Treatment italian+german translations

* Realisticnames italian+german translations

* Hitreactions italian+german translations

* Fix italian typo in 3 addons

* Cookoff italian+german translations

* Killtracker italian+german translations

* Zeus italian+german translations

* Overpressure italian+german translations

* Compat RF italian+german translations

* Realisticnames Fix italian+german oversight

* Compat WS italian+german translations

* Compat CUP-CSW italian translations

* Compat CUP-NVG italian translations

* Fixup overpressure
2024-06-24 16:44:41 -05:00
PabstMirror
5c8ea65f7c
Common - Update header for addPlayerEH (#10086) 2024-06-23 18:12:30 -05:00
Fabio Schick
bdb6c7c69c
Compat RHS/Hellfire - Use RHS models when loaded (#10076)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-06-23 00:36:41 -03:00
PabstMirror
aed2222b81
Artillery Tables - Support for ammo that has native airFriction (#10059)
* Artillery Tables - Support for ammo that has native `airFriction`

* fix comment

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

* Update addons/artillerytables/functions/fnc_rangeTableOpen.sqf

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

* replace if block with select const

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-22 22:34:34 -05:00
V1nsyara
05d6327e5e
Translation - Update Russian for small features (#10085)
* Translation - Update Russian for new features

* Up to date translate RU
2024-06-22 20:24:00 -05:00
Psycool
c9e82afff7
Korean translation updated (#10077)
* 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

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-06-22 14:47:23 -05:00
johnb432
56016a4816
Vehicle Damage - Add turret tossing again (#9989)
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2024-06-22 15:08:43 -03:00
johnb432
f45dff8a09
Fire - Mini-Rewrite (#9757)
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-22 15:07:36 -03:00
johnb432
f86e882b18
Advanced Fatigue - Various improvements (continuation of #5723) (#9714)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: ulteq <ulteq@web.de>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-06-22 14:53:08 -03:00
johnb432
cd66f495ad
CSW - Improve tripod and weapon disassembly (#9915)
* Add disassembly for tripods when players have occupied launcher slots

* Update fnc_assemble_canDeployWeapon.sqf

* Update fnc_assemble_canPickupWeapon.sqf

* Revert file renaming (see #9777)

* Correct headers

* Update fnc_canPickupTripod.sqf

* Fixed checks and eject dead bodies

* Invert checks
2024-06-22 19:39:36 +02:00
johnb432
1f5044aabd
CSW - Improved weapon attachments handling (#9904) 2024-06-22 14:03:32 -03:00
johnb432
18ea360b1e
Cargo - Add check for invoking ace_cargoAdded EH only if cargo was actually added (#10084)
Only invoke cargoAdded EH if cargo was actually added
2024-06-22 12:18:28 -03:00
johnb432
7ea2aab2c9
Common - Improve PBO checking (#9266)
* Update PBO checking

* Added kicking of clients without ACE loaded

* Update fnc_errorMessage.sqf

* Update fnc_checkVersionNumber.sqf

* More compatibility for #9568

* Cleanup

* Minor cleanup + added server source

* update outdated/not present error message

* check version number fixes

* Update fnc_errorMessage.sqf

* Changed error names

Server is always right, client has either older or newer versions, or missing or additional addons

* Improved ACE detection method

* Tweaks and fixes

* Try another approach

* Update events-framework.md

* Update XEH_postInit.sqf

* Update fnc_checkVersionNumber.sqf

* Removed check for non-ACE clients

* Update XEH_postInit.sqf

* Cleanup

* Remove rogue change

* Improved message display in systemChat

* Update fnc_checkPBOs.sqf

* Removed loop variable initialisers

* Fixed header

* Updated headers

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-06-22 15:52:59 +02:00
PabstMirror
1819cadf0a fix preping some missing files (jdam/doppler) 2024-06-21 19:28:43 -05:00
Cyruz
db6c4a72a6
Cookoff - Fix incorrect parent class in cookoff sounds (#10083)
Fix incorrect parent

Co-authored-by: Cyruz143 <root.cyruz@gmail.com>
2024-06-21 12:06:44 -03:00
bluefield
1439680795
Overpressure - Separate backblast and overpressure range coefficient (#10070)
* feat: separate overpressure and backblast configurations

* documentation: remove undefined return

* typo: trace macro padding

* refactor: add range<number> return

* refactor: reuse return values for overpressure coef

* refactor: reuse return values for backblast coef

* whitespace

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

* headers

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

* feat: change backblast limit to 0

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

* remove: deleted ACE_Settings.hpp

* fix: update postInit.sqf event handler to register new GVARs

* fix: remove `ACE_Settings.hpp`

* typo: add spacing

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

* typo: fix spacing

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

* feat: switch distanceCoef minimun value to 0

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

* typo: update the slider checks with new minimuns

temporary solution until i figure out the EH

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

* feat: new stringable elements

* Update stringtable.xml

* Added translations

* Switched order of settings to match age of settings

* setting require restart, split adding firedEH

* Added notifications about mission restart

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-06-20 22:30:33 +02:00
PabstMirror
ed260fc3a2 cleanup unused var 2024-06-20 13:34:30 -05:00
PabstMirror
2e23f61936 Merge branch 'master' into missile_guidance_rewrite 2024-06-20 13:32:03 -05:00
Kex
c4fb858c1d
Medical - Refactor target blood pressure (#10081)
Refactor target blood pressure
2024-06-20 13:19:14 -05:00
Apricot
5ea202ce25
Compat RF - Improve/Change RF Realistic Name (#10071)
* Update RF Realname Stringtables

Add HEMMT Fire Truck
Change Puma family naming and add missing variation

* typo fix

* Tab to space I hate this

* Update stringtable.xml

Import HEMTT Fire Truck localization from RF
Add "Container" to AMOS. cuz that is not just AMOS...

* Uppercase and add rifle the HERA H6

* add space start of comment

* Add "ASW" to Wildcat AH-11F

For distinction with WY-55(Vanilla Wildcat) and AH-11F (RF Wildcat)

* Remove "Rifle" from H6

Does it really need? Probably not.
2024-06-20 13:01:28 -05:00
Grim
c8be3a4e05
Docs - Clarifiy ! operator usage in Coding Guidelines (#10080)
coding guidelines brackets
2024-06-18 12:26:24 -03:00
Mike-MF
1c6c4d6bff
All - Fix parentheses around code (#10073)
* Fix Brackets around code

* Update fnc_handleFired.sqf

* Shouldn't have changed this one

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-18 14:08:03 +00:00
johnb432
8fc093de8f
Grenades - Code cleanup (#9979)
* Improved various aspects of grenades

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

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

* Update addons/grenades/functions/fnc_incendiary.sqf

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

* Update addons/grenades/functions/fnc_incendiary.sqf

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

* Update fnc_flashbangExplosionEH.sqf

* More cleanup

* Update fnc_incendiary.sqf

* Update fnc_incendiary.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update addons/grenades/functions/fnc_nextMode.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

* Update addons/grenades/functions/fnc_incendiary.sqf

* Removed fix that is included in another PR

* Update fnc_incendiary.sqf

* Messed up merge conflict resolution

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-18 01:05:01 -07:00
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
johnb432
421071027e
Common - Add wheel hitpoint function (#10075)
* Add wheel hitpoint function

* Moved cache to missionNamespace
2024-06-17 10:31:35 -07:00
PabstMirror
c28a3d6cdf
Kill Tracker - Add setting to show kills from vehicle to crew (#10069)
* Kill Tracker - Add setting to show kills from vehicle to crew

* Update addons/killtracker/XEH_postInit.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-16 22:04:40 -05:00
johnb432
f3722bf5e8
Cookoff - Fix engine fire not starting (#10074)
Fix engine fire not starting
2024-06-15 20:59:01 -05:00
Mike-MF
2dc0cd4fc4
Documentation - Remove Hashes from Coding guidelines (#10072)
Remove Hashes from Coding guidelines
2024-06-14 16:21:53 -05:00
johnb432
7a6c837f1b
Headless - Add warning about duplicate loadout validation (#9878)
* Warn users about duplicate loadout validation

* Update XEH_postInit.sqf
2024-06-14 20:02:13 +02:00
johnb432
34362d48eb
Grenades - Fix incendiary grenades damaging invulnerable objects (#10068)
Disable damage from incendiaries when object is invulnerable
2024-06-13 09:49:31 -07:00
PabstMirror
d4d69b9141
Medical Engine - Fix death animation hash keys (#10067) 2024-06-13 14:11:21 +02:00
Mike-MF
690ee55369
Compat CUP Units - Goggles Compatibility (#10065) 2024-06-13 14:10:20 +02:00
PabstMirror
70b0a4c434
Medical - Cleanup refs to hdBracket (#10064) 2024-06-11 14:37:43 -03:00
Grim
59af3e1f6d
General - Change CBA Namespaces to HashMap (#8801)
* medical_treatment

* advanced_throwing

* common, csw

* Update fnc_replaceRegisteredItems.sqf

* Sanitised numerous components

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* FUNC -> LINKFUNC

* Changed tagging hashmap

* Reverted some changes

* Reverted some changes

* Update XEH_clientInit.sqf

* Tweaks and fixes

* Fix number replacements

* Minor cleanup

* Update fnc_getMagazineName.sqf

* Update fnc_getMagazineName.sqf

* Minor improvement

* Made factions case-sensitive and added `toLowerANSI` to be safe

* Update fnc_getDetectedObject.sqf

* Update addons/common/functions/fnc_actionKeysNamesConverted.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Throw error if item doesn't exist

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-11 12:34:32 -03:00
PabstMirror
898daff7f6
General - Cleanup event capitalization (#10062) 2024-06-11 08:00:50 -07:00
johnb432
9760095c42
Grenades - Fix how incendiary grenades do damage to vehicles (#9983)
* Allow incendiary grenades to damage multiple vehicles

Disable incendiaries damaging invulnerable vehicles

* Apply fire damage to vehicles even after grenade detonation

* Update fnc_damageEngineAndWheels.sqf

* Update fnc_incendiary.sqf

* Update fnc_damageEngineAndWheels.sqf

* british people don't exist

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-11 07:59:36 -07:00
Grim
2bd1f39de7
Medical - Add ace_medical_enabled variable for future-proofing API (#9996)
* add ace_medical_enabled setting

* Update addons/medical_engine/XEH_preInit.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-11 11:46:14 -03:00
Grim
a85074a797
Medical Engine - Remove ACE_HDBracket hitpoint (#9732)
* Medical Engine - Remove ACE_HDBracket hitpoint

* skip context 4

* move checks to vars

* skip uav/logic entities

* add check for arm/leg hitpoints

* Update addons/medical_engine/functions/fnc_handleDamage.sqf

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

* don't skip context 2

* clearer custom hitpoint array name

* reenable compile cache

* remove debug mode

* lazy eval

* whitespace

* update comment

* Update fnc_handleDamage.sqf header

* Update addons/medical_engine/functions/fnc_handleDamage.sqf

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

* Update addons/medical_engine/XEH_postInit.sqf

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

* update hitpoint test

* missing "

* Update addons/medical/dev/test_hitpointConfigs.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-06-11 11:11:28 -03:00
Apricot
c862c47617
Translations - Improve Japanese (Mortar and some) (#10061)
Tweaks
2024-06-10 21:29:28 -05:00
V1nsyara
41d6cae93b
Translation - Update Russian for new features (#10060) 2024-06-10 21:28:30 -05:00
Nilia119
d66c3904d0
Translation - Add Missing German (#9975)
* Added Missing German Translation

* Improved German Translation

* Update Medical_treatment

* Update Medical_treatment stringtable.xml

* Update addons/common/stringtable.xml

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/arsenal/stringtable.xml

---------

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
2024-06-09 18:21:36 -05:00
Apricot
46e840b5a2
Translations and Compat - Improve Japanese and CDLC WS/RF localization (#10058)
* Update Japanese

* rename smoke

* Leo2SG

* Rename FAL Para to FAL OSW Para

* Fix wood as woodland in japanese

* change camo to aaf camo in jp

* Rename RF R1 to equalize with WS R1

* Add dedicated name config VRCO-S

* Add stringtable for VRCO-S
2024-06-09 18:21:00 -05:00
PabstMirror
97bc371f5c
Common - Add addPlayerEH for adding EHs to ace_player (#10056)
* Common - Add `addPlayerEH` for adding EHs to ace_player

* Update fnc_addPlayerEH.sqf

* convert ui to use new func
2024-06-09 18:20:39 -05:00