Commit Graph

15148 Commits

Author SHA1 Message Date
Grim
ef9195f21a
Fix hellfire script error (#9764) 2024-02-04 15:12:13 -03:00
BrettMayson
1e404cf85b
General - SQF Improvements (#9698)
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-02-04 14:50:24 -03:00
johnb432
8d6555ad0f
Arsenal - Make face tab adhere to mod icon setting (#9763) 2024-02-04 14:45:23 -03:00
Joko
2a6fd19762
Cookoff - Improve ammo detonation sounds (#5327)
* initital commit

* use Define for SOS

* fix some issues that got introduced in 1.70

* Prepare config for sounds

* add New Sounds 

improve distanced volume values

* add LAxemann to Author

* add Object Pooling

improve Distances

* fix small mistake

* change pool clearing timing

* change pool wait time

* fix Cookoff sound cleanup

* change to Jonpas Method

change random Distance add

* improve sound Volume over Distance (asked by Bux)

improve mid sounds

* improve a calculation

* Use playSound3D locally

* Make sounds configurable by 3rd party mods

* Added comments, used macros

* Update CfgSounds.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-04 01:36:59 -08:00
Grim
7696d9aa2e
Cargo - Fix object lock when failling to load a carried object (#9759) 2024-02-04 06:09:15 -03:00
Apricot
a97a8dbb73
Translations - Improve/Add Japanese localization (#9760) 2024-02-04 05:57:39 -03:00
johnb432
6ba46ffa90
Map Tools - Code cleanup (#9750)
* Maptools cleanup

* Changed conditions to check

* Minor cleanup + fix
2024-02-03 10:48:21 -08:00
PabstMirror
c150d923f7
Map Tools - Fix tools showing after item is dropped out of inventory (#9749)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-22 19:44:57 -03:00
Grim
7bc3fab533
Medical - Fix getting no pulse on a dead patient receiving CPR (#9756)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-01-22 19:44:42 -03:00
Grim
4470b1f341
Cargo - Show item and vehicle in progress bar text (#9747)
* improve cargo progress bar text

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
2024-01-22 16:41:46 -06:00
PabstMirror
7e255bf05b
Tools - Fix header arg types (#9752)
Fix header arg types
2024-01-22 16:33:30 -06:00
Mike-MF
d8961c68d6
Add CUP Units Compatibility (#9649) 2024-01-20 22:29:40 +01:00
PabstMirror
4756bb6f8c Prepare 3.16.3 Build 79 2024-01-17 09:27:10 -06:00
johnb432
824679e40a
Common - Fixed status effects (#9741) 2024-01-16 16:20:40 -03:00
PabstMirror
8a2196417f Prepare 3.16.2 Build 78 2024-01-16 09:38:54 -06:00
PabstMirror
f2984b6fdb Merge branch 'master' into release-3.16.2 2024-01-16 09:38:25 -06:00
Grim
42e2e08c2b
Common - Add JIP support to status effects (#9740)
* add JIP support to status effects

* fix TRACE

* typo
2024-01-16 09:37:57 -06:00
johnb432
b02d95cb91
Arsenal - Fixed stats & actions appearing when they shouldn't be (#9737) 2024-01-16 12:30:27 -03:00
PabstMirror
ddc80dfaff Prepare 3.16.2 Build 77 2024-01-16 09:18:20 -06:00
PabstMirror
ef24ca8b99 Merge branch 'master' into release-3.16.2 2024-01-16 09:17:59 -06:00
PabstMirror
edf627ce51
Dragging - Add logging for claimSafe failure (#9739) 2024-01-16 09:16:51 -06:00
Grim
9eb7e83e59
Medical Engine - Don't skip hdbracket ever (#9738) 2024-01-15 23:41:26 -03:00
johnb432
5903e561a9
Arsenal - Add thermal vision support to scopes vision mode stat (#9736) 2024-01-15 19:40:36 -03:00
Grim
cb08a7c172
General - Change UAV unit config lookups to unitIsUAV (#9735)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:39:28 -03:00
Grim
03c7c4e97f
Cookoff - Minor improvement to Fire integration (#8751)
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-14 20:53:33 +00:00
BrettMayson
686c252beb
View Restriction - Handle thirdPersonView difficulty setting correctly (#9734) 2024-01-14 17:49:06 -03:00
Grim
a684e874fb
Medical Engine - Exit early if incoming damage is 0 (#9733) 2024-01-14 15:16:55 -03:00
BrettMayson
caa4018623
Marker Flags - Reduce mass (#9731) 2024-01-13 22:26:43 -03:00
Grim
8bc5f513b4
Dragging - Prevent multiple units carrying the same object (#9730)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-13 13:39:39 -03:00
Grim
676a4b97a6
Add documentation for Medical Vehicles & Facilities (#9724)
* add doc on medical facilities and vehicles

* fix typo

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

* Update docs/wiki/framework/medical-treatment-framework.md

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-13 11:44:21 -03:00
Apricot
a5da6cc83d
Translations - Fix Japanese NVG localization just one typo. (#9727)
nvg 4th typo 3rd hotfix

4th gen nvg shows 3rd gen nvg at japanese
2024-01-09 15:16:36 -06:00
Psycool
1243f87718
Korean translation updated (#9726)
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-01-09 01:15:11 -06:00
Apricot
c296f1c074
Translations - Improve/Add Japanese localization. (#9721)
* maptools, markers, overheating

change/add strings to maptools for plotting board.
change/add strings to markers for milliseconds
add strings to overheating for stat bolt type and barrel type description

* Plotting Board "to" wording

* Polylines to line (More natural expressions in Japanese)

* Edit map and marker words

fix some wrong description

* zeus mine

* marker flag

* fcs ajust wording

* paint spray to spray paint

* Weapon display name improves

change "hex" katakana to kanji ヘックス>六角形 vanilla used kanji
Add camo to camo names using what camo (camo > ldf camo)
Nightforce NXS and M200 now using same name for jungle/tropic camo description.

* NVG Wrong GEN and missing WP

* Match NVG name to Arma3 default
2024-01-09 01:03:23 -06:00
Apricot
6018444439
Map Tools - Fix wrong Plotting Board strings targets (#9723)
* Change wrong CSTRING target

descriptionShort = CSTRING(Description);
to
descriptionShort = CSTRING(PlottingBoard_Description);

* change action name to "ToMapToolLabel"

displayName = CSTRING(Name);
to
displayName = CSTRING(ToMapToolLabel);
2024-01-08 19:53:25 -06:00
PabstMirror
7d8e34a536 Prepare 3.16.2 Build 76 2024-01-08 01:02:42 -06:00
PabstMirror
4924ea64aa Merge branch 'master' into release-3.16.2 2024-01-08 01:01:46 -06:00
Grim
e9cb2740e8
Ballistics - Respect Advanced Ballistics settings for displaying muzzle velocities (#9682)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-07 20:13:46 -03:00
Drofseh
b58807088a
Overheating - Add stats to arsenal (#9719)
* Overheating - Add Bolt Type stat to arsenal

* Add stat for barrel swapping

* Update addons/overheating/ACE_Arsenal_Stats.hpp

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

* Update addons/overheating/functions/fnc_statTextStatement_allowSwapBarrel.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-01-07 17:04:10 -06:00
johnb432
474ecdd93b
Markers - Add true milliseconds as a timestamp option (#9690)
* Added real milliseconds to marker timestamp options

* Fixed tabs

* portuguese translation

* Update fnc_onButtonClickConfirm.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-01-07 10:26:10 -08:00
Daniël
1563eb9336
Markers - Add the option for UTC/System time timestamps (#9121)
* Markers - Add setting for system timestamps

* Moved time zone to different setting
Added UTC Time zone
Added UTC time offset slider
Added translation in stringtable

* Update fnc_onButtonClickConfirm.sqf

Fixed mistake that added offset twice

* - Removed tabs
- Fixed calculating error

* - Fixed tab problem

Was a bit enthusiastic with removing tabs. This should to the trick.

* - Changed tabs to spaces (Finaly)
- Checked SQF with sqf_validator.py
- Fixed decimal error by CBA menu

* Delete build/_deps directory

- This does not belong here

* Update fnc_onButtonClickConfirm.sqf

Added empty line back

* Update addons/markers/functions/fnc_onButtonClickConfirm.sqf

Formatting update

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

* Update addons/markers/functions/fnc_onButtonClickConfirm.sqf

Formatting update

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

* Update initSettings.sqf

Added newline at end of file

* Update fnc_onButtonClickConfirm.sqf

Fixed fnc header formatting

* Update addons/markers/functions/fnc_onButtonClickConfirm.sqf

Formatting

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

* Update fnc_onButtonClickConfirm.sqf

Updated formatting

* Implemented review changes

* Review suggestion

* Bugfix return absolute positive number with modulo

* Updated script to allow offset to exeed midnight in the past

* Updated script to allow offset to exeed midnight in the past

* Updated script to allow offset to exeed midnight in the past

* Updated hour offset calculation

* Add support for UTC+13 and +14 timezone

* Add minutes UTC offset to timestamp

* Add UTC minutes offset setting

* Add translation for UTC minute offset setting

* Prevent timestamp going over 24 after adding minutes offset

* Modify english description for offset settings

* Update addons/markers/initSettings.sqf

* Properly handle minute offset with negative timezone

* Implemented better solution to handle negative timestamp seconds offset

* reverted 'Implemented better solution to handle negative timestamp seconds offset'

* Revert "Implemented better solution to handle negative timestamp seconds offset"

This reverts commit d2599bd9aa.

* Update timestamp calculation comments

* Update timestamp calculation comments

* Update documentation in UTC timestamp calculation

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-07 10:06:35 -08:00
johnb432
79c43179ea
Map Tools - Add Plotting Board (#9653)
* Initial Commit to unfuck whatever I fucked in Git.

* Update initSettings.sqf and stringtable.xml

* Implements stringtable.xml suggestion

* Fixes for plotting board

* Update addons/maptools/functions/fnc_handleMouseButton.sqf

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

* Update addons/maptools/CfgWeapons.hpp

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

* Update addons/maptools/XEH_postInitClient.sqf

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

* Update addons/maptools/XEH_postInitClient.sqf

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

* Cleanup

* Redid calculations

* Updated docs

* More updated docs

* Update maptools.md

* Fix error and warning

---------

Co-authored-by: LorenLuke <LukeLLL@aol.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-01-07 10:02:05 -08:00
johnb432
2a2efbb73a
Common - Add keycombo support for FUNC(disableUserInput) (#9659)
* Add keycombo support for disableUserInput

* Update addons/common/functions/fnc_disableUserInput.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2024-01-07 09:59:38 -08:00
Grim
bb28df0cbd
Arsenal - Add JIP support to Default Loadouts added mid-mission (#9715) 2024-01-06 18:27:04 -03:00
johnb432
7f998c3234
Inventory - Improve multiple aspects (#9706)
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-01-06 18:26:46 -03:00
Grim
bed8844b74
Field Manual - Fix Fortify Tool & Body Bag entries (#9712)
* fix fortify tool field manual entry

* fix body bag medical menu

* fix medical menu keybind in translations
2024-01-03 21:24:58 -03:00
johnb432
dababe84b9
Captives - Add listenable event handler for escorting (#9709)
Added escorting EH
2024-01-02 18:50:29 -03:00
johnb432
38684890eb
Medical - Disable AI twitching when unconscious (#9708)
Disable AI twitching when unconscious
2024-01-02 18:49:39 -03:00
Grim
b10c68405a
Arsenal - Fix wrong animation upon opening the arsenal in VR while empty-handed (#9707)
fix vr arsenal anim when empty-handed
2024-01-01 23:51:57 -03:00
johnb432
0f08ba2fdc
Arsenal - Fix animations not playing properly (#9705)
* Make arsenal animations play properly

* Update addons/arsenal/functions/fnc_showItem.sqf

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

* Moved to common

* Update CfgMoves.hpp

* move to function, add reload safeguard

* selectWeapon immediately

* open left panel on current weapon

* VR mission poses + fix removing vests

* cAsInG

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-01-01 14:22:53 -08:00
Grim
aedb5169d3
Inventory - Fix item lockup when dragging into same inventory (#9697)
* fix rope filtering

* loop

* var declaration begone

* count -> forEach

* LINKFUNC

* remove lbValue change

* handle other file extensions

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-01-01 13:36:45 -08:00