Commit Graph

12366 Commits

Author SHA1 Message Date
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
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
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
Grim
7054d4bb51
Inventory - Fix filtering for items without file extension in picture property (#9696)
* fix rope filtering

* loop

* var declaration begone

* count -> forEach

* Update XEH_preStart.sqf
2024-01-01 13:35:44 -08:00
johnb432
8ca5263f18
Common - Make FUNC(isModLoaded) case-insensitive (#9704)
* Update fnc_isModLoaded.sqf

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

* Update fnc_isModLoaded.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-31 17:45:01 -08:00
johnb432
f063c4404a
Reload - Disable 'Check Ammo' self interaction when unarmed (#9703)
Update fnc_canCheckAmmoSelf.sqf
2023-12-31 17:00:22 -03:00
Kentaro Hayashida
1ed27288e8
Markers - Fix logic error when selecting channel (#9702)
* Fix logic error when selecting channel

* remove lookup

* Update fnc_onLBSelChangedChannel.sqf

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-12-31 10:27:43 -03:00
johnb432
cb554a3ea7
Arsenal - Fix unique item edge cases and prevent increasing quantity of cargo weapons (#9700)
* Unique weapons fix

* Update fnc_fillRightPanel.sqf

* Update fnc_updateUniqueItemsList.sqf

* Added unique facewear support
2023-12-31 05:14:17 -08:00
Grim
449265c830
Arsenal - Fix cargo backpacks not being shown in right panel (#9701)
* fix backpacks in right panel

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf
2023-12-31 10:10:23 -03:00
Grim
106c09495f
Arsenal - Use canAdd to check if item can be added to container (#9699)
* switch to canAdd instead of mass check

* cache lookup begone

* mass begone

* compile cache

* remove itemInfo check
2023-12-31 09:01:04 -03:00
Kentaro Hayashida
c3f442ffa7
Markers - Use lbData for channel selection (#9693)
* Change channel based on lbData instead of index

* Add author
2023-12-30 23:17:22 -03:00
Grim
257ae757be
Arsenal - Allow increasing quantity of left panel items in cargo (#9694)
* Unique items fix

* attachment lookup

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

* container item lookup

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

* allow increasing quantity of misplaced virtual items

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-12-30 22:03:35 -03:00
johnb432
92d199e6ab
Arsenal - Fix displaying virtual items & weapon attachments in cargo (#9692)
* Unique items fix

* attachment lookup

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

* container item lookup

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-12-30 21:30:52 -03:00
Grim
274d853c43
Compat RHS - Fix USAF flashlights materializing PEQ-15s (#9683)
i wish this used CBA attachments...
2023-12-20 14:41:29 -03:00
johnb432
e8c10f905e
Dragging - Minor optimisation (#9679)
Minor optimisation for dragging
2023-12-18 14:02:45 -03:00
Grim
1b6b0aaf0b
Medical - Fix hanging when vehicle crew receive fatal damage (#9681)
* fix undefined var in trace

* fix high damage hang

* update comment

* Update fnc_woundsHandlerVehiclehit.sqf
2023-12-18 14:02:09 -03:00
Psycool
508693f152
Translations - Korean updated (#9678)
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-12 09:44:51 -06:00
Fabio Schick
d70fbd5765
Translations - Complete Italian + almost complete German translation (#9673)
* medical_gui italian translations

* csw italian translations

* interact_menu italian translations

* switchunits italian translations

* trenches italian translations

* parachute italian translations

* vehicles italian translations

* viewdistance italian translations

* common italian translations

* magazinerepack italian translations

* vehiclelock italian translations

* overpressure italian translations

* ui italian translations

* medical_treatment italian translations

* medical_treatment german translations

* nametags italian translations

* overheating italian translations

* viewrestriction italian translations

* grenades italian translations

* ai italian translations

* aircraft italian translations

* arsenal italian translations

* arsenal german translations

* hellfire italian translations

* reload italian translations

* nightvision italian translations

* medical_damage italian translations

* towing italian translations

* fortify italian translations

* finger italian translations

* dragging italian translations

* viewports italian translations

* explosives italian translations

* killtracker italian translations

* killtracker german correction

* gforces italian translations

* noradio italian translations

* reloadlaunchers italian translations

* cargo italian translations

* medical_engine italian translations

* field_rations italian translations

* maverick italian translations

* slideshow italian translations

* medical_ai italian translations

* advanced_fatigue italian translations

* marker_flags italian translations

* tagging italian translations

* fastroping italian translations

* markers italian translations

* medical_statemachine italian translations

* microdagr italian translations

* novehicleclanlogo italian translations

* realisticnames italian translations

* irlight italian translations

* laser italian translations

* ballistics italian translations

* interaction italian translations

* medical_status italian translations

* medical_feedback italian translations

* medical italian translations

* map_gestures italian translations

* casings italian translations

* logistics_rope italian translations

* repair italian translations

* fieldmanual italian translations

* refuel italian translations

* refuel german translations

* intelitems italian translations

* gunbag italian translations

* fire italian translations

* cookoff italian translations

* smallarms italian translations

* zeus italian translations

* zeus german translations

* vehicle_damage italian translations

* advanced_ballistics italian translations

* advanced_throwing italian translations

* artillerytables italian translations

* captives italian translations

* chemlights italian translations

* compat_sog italian translations

* compat_rhs_usf3 italian translations

* compat_ws italian translations

* compat_ws german translations

* concertina_wire italian translations

* dogtags italian translations

* dragon italian translations

* fcs italian translations

* flashlights italian translations

* flashsuppressors italian translations

* frag italian translations

* gestures italian translations

* hitreactions italian translations

* hot italian translations

* huntir italian translations

* kestrel4500 italian translations

* laserpointer italian translations

* logistics_uavbattery italian translations

* logistics_wirecutter italian translations

* main italian translations

* map italian translations

* maptools italian translations

* medical_blood italian translations

* missileguidance italian translations

* missionmodules italian translations

* mk6mortar italian translations

* nlaw italian translations

* optionsmenu italian translations

* pylons italian translations

* quickmount italian translations

* rearm italian translations

* respawn italian translations

* sandbag italian translations

* scopes italian translations

* spectator italian translations

* spectator german translations

* tripod italian translations

* volume italian translations

* weaponselect italian translations

* weather italian translations

* winddeflection italian translations

* dagr italian translations

* headless italian translations

* hearing italian translations

* towing italian translations

* yardage450 italian translations

* Grammar Suggestion

* Fix Error from merge conflict resolution
2023-12-11 19:31:02 -06:00
Grim
892671c770
Medical - Prevent running FUNC(deserializeState) in scheduled environment (#9662)
Run deserializeState in unscheduled
2023-12-11 14:03:36 -08:00
johnb432
1b86f909e8
General - Removed silent Options Menu dependencies (#9677)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-11 18:05:22 +01:00
Apricot
fdc145d0e7
Translations - Hotfix Japanese localization. (#9671)
* Loading hotfix and Minor improves

What the poor work. sorry boys.

* revert nvg spacing

* repack magazines wording

* hotfix heartrate

* medical setting word update

* Update stringtable.xml

* tweak description short

* Update stringtable.xml

* sorting order name and factor name unified

* Problem with ammo display sticking out

* magazine repack fix again

* final version of magrepack

* arsenal wording

* heart rate text length

* BP forgot to change

* rewrite whole HR BP check text

* Normal wording revert

* Hearing and Zeus

* Fixed confusion between Factor and Coefficient

* Map tools
2023-12-09 21:18:24 -06:00
BrettMayson
464ab0cefb
Tools - Add HEMTT SQF support and fix commas are not semicolons (#9663)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-12-07 03:20:47 +00:00
johnb432
acca95d204
Arsenal - Search fixes (#9668)
Arsenal search fixes
2023-12-02 19:48:35 -06:00
Apricot
aa48e87323
Translations - Improve and overhaul Japanese localization. (#9657)
* More Japanese

* bit tweak

* cargo missing

* little bit better wording

* update medicaly

* more medical

* Grenade Things and more

* common and csw

* minor tweaks

* even more tweaks

* I want this to be the final update

* overhaul not over yet

* Finaly finaly it's over. maybe.

* zeus med module update addition

* range things

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* progress bar

* revert and feedbackicon

feedback is still used??? i can't check that

* Captive fix and Specialist things

* Training level required

* time things

* Zeus_ModuleUnloadFromCargo

* error fix

* revert field manual cause conflict with portuguese

* reattempt field manual

* advanced wording

* magazine name and chemlight name

* space

* I forgot change that

* Jam and cookoff meaning

* space is important

* Pointing
2023-12-01 17:50:58 -06:00
johnb432
f94197b1c3
Arsenal - Disable action buttons when hidden (#9664)
Update fnc_handleActions.sqf
2023-11-27 19:15:09 -06:00
Mr. Zorn
65be883eea
Weather - Add variable to temporarily pause wind simulation (#9057)
* added exit condition

This would enable mission maker to temporarily disable the execution of setWind every second.
Currently, a temporary pause isnt possible.

* Update weather-framework.md

* Apply suggestions from code review

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

* actually disable wind simulation

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-11-23 15:16:55 -03:00
Grim
3f61a41be3
Common/CSW - Use status effect for enableWeaponDisassembly (#9413)
* uuse weaponDisassemblyEnabled

* convert to status effect

* fix edge conditions

* Update addons/common/functions/fnc_claim.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update XEH_postInit.sqf

* Update addons/common/functions/fnc_claimSafeServer.sqf

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

* Update fnc_claimSafeServer.sqf

* change status effect key

* status effect key

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-22 21:16:42 -03:00