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
15,003 Commits 73 Branches 88 Tags 752 MiB
9641fe490b
Commit Graph

12258 Commits

Author SHA1 Message Date
Grim
406fce2836
Dragging - Add setting for Max Weight Coefficient (#9569) 
* add arcade mode setting

* tweak stringtable

* stringtable

* change to slider

* fix spelling

* Update stringtable.xml

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-24 00:57:05 -04:00
Grim
e5c3470f5d
Compat RHS - Fix explosives compat (#9571) 
* fix RHS explosives

* fix clipboard

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

* Add dev script to test explosive mags

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-24 00:55:06 -04:00
Grim
0372447650
Medical GUI - Skip body part-specific info for medical peek (#9570) 
* add no body part support to patient info

* move up one row

* header, comment
 2023-10-23 19:47:06 -04:00
Grim
d74082402d
Common - Fix mod compat string and add source of main to outdated error (#9568) 
fix stupid + add source
 2023-10-23 17:09:09 -04:00
PabstMirror
9d1695ffe2
Common - Improve logs and message for version problems (#9560) 
* Common - Diagnose ace install if there are version problems

* update user error message

* whitespace

* missing lettr

* remove source from compat

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-10-23 16:29:32 -04:00
Grim
72bc3fc355
Arsenal - Fix search case-sensitivy for non-ANSI characters (#9565) 
* fix regex for non-ANSI

* Update addons/arsenal/functions/fnc_handleSearchbar.sqf

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

* Update addons/arsenal/functions/fnc_handleSearchbar.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-23 16:07:02 -04:00
Grim
339cfa8024
Arsenal - Add support for modifying Virtual Items while opened (#9542) 
* add support for mod. virt. items while opened

* updateUniqueItems

* execNextFrame

* add notification and TRACE

* remove debug

* Update addons/arsenal/functions/fnc_addVirtualItems.sqf

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

* Update addons/arsenal/functions/fnc_refresh.sqf

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

* move to removeBox

* update english to plural, others are fine

* missing include

* directCall in refresh

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-10-23 13:31:21 -04:00
Grim
f35f872963
Dragging - Prevent carrying crewed static weapons (#9491) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-23 19:21:50 +02:00
PabstMirror
5bf46245b2
Common - Fix replaceRegisteredItems if replacing item with nothing (#9552) 2023-10-23 19:20:23 +02:00
PabstMirror
9160826faa
HuntIR - Use ammo event handler (#9561) 2023-10-23 13:04:00 -04:00
PabstMirror
17daea0ff8
Repair - Fix displayed text when repairing lights (#9555) 2023-10-23 18:53:28 +02:00
Mysteryjuju
12f0cbbef9
Translations - Add French Translations (#9557) 
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
 2023-10-22 14:44:37 -05:00
PabstMirror
dd0838b2d7
Arsenal - Add stat for capabilities of pointer attachments (#9499) 
* Arsenal - Add stat for illuminator//pointer attachments

* Update fnc_statTextStatement_illuminators.sqf

* Update fnc_statTextStatement_illuminators.sqf
 2023-10-21 13:19:41 -04:00
Filip Maciejewski
f45b67222b
Compat RHS - Add hunterkiller support to M2A3 (#9554) 
* Add RHS launch config

* RHS Compat - Add hunter killer to M2A3
 2023-10-21 13:19:25 -04:00
Grim
4d80299d34
Medical GUI - Add sound and conditional switching to Medical Menu keybinds (#9487) 
* add sound and condition to category switch

* improve conditional switching

* better toggle handling

* playSound

* header

* Update addons/medical_gui/functions/fnc_onKeyDown.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-21 13:18:48 -04:00
MiszczuZPolski
c7bf57c71c
Medical Treatment - Add missing sutures to advanced crate (#9553) 
add missing sutures to advanced crate
 2023-10-21 11:01:33 -04:00
Grim
642ca3c14d
Medical - Make dug graves respect terrain slope (#9545) 
* slope dug graves

* remove parentheses
 2023-10-20 02:40:48 +00:00
Grim
80703ce760
Arsenal - Fix editor attribute search (#9544) 
fix 3den attribute search
 2023-10-20 01:23:40 +00:00
amsteadrayle
5d49a57bd1
Medical - Move GUI and Feedback settings to separate category (#9537) 
* Move medical interface settings to separate category

* Add translations from `str_3den_display3den_menubar_interface_text`

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-19 20:37:58 -04:00
Grim
55566fd60f
Interaction/Dragging - Remove actions from scripted weaponHolders (#9541) 
remove actions from scripted holders
 2023-10-19 20:24:38 -04:00
PabstMirror
124798cb8d
Advanced Throwing - Call ammo event handlers (#9535) 
AdvThrowing - Run ammo event handlers

Close #9532
 2023-10-19 19:25:44 -04:00
amsteadrayle
f0a6fc7b9d
Advanced Fatigue - Add settings to change sway factor with weapon rested/deployed (#9536) 
Add setting to change sway factor with weapon rested/deployed
 2023-10-19 19:25:19 -04:00
MiszczuZPolski
2fbc40b62d
Medical GUI - Change minimal value of damage threshold (#9538) 
* change minimal value of damage threshold

* applying pabst suggestion

* remove space

* Update addons/medical_gui/functions/fnc_updateBodyImage.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-19 19:25:05 -04:00
Apricot
6f001c72bd
Translations - Japanese Hotfix for Arsenal Sorting (#9533) 
Japanese arsenal sort hotfix
 2023-10-19 12:18:44 -05:00
PabstMirror
e3f447c8bd
Zeus - Fix trench module on clients (#9513) 
* Zeus - Fix trench module on clients

* Update addons/zeus/functions/fnc_moduleLayTrench.sqf
 2023-10-19 12:15:14 -05:00
PabstMirror
d70c049b4f
CSW/Dragging - Handle null objects causing script errors (#9529) 
* CSW - Handle static weapon be deleted

* add same fix to dragging
 2023-10-18 22:17:07 -04:00
PabstMirror
902e365536
Tools - Update addon.toml to HEMTT 1.9.1 (#9511) 
Tools - Update addon.toml to hemtt1.91
 2023-10-18 14:19:20 -05:00
Mike-MF
262b7fe5c6
Night Vision - Add prefix to colorPreset (#9520) 
* Add ACE Prefix to colorPreset, update docs.

* remove pointless bwc
 2023-10-18 15:03:21 -04:00
MiszczuZPolski
c92eca7751
Medical Treatment - Improve display name for arsenal tab (#9525) 
* add new display name for arsenal tab

* german language added

* Update stringtable.xml

* Update stringtable.xml
 2023-10-18 15:02:30 -04:00
Grim
209edf0433
Arsenal - Add FUNC(getVirtualItems) (#9512) 
add API
 2023-10-18 14:51:00 -04:00
Grim
b2b49cc993
Arsenal - Fix saving loadouts on new profiles (#9523) 
* fix

* Fix unrelated TRACE macro in arsenal

* Update addons/arsenal/functions/fnc_onArsenalOpen.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-18 14:17:22 -04:00
TIANYAO ZHANG
abb6519d6d
Translations - Update Chinessimp (#9517) 
Update chinessimp translation to stringtable.xml
 2023-10-18 12:18:39 -05:00
Grim
97b68fc7ae
Medical GUI - Fix Medical Menu triage button position (#9515) 
fix
 2023-10-18 00:51:27 -04:00
Grim
b9748041d4
Field Manual - Fix HuntIR Monitor & Fortify Tool display names (#9509) 
* fix huntir/fortify tool display names

* add note on sutures
 2023-10-17 20:19:09 -04:00
jonpas
1036a58aee Prep 3.16.0 Build 72 2023-10-17 20:41:59 +02:00
jonpas
6080004f56 Merge branch 'master' into release-3.16.0 2023-10-17 20:40:46 +02:00
amsteadrayle
6e8a27c9a6
Medical GUI - Remake body outline textures (#9503) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-10-17 14:43:44 +00:00
Bob-Murphy
ed1ef14749
SPE Compat - Fix Spearhead 1944 fuel drums for refuel system (#9507) 2023-10-17 16:37:18 +02:00
Bob-Murphy
60f0249161
SPE Compat - Add Spearhead 1944 fuel drums to refuel system (#9505) 
* Create land.hpp

* Update CfgVehicles.hpp
 2023-10-17 11:55:52 +02:00
PabstMirror
9873bf566c
Field Manual - Remove all use of +=, cleanup magwell capitlization (#9494) 
* Field Manual - Cleanup toml

* Fix magwell capitilization

* asc - skip fnc_zeusAttributes as it's hardcoded to be blocked

* Eliminate all use of += in fieldmanual

* Update sqfc.json
 2023-10-16 01:49:23 -05:00
Psycool
124baca84b
Korean translation improved (#9500) 
* 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
 2023-10-16 01:48:08 -05:00
Krzyciu
fb55508c99
Translations - Add Polish Translations (#9489) 
* Translations - Add Polish Translations

**When merged this pull request will:**
- Add missing polish translations
- Remove russian translation from polish - ace_common

### 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 addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update stringtable.xml

* Update addons/fieldmanual/stringtable.xml

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

* Apply suggestions from code review

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2023-10-16 00:21:02 -05:00
amsteadrayle
2f2c253c39
Medical GUI - Remake drag/carry category icon (#9498) 
Remake carry icon
 2023-10-15 20:45:02 -04:00
amsteadrayle
f2ae068e9f
Medical GUI - Fix action button width (#9497) 
Fix action button width
 2023-10-15 18:58:48 -04:00
amsteadrayle
9ecb35250d
Medical GUI - Use selected color when triage category selected (#9495) 
Show selected color for triage category
 2023-10-15 18:45:52 -04:00
amsteadrayle
863d88ff41
Medical GUI - Add divider bars for triage and toggle category buttons (#9496) 
* Add divider bars for triage and toggle category buttons

* Tweak vertical position of category icons

* Fix spacing
 2023-10-15 18:45:45 -04:00
Grim
8104c8f465
Common - Increase sway update frequency (#9490) 
increase sway update frequency
 2023-10-14 20:21:08 -04:00
amsteadrayle
c54a26cc42
Medical GUI - Show warning if tourniquet will interfere with medical menu action (#9475) 
* Warn if tourniquet will interfere with medical action

* Add setting to enable, default to off

* Tweak tooltip message

* Tweak code style, missing semicolon

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

* Use localize macro

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-10-14 19:28:22 -04:00
amsteadrayle
b54be029df
Medical GUI - Move target name to middle header (#9483) 
* Switch "status" header to player name

* Set title to "Medical Menu"

* Remove unused STATUS strings

* Switch to existing MedicalMenu string

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

* Revert "Remove unused STATUS strings"

This reverts commit 62c1ced06a.

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-10-14 19:27:57 -04:00
amsteadrayle
f774eaf787
Medical GUI - Fix asymmetry in the medical menu (#9486) 
* Fix assymmetry in the medical menu

* Add center divider in Activity/Quick View panel
 2023-10-13 16:33:19 -04:00