Commit Graph

12975 Commits

Author SHA1 Message Date
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
lambdatiger
fd6b9bcee1 Removed double space 2024-01-21 17:08:59 -06:00
lambdatiger
35400620c7 Increased relative chance to hit torso/pelvis when fragemnt should hit. 2024-01-21 17:08:48 -06:00
lambdatiger
33afd8ab33 Merge branch 'ACE_advancedThrowing-shotParent-issue' 2024-01-20 18:57:56 -06:00
Mike-MF
d8961c68d6
Add CUP Units Compatibility (#9649) 2024-01-20 22:29:40 +01:00
lambdatiger
2e6186c09b Changed case output to match config 2024-01-19 13:32:22 -06:00
lambdatiger
40b9cd3c41 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-18 19:38:54 -06:00
lambdatiger
2d9828de91 removed unneeded toLower 2024-01-18 19:16:39 -06:00
lambdatiger
00dc4193ad changed SPG-9 Fragments 2024-01-18 18:22:17 -06:00
lambdatiger
863692625d optimization, see https://github.com/acemod/ACE3/pull/9728#discussion_r1458112339 2024-01-18 18:21:39 -06:00
lambdatiger
a3efede64f Fixe bad search function 2024-01-18 16:01:11 -06:00
lambdatiger
f3788afc89 Since the functions always exist, I guess these variables should too 2024-01-18 16:00:42 -06:00
lambdatiger
5f1cf0b4b6 saving people from their own bad testing setup 2024-01-18 16:00:15 -06:00
lambdatiger
78a15b1d5c
Optimize dev_hitbox deleting
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-18 15:13:36 -06:00
lambdatiger
8b3826a78c
white space for clarity
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-18 15:10:31 -06:00
lambdatiger
4ebbc28948 Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. 2024-01-18 02:59:08 -06:00
lambdatiger
722e86a200 Removed extra text from CfgAmmoFragParameters 2024-01-18 02:54:19 -06:00
lambdatiger
59bf6e3b91 Shot parent possible fix #1 2024-01-17 23:13:31 -06:00
lambdatiger
a4f2ad45d8 Updated debug settings 2024-01-17 21:53:20 -06:00
lambdatiger
f7417377e5 Mactched format https://github.com/acemod/ACE3/pull/9728#discussion_r1454926681 2024-01-17 21:52:47 -06:00
lambdatiger
85df838aab variable names weren't verbose enough 2024-01-17 21:39:54 -06:00
lambdatiger
13834d7f17 Switched debug clear traces from addAction to ACE self interact 2024-01-17 21:28:53 -06:00
lambdatiger
c921b1f9b4 removed unused debug GVAR 2024-01-17 21:28:07 -06:00
lambdatiger
63d67df7bf removed spurious commas 2024-01-17 21:11:38 -06:00
lambdatiger
35592fa0af removed 2 argument option and removed some defaults 2024-01-17 20:52:25 -06:00
lambdatiger
9bcf2b7650 white space and define placement changes 2024-01-17 20:51:59 -06:00
lambdatiger
8b45d0aa17 Updated function headers 2024-01-17 20:51:34 -06:00
lambdatiger
df884dc4bc changed default arguments, check isKindOf to "CAManBase" 2024-01-17 20:50:20 -06:00
lambdatiger
183d9f0ac6 capitization from cfg to Cfg in config lookups 2024-01-17 20:48:27 -06:00
lambdatiger
da1d184009 changed params statement, function header, and propigated doFrag argument changes 2024-01-17 20:46:15 -06:00
lambdatiger
3f84a45dee https://github.com/acemod/ACE3/pull/9728#discussion_r1454832701 2024-01-17 20:44:28 -06:00
lambdatiger
1f294f52f9 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-17 19:48:33 -06:00
lambdatiger
0321b78385 Moved "isServer" check to initRound function 2024-01-17 19:41:07 -06:00
lambdatiger
a1c498d338 clarified function description and removed unneeded comments 2024-01-17 19:40:12 -06:00
lambdatiger
ea15eeaee9
Removed superfulous parenthese
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 19:03:19 -06:00
lambdatiger
73d0064607 Removed white space from removing an if statement in a previous commit 2024-01-17 18:54:13 -06:00
lambdatiger
51603619e6 optimized around checking if systems are active and moved debug arguments to an ifdef 2024-01-17 18:53:45 -06:00
lambdatiger
c0c423bb83 Declared _ammoInfo twice 2024-01-17 18:52:55 -06:00
lambdatiger
e5f62c71d2
unneeded parens
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:34:08 -06:00
lambdatiger
b6891b729d
formatting changes
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:24:54 -06:00
lambdatiger
3cc300a04d
another great isNotEqualTo opportunity
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:23:12 -06:00
lambdatiger
16128721e0
Function header changes
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:20:47 -06:00
lambdatiger
0958d6a33b
Update addons/frag/functions/fnc_dev_addRound.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:07:11 -06:00
lambdatiger
1b03ef7d52
getposATL to getPosATL
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:05:26 -06:00
lambdatiger
cdf1b4d6eb
Clarified arguments
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:04:38 -06:00
lambdatiger
16e699e387
unneeded parens
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 18:03:44 -06:00
lambdatiger
4727386c07
Git rid of superfulous stringtable entries
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-17 17:47:07 -06:00
PabstMirror
4756bb6f8c Prepare 3.16.3 Build 79 2024-01-17 09:27:10 -06:00
lambdatiger
4be8c821cb Better approach to ACE_FRAG_RM_EH macro 2024-01-16 22:47:42 -06:00
lambdatiger
63cba6b006 clarified a hold off variable 2024-01-16 15:49:20 -06:00
lambdatiger
769bb29342 Changed how spall hold off is calculated to avoid repeated unneeded computations 2024-01-16 15:43:14 -06:00
lambdatiger
9178611a16 Debug updated to be easier to control 2024-01-16 15:41:10 -06:00
lambdatiger
6dacd38101 Few quick optimizations of == to isEqualTo 2024-01-16 15:40:51 -06:00
lambdatiger
8dd76d1ba6 Changes as discussed here https://github.com/acemod/ACE3/pull/9728#discussion_r1453104308 2024-01-16 15:39:16 -06:00
lambdatiger
7aa17aa91b Grammatical erros 2024-01-16 15:38:47 -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
lambdatiger
572f9093f7 formatting whitespace 2024-01-15 19:57:52 -06:00
lambdatiger
67ede76494 compacted text a bit 2024-01-15 19:57:31 -06:00
lambdatiger
85b566a176 removed old parameter changed in f28d5d2372 2024-01-15 19:06:32 -06:00
lambdatiger
67e125cc43 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 18:50:40 -06:00
lambdatiger
b7807044bf white space/formatting changes 2024-01-15 18:47:21 -06:00
lambdatiger
b2666fceec Config lookup optimization mentioned by johnb432 here: https://github.com/acemod/ACE3/pull/9728#discussion_r1452726505 2024-01-15 18:47:06 -06:00
lambdatiger
c4a93c775d Implemented changes discussed here https://github.com/acemod/ACE3/pull/9728#discussion_r1452726904 2024-01-15 18:44:15 -06:00
lambdatiger
a8e268cdff
Optimized approach to classifying blacklist type
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:40:03 -06:00
lambdatiger
f713791602 fixed a loop that got caught in the merge crossfire 2024-01-15 18:35:26 -06:00
lambdatiger
e3c8e8d6ab Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 18:18:58 -06:00
lambdatiger
bd33ab0e91 removed return of sphere object, not required or useful. 2024-01-15 18:16:40 -06:00
lambdatiger
902af64d7e
avoid mismatch sides when debugging frags with unconcious or captive shooters
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:16:06 -06:00
lambdatiger
4ef116643d
Small optimization to optimize config lookup
quick testing shows a whole 600ns increase in

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:10:30 -06:00
lambdatiger
d683be853f Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 17:55:37 -06:00
lambdatiger
6e209ba4f0
slight performance increase using forEach loops
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 17:54:22 -06:00
lambdatiger
6fc950a5f1 Comments fixed 2024-01-15 17:53:12 -06:00
lambdatiger
dd7fc86295 fixed comment to properly state variable purpose 2024-01-15 17:40:31 -06:00
lambdatiger
133f0b1da4 Updated type checks in line with recommendation from johnb432 2024-01-15 17:36:02 -06:00
johnb432
5903e561a9
Arsenal - Add thermal vision support to scopes vision mode stat (#9736) 2024-01-15 19:40:36 -03:00
lambdatiger
3874146b23 formatting 2024-01-15 16:32:43 -06:00
lambdatiger
3957a0751f Fixed debug mode init, a few things pointed out by johnb432 that I was dumb not to do 2024-01-15 16:30:50 -06:00
lambdatiger
c05be02530 formatting 2024-01-15 16:27:29 -06:00
lambdatiger
054b9cda23 fixed more spacing issues 2024-01-15 16:13:48 -06:00
lambdatiger
96dc215f09 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 16:10:55 -06:00
lambdatiger
fa4de59a25 renamed files to fit proper format 2024-01-15 16:10:48 -06:00
lambdatiger
8683e0aa56 Fixed array of double spaced format errors 2024-01-15 16:10:01 -06:00
lambdatiger
c7a2769bdd
Really obvious isNull instead of isEqualTo
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 16:05:58 -06: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
lambdatiger
29d3d4c19f alphabetized PREP instead of categorizing it 2024-01-15 15:39:27 -06:00
lambdatiger
81d477e911 fixed call syntax 2024-01-15 15:37:32 -06:00
lambdatiger
4dee712d70 fixed example syntax 2024-01-15 15:37:18 -06:00
lambdatiger
ea654c8e56 Capitalized config entries 2024-01-15 15:36:58 -06:00
lambdatiger
2f1c7d9bf7 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 15:29:26 -06:00
lambdatiger
7581a480eb
Optimized isNull check
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 15:24:47 -06:00
lambdatiger
ced7aeb50c
Deleted whitespace in doFrag
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 15:24:11 -06:00
lambdatiger
22e26ee452 change of switch statements as referenced here https://github.com/acemod/ACE3/pull/9728#discussion_r1452728046 2024-01-15 15:23:12 -06:00
lambdatiger
54c4f45cf9 possilbe "magic number" cleanup and formatting 2024-01-15 15:18:42 -06:00
lambdatiger
ff462333cb Comment & documentation spelling and grammar improved 2024-01-15 14:39:41 -06:00
lambdatiger
a0812371c9 missed a trailing space 2024-01-15 14:27:29 -06:00
lambdatiger
e073d36a2f trailing spaces 2024-01-15 14:09:20 -06:00
lambdatiger
0f82f59955 typos from last commit 2024-01-15 14:08:27 -06:00
lambdatiger
3f45f7735b Convereted toLower to toLowerANSI 2024-01-15 13:55:15 -06:00
lambdatiger
4bd866b97d Merged commits 2024-01-15 13:55:01 -06:00
lambdatiger
eeb08c3f05 Made variable names more verbose and added trailing newlines 2024-01-15 13:42:45 -06:00
lambdatiger
b2c0f5720d skip prepping dev functions that aren't used when not dev compiled 2024-01-15 13:41:07 -06:00
lambdatiger
62a82ec71d added trailing newlines 2024-01-15 13:39:19 -06:00
lambdatiger
0e1bd6ab0e Got a little overzealous pruning & expanding variable names in the dev functions 2024-01-15 13:37:12 -06:00
lambdatiger
f28d5d2372 Reswept dev functions to match ACE code guidelines 2024-01-15 13:13:59 -06:00
lambdatiger
63cd1ed06a Last commit had debug staements uncommented 2024-01-15 01:33:25 -06:00
lambdatiger
5273b002f9 Replaced a magic number 2024-01-15 01:18:47 -06:00
lambdatiger
97547700d2 Added spall info caching and made variable name changes for clarity 2024-01-14 23:10:15 -06:00
lambdatiger
d51a9543b9 updated settings defaults 2024-01-14 23:09:08 -06:00
lambdatiger
eb61f5f7c0 Updated debugging, by default tracking spheres sync properly and messages are a bit clearer 2024-01-14 23:08:37 -06:00
lambdatiger
3da173e0a9 spall debug sphere improvements 2024-01-14 18:56:57 -06:00
lambdatiger
e1578188c9 Made debug mode semi-MP compliant 2024-01-14 18:47:18 -06:00
lambdatiger
fe1850a34a Fixed issue with spalling happening on thin surfaces instead of thicker surfaces hit afterwards 2024-01-14 18:46:52 -06: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
lambdatiger
6ae6b55e65 Added trailing empty braces for classes that aren't actually changed 2024-01-13 00:47:32 -06:00
lambdatiger
fbcf196402 Attempt to clean up formatting onall files 2024-01-13 00:35:22 -06:00
lambdatiger
a589f904cf Made configs easier to follow and hopefully fixed inheritance issue 2024-01-13 00:11:37 -06:00
lambdatiger
ef8a73df0c Changed an attempt to break inheritance and just did it the normal way. 2024-01-12 22:31:51 -06:00
lambdatiger
735d04e248 Fixed all inhertance issues 2024-01-12 22:21:56 -06:00
lambdatiger
6257dd3ee2 We love config inheritance 2024-01-12 21:19:39 -06:00
lambdatiger
12c5a69d23 missed inheritance check 2024-01-12 20:36:02 -06:00
lambdatiger
b836708237 Updated all vanilla classes with ace_frag parameter entries 2024-01-12 20:28:45 -06:00
lambdatiger
fb8f010332 made default frag info (when not defined) perform more middle of the road for munitions 2024-01-12 20:27:07 -06:00
lambdatiger
21c72313f4 Adding useful TRACE statement 2024-01-12 02:08:41 -06:00
lambdatiger
ad1916f513 Blacklisting error 2024-01-12 01:54:58 -06:00
lambdatiger
b62bec11f2 Missed part of a config 2024-01-12 01:52:01 -06:00
lambdatiger
2805699c0c Working updating all previously unused/undefined vanilla round definitions 2024-01-12 01:50:01 -06:00
lambdatiger
3d3fb434a7 Someday I will not accidentally hit a key an break things 2024-01-12 01:49:25 -06:00
lambdatiger
40810f282f Updated debug dump functions for ease of use 2024-01-11 17:58:47 -06:00
lambdatiger
1cf901703a Fixed a few issues script errors that went under the radar until now 2024-01-11 16:13:02 -06:00
lambdatiger
fbc710ce47 Removed tabs 2024-01-11 15:47:48 -06:00
lambdatiger
e290fd7c04 Fixed MP compat issue 2024-01-11 15:44:15 -06:00
lambdatiger
d7f2f673f3 fixed a few more script_comps 2024-01-11 15:44:01 -06:00
lambdatiger
231359ec4e Over zealous fixing script_component.hpp paths 2024-01-11 14:39:43 -06:00
lambdatiger
b1d54a1907 Fixed names and updated formatting 2024-01-11 14:01:50 -06:00
lambdatiger
9e67e31118 fixed formatting 2024-01-10 22:12:37 -06:00
lambdatiger
55d973153f Fine toothed comb time 2024-01-10 21:26:02 -06:00
lambdatiger
312da1a6c3 Deleted a semicolon 2024-01-10 20:39:10 -06:00
lambdatiger
8ec812b97d Fixed config spacing and multiple defines of classes 2024-01-10 20:32:07 -06:00
lambdatiger
5e46c8d1ef fixing PBO project gripe 2024-01-10 20:19:05 -06:00
lambdatiger
3e3ed12503 Final submunition code cull 2024-01-10 19:47:05 -06:00
lambdatiger
a64fff960a Fixed more comments 2024-01-10 19:02:07 -06:00
lambdatiger
eef48da6bc Converetd all stray tabs to spaces 2024-01-10 18:51:38 -06:00
lambdatiger
db195f4b26 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-10 18:40:29 -06:00
lambdatiger
f202b650c6 Removed dev info 2024-01-10 18:40:25 -06:00
lambdatiger
43423e3079
Merge branch 'acemod:master' into master 2024-01-10 18:35:42 -06:00
lambdatiger
a04e7a83e6 Small bug & config name fixes 2024-01-10 18:34:54 -06:00
lambdatiger
2a1f609e3c changed files names and small optimizations 2024-01-10 17:41:13 -06:00
lambdatiger
ebf1a707c1 Added initialization of material cache for performance 2024-01-10 17:40:36 -06:00
lambdatiger
7c399b8c9e Forgot to actually cache the spall material 2024-01-10 17:39:46 -06:00
lambdatiger
34d1762b62 Fixed one stringtable issue 2024-01-10 15:49:37 -06:00
lambdatiger
4cada76c81 Fleshed out stringtables 2024-01-10 15:48:06 -06:00
lambdatiger
0da454d270 removed unused functions 2024-01-10 15:47:50 -06:00
lambdatiger
3578b7a2fb Fixed small bugs with material selection 2024-01-10 15:46:17 -06:00
lambdatiger
0af6a74a41 Updated debug settings and staged localization strings 2024-01-10 00:55:33 -06:00
lambdatiger
8f70fa971a clarified variable names and removed submunition function call paths 2024-01-10 00:30:46 -06:00
lambdatiger
1e93453963 switch from loadFile to preprocessFile and dusted off the regex brain cell 2024-01-10 00:17:56 -06:00
lambdatiger
98fd580540 Fixed authors 2024-01-10 00:16:46 -06:00
lambdatiger
d25d6a61b3 readded seperate debug draw define 2024-01-09 23:17:08 -06:00
lambdatiger
fc7d68e129 Fixed additional quotes causing issues in .bisurf files 2024-01-09 23:16:08 -06:00
lambdatiger
86f7ec1825 updated TODO list 2024-01-09 21:07:21 -06:00
lambdatiger
71f26f5df6 Updated spall to use material 2024-01-09 21:07:01 -06:00
lambdatiger
acb7249039 added impact angle calculation handle to minimize spawning spall inside walls 2024-01-09 19:03:12 -06:00
lambdatiger
210a876c0c missed underscore 2024-01-09 17:36:36 -06:00
lambdatiger
a9a5a4a9ba dealt with cases were projectile is deleted before fragmentation 2024-01-09 17:25:38 -06:00
lambdatiger
026e12b2f9 Added methods to retrieve impact surface type 2024-01-09 17:25:09 -06: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
lambdatiger
ed116f1b2b additional changes for spalling material consideration 2024-01-09 14:01:12 -06:00
lambdatiger
48d37a96e0 update caching access function names to align with each other and added some preliminary material consideration for spalling 2024-01-09 14:00:43 -06:00
lambdatiger
278c09e4cb Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-09 11:58:55 -06:00
lambdatiger
132dc6d4c8 Fixed author lists 2024-01-09 11:54:52 -06:00
lambdatiger
9899587c82
Merge branch 'acemod:master' into master 2024-01-09 11:45:00 -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
lambdatiger
601083bce3 Increased readability to doSpallMomentum 2024-01-09 00:54:11 -06:00
lambdatiger
23d58c94b3 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-rewrite 2024-01-09 00:27:32 -06:00
lambdatiger
fc398ff042 Updated some stringtable entries 2024-01-09 00:27:13 -06:00
lambdatiger
3a088bb24c Returned some missing variable names. 2024-01-09 00:26:43 -06:00
lambdatiger
fe310760fc Fixed variable names and mislabeled inequalities 2024-01-09 00:25:58 -06:00
lambdatiger
af40eb1d5e Made larger spalls less lethal 2024-01-09 00:24:48 -06:00
lambdatiger
76c2c32493 Updated to use cached info 2024-01-08 23:59:06 -06:00
lambdatiger
55c7a233d1 removed duplicate setting 2024-01-08 23:58:11 -06:00
lambdatiger
02dd35f63f Reformatted for readability and optimized first if statement 2024-01-08 21:55:02 -06:00
lambdatiger
4ec2475d6b
Merge branch 'acemod:master' into master 2024-01-08 21:45:37 -06:00
lambdatiger
c3f04596c0 removed some redundant switch cases 2024-01-08 21:41:52 -06:00
lambdatiger
f852a3ab2d Added a config defined holdoff per vehicle fragmenting for performance 2024-01-08 21:41:31 -06:00
lambdatiger
1933ea4cfe reworked formatting and debug functions to increase readability 2024-01-08 21:41:05 -06:00
lambdatiger
fbb3c8ad93 removed some init eventhandlers to make debugging easier 2024-01-08 21:40:37 -06:00
lambdatiger
53976e39a3 fixed spelling errors 2024-01-08 21:40:12 -06:00
lambdatiger
990667b24b changed some WARNINGs to TRACEs 2024-01-08 21:38:55 -06:00
lambdatiger
596240a57d Added init event handlers instead of fired 2024-01-08 21:38:15 -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
lambdatiger
14e7ef7cba removed leftover script profiler calls 2024-01-08 18:07:15 -06:00
lambdatiger
bfb3fa851c added fnc_initRound 2024-01-08 18:06:57 -06:00
lambdatiger
c6ba93a26d Split configs and added init EH 2024-01-08 18:06:30 -06:00
lambdatiger
c95a8ca21b Fixed configname conflict after merging spall & frag cfgAmmos 2024-01-08 16:05:46 -06:00
lambdatiger
42832aa95c Clarified variable names 2024-01-08 15:38:26 -06:00
lambdatiger
370f1ce67f Added shot parents to spalling 2024-01-08 15:38:19 -06:00
lambdatiger
742304ec25 expanded TODOs 2024-01-08 15:33:45 -06:00
lambdatiger
51196804f9 Fixed accidental tab addition 2024-01-08 15:33:36 -06:00
lambdatiger
4e0e18a9c4 Added temporary todo list to ace frag README.md 2024-01-08 15:29:41 -06:00
lambdatiger
3c1e912787 Initial commit:
- Added new ammo cfg types
 - Added new caching functions
 - Added dev functions
 - Transfered core system to vanilla projectile EHs
 - Added stringtable sub categories
 - Reworked fragmenting and spalling to us submunitions
   - Frag
     - Implemented system around chance to hit
     - Switched from hitbox estimation to hitting specific HPs
     - Updated chance to miss method based on solid angle hit chance
     - Split random & targeted frag to their own subfunctions
   - Spall
     - Uses a system of estimated momentum changes to generate spall
2024-01-08 15:22:52 -06:00
lambdatiger
6c212ca377 Initial commit or frag & spall rewrite 2024-01-08 15:21:32 -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
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
PabstMirror
effbaed669 Prepare 3.16.2 Build 75 2023-12-12 00:26:26 -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
Enrico Machado
3f6a93195a
Translations - Add & Improve Portuguese entries (#9609)
* Fixed Portuguese typos

* Partial Portuguese translation

* Partial Portuguese translation

* Update addons/ai/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/gunbag/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Readded accidently removed entry

* Update stringtable.xml

* "and" -> "e"

* Update stringtable.xml

* Partial Portuguese translation

* Fixed corrupted merge

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-11-22 20:33:30 -03:00
Grim
6741822480
Interaction - Allow unloading patients, bodies, and captives from inside vehicles (#9645)
* add unloading from inside vehicles

* Update addons/common/functions/fnc_findUnloadPosition.sqf

* Update fnc_findUnloadPosition.sqf
2023-11-22 19:38:52 -03:00
johnb432
bae63636b7
Zeus - Add Zeus modules for unloading cargo (#9661)
Added unload cargo zeus module

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-11-21 20:44:08 -03:00
johnb432
73807c261f
XM157 - Fix zeroing for secondary muzzles (#9652)
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf

* Update addons/xm157/functions/fnc_keyPress.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/xm157/functions/fnc_keyPress.sqf

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

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-21 17:50:46 -03:00
Fabio Schick
852e08f8b5
Hunter Killer - Enable on Rooikat 120 and add italian translations (#9658)
* Enable HK on Tanks DLC Rooikat 120

* Italian Translations
2023-11-21 14:34:22 -06:00
johnb432
2e7f56ee39
Dragging - Fix captives (#9660)
Fixes and cleanup
2023-11-21 17:18:19 -03:00
Grim
3904240153
Cargo - Add item index and damage to cargo menu (#9655)
* add index and damage to cargo menu

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

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

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-21 01:46:16 +00:00
Grim
99ccf31807
Repair - Use object with lowest damage for changing wheels/tracks (#9648)
sort claimObject by damage
2023-11-20 22:43:43 -03:00
johnb432
ac9044f2d6
Zeus - Add medical menu module (#9367)
* open medical menu from Zeus

* fix function header

* Zeus can use every action, add room for more buttons in medical menu

* Update addons/medical_treatment/functions/fnc_treatment.sqf

* Added zeus treatment time coeff

* Update addons/medical_gui/functions/fnc_canOpenMenu.sqf

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

* Update fnc_canOpenMenu.sqf

* Update initSettings.sqf

* Update fnc_moduleMedicalMenu.sqf

* Added check + documentation

* Update fnc_canTreat.sqf

---------

Authored-by: Brett <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-20 13:52:29 -08:00
Apricot
5d8978981a
Translations - Improve Japanese (#9654)
Update Japanese
2023-11-17 19:50:33 -06:00
Grim
286f64480c
General/Medical - Lower inventory size for misc items (#9642)
* weight

* Update CfgWeapons.hpp

* Update addons/medical_treatment/CfgWeapons.hpp

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-17 20:08:13 -03:00
Grim
5e792082ec
Interaction Menu - Show distance to target on vehicle actions (#9644)
* add distance to action

* sort by distance

* Revert "sort by distance"

This reverts commit 89834613dd.

* show distance for crewed vehicles

* Update fnc_createVehiclesActions.sqf
2023-11-17 20:07:58 -03:00
johnb432
d1f0dc5e83
Cargo - Improve various aspects (#9617)
* Update CfgVehicles.hpp

* Cargo cleanup

* Update menu.hpp

* Updated status effect key

* Update fnc_onMenuOpen.sqf

* Update fnc_onMenuOpen.sqf

* fix comment from merge

* nil interaction GVARs on menu close

* fix carry bug

* Fix floating objects in MP

* Updated ace_cargoAdded doc

* Fix progress bar prematurely stopping

* Finer cursor object selection

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-11-17 20:07:28 -03:00
johnb432
8f3129a02e
Arsenal - Fix FUNC(removeVirtualItems) for JIP players (#9650)
* Fix removeItems for JIP

* Different approach

* Update fnc_addVirtualItems.sqf

* Refresh arsenal globally
2023-11-17 20:06:20 -03:00
johnb432
65c16b6a0a
Arsenal - Fix closing arsenal when ignoring content (#9651)
* Fix closing arsenal when ignoring content

* Update fnc_removeBox.sqf
2023-11-16 20:54:52 -03:00
Grim
3fcef89c97
Common - Add support for non-blocking progress bar (#9493)
* add support for non-blocking-progressbar

* switch to cutRsc

* Remove fade in/out

* Update HintConfig.hpp

* Add param to and cleanup header

* Update addons/common/functions/fnc_progressBar.sqf

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

* remove key handler

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-11 11:22:17 -03:00
Grim
b53d760f4a
Medical - Change default Fatal Injuries Source setting to Either (#9543)
change default fatal injuries setting
2023-11-11 11:21:00 -03:00
johnb432
cf8c847811
Interaction - Add crew status check for some vehicle interactions (#9637)
* Added check for crew status

If a one or more passenger in a vehicle are conscious, not captive and hostile to the interacting unit, the interactions (passenger, cargo) will not appear.

* Update fnc_canInteractWithVehicleCrew.sqf

* Update fnc_canInteractWithVehicleCrew.sqf
2023-11-11 09:03:32 -03:00
Dystopian
74be4f1503
Towing - Fix swimming issues (#9401)
* Fix swimming issues

* Fix fire with rope in hand
2023-11-10 21:16:11 -03:00
johnb432
4dd2568fe0
Cargo - Remove cargo objects from zeus editable objects (#9400)
Remove cargo from zeus editable objects
2023-11-10 21:13:53 -03:00
Crowdedlight
548ab810df
Attach - Add config property to set object orientation (#9623)
* added possibility to define orientation on attach items in config

* added documentation on attach framework

* whitespace

* changed to use roll and yaw parameters instead of vectordir for easier usage, and to support placement view with rolled objects. Changed vector calculations

* Update addons/attach/functions/fnc_attach.sqf

* Docs and comments

* fix derp

* Update docs/wiki/framework/attach-framework.md

* Update attach-framework.md

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-11-10 21:04:22 -03:00
johnb432
0330532cd2
Refuel - Add separate names for jerry can interactions (#9625)
Fix for #8115
2023-11-10 19:59:15 -03:00
johnb432
0ae00248c5
Medical Engine - Fix script error for 0 overall hitpoint armor (#9633)
* Update fnc_getHitpointArmor.sqf

* Update addons/medical_engine/functions/fnc_getHitpointArmor.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-11-10 19:49:09 -03:00
Filip Maciejewski
9f9507931f
Dragging - Fix being able to load cargo if the system is disabled (#9639) 2023-11-10 14:56:22 -05:00
johnb432
c850a6a25f
Interaction - Allow pulling bodies out of wrecks (#9618)
Allow pulling bodies out of wrecks
2023-11-10 14:55:40 -05:00
Mike-MF
23d7624016
Medical Treatment - Lower suture weight from 1 to 0.1 (#9635)
Lower suture weight
2023-11-10 14:55:25 -05:00
Filip Maciejewski
7df63ffe2e
Dragging - Fix being able to load people into vehicles from any distance (#9638) 2023-11-10 14:54:31 -05:00
PabstMirror
6bc5193a79
Tools - Check example funcs in document_functions.py (#9630) 2023-11-08 12:00:05 -06:00
BroBeans
4fb9da7b08
Laser - Revert default code to 1111 (#9588) 2023-11-06 20:16:03 +00:00
Grim
163d750a0d
Arsenal - Use forceUnicode for search functions (#9605)
* use forceUnicode

* Update fnc_attributeAddItems.sqf

* Update fnc_handleSearchbar.sqf
2023-11-05 15:16:44 -05:00
PabstMirror
6ce625a52f
Cleanup spaces in config macros (#9621)
* Cleanup spaces in config macros

* remove extra whitespace before call

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-11-05 12:36:00 -06:00
PabstMirror
2c5ef6a6ec
Refuel - Fix infinite recursion for getCapacity on a non-CfgVehicle (#9622)
* Refuel - Fix infinite recursion for `getCapacity` checking a non-CfgVehicle

Close #9620

* Update addons/refuel/functions/fnc_getCapacity.sqf
2023-11-04 16:58:17 -04:00
BaerMitUmlaut
30ec1eda16
Goggles - Draw under HUD (requires 2.16) (#9615)
Goggles - Draw under HUD
2023-11-04 16:57:38 -04:00
jonpas
c80edd6f8e
NightVision - Draw under HUD (requires 2.16) (#9614)
* NightVision - Draw under HUD
Fix #6819
Requires Arma 3 v2.16

* Remove unnecessary version check - cutRsc takes extra parameters fine
2023-11-04 16:57:25 -04:00
Psycool
015b7ab3c2
Translations - Korean fixed (#9624)
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-04 13:03:01 -05:00
BrettMayson
95e06254eb
Tools: HEMTT ignore has_include (#9613)
* Tools: HEMTT ignore has_include

* Fix make.py and sqfvmChecker.py for changes

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-03 12:30:20 -05:00
Apricot
20676a2f03
Translations - Improve Japanese Medical Localization (#9611) 2023-11-01 19:40:42 +01:00
BrettMayson
836be21f2d
Tools - HEMTT PW3 fixes (#9585)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-11-01 02:29:59 +01:00
jonpas
2dace6eb78
Medical Engine - Fix unconscious animations referencing invalid bones (#9610) 2023-11-01 02:28:17 +01:00
BrettMayson
e2154439a8
Medical Treatment - Add separate actions for colored body bags (#9598)
* medical treatment: separate actions for each bodybag

* remove extra icons
2023-10-30 16:54:29 -04:00
PabstMirror
37c4420da5
Configs - Fix case (#9592) 2023-10-27 20:55:42 -04:00
Grim
cdf6889b7d
Medical GUI - Increase Medical Menu side panel height (#9484)
taller side panels

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-27 20:55:30 -04:00
PabstMirror
3c8cff75d8
Arsenal - Add option to show live search results (#9354)
* Arsenal - Add option to show live search results

* use onEditChanged

* Update fnc_onKeyDown.sqf

* Update fnc_onKeyDown.sqf

* update script_components

* skip animate on live search
2023-10-27 20:55:14 -04:00
BrettMayson
f452d6633e
Arsenal - don't lowercase displayName (#9597) 2023-10-27 19:32:28 -04:00
Nilia119
d53bc62e27
Translation - German Addition/Improvement (#9587)
* Added German Translation

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

---------

Co-authored-by: Jo David <github@jonathandavid.de>
2023-10-26 15:33:41 -05:00
Mike-MF
c52c543f4b
Medical Treatment - Fix missing semicolon (#9591)
Fix missing semicolon
2023-10-26 20:04:58 +00:00
Grim
bbcec5c468
Arsenal - Add param to skip refresh animation (#9546)
* add animate param

* add refresh param

* remove param from event

* add 3DEN handling, update docs

* derp

* fix doc numbering
2023-10-26 11:59:00 -05:00
Psycool
8d4eb18b80
Translation - Korean minor fix (#9584)
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-26 00:49:46 -05:00
PabstMirror
418777595d
Arsenal - Fix left searchbar updating (#9583) 2023-10-25 21:06:25 -04:00
PabstMirror
1492e4ab09 Prep 3.16.1 Build 74 2023-10-25 14:07:14 -05:00
PabstMirror
d3f4944160 Merge branch 'master' into release-3.16.1 2023-10-25 14:06:37 -05:00
Psycool
25ec67f2fb
Translations - Korean updated (#9579)
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-25 10:34:15 -05:00
jonpas
ab8c5874f2 Prepare release v3.16.1 2023-10-24 23:53:26 +02:00
Mysteryjuju
0a83b6e840
Translations - Add missing french translations (#9577)
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
2023-10-24 16:47:24 -04:00
Grim
b8a9376a65
Medical Treatment - Use Laws of War bodybag model and add colored bodybags (#9371)
* add colored bodybags

* fix dogtags, add icons, revert item model to original

* Retexture ace's item model

* Keep original vehicle classname

* Update fnc_placeInBodyBagOrGrave.sqf

* fix displayName

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 15:16:52 -04:00
Grim
be6582ea44
Medical Engine - Disable uniform passthrough scaling, increase passthrough effect on vests (#9524)
* add separate pow for vests

* missing 0.02

* skip uniform scaling

* mathity math mamath
2023-10-24 15:15:47 -04:00
Enrico Machado
0f38de2bd0
Translations - Portuguese (#9576)
Fixed Portuguese typos
2023-10-24 13:59:21 -04:00
Psycool
eefa53221d
Translations - Korean (#9573)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 14:23:12 +02:00
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
amsteadrayle
503373bb83
Medical GUI - Improve toggle button icon and tooltip (#9485)
Improve toggle button icon and tooltip
2023-10-13 07:46:42 -04:00
Grim
5a2fd70075
Field Manual - Add Medical Menu entry (#9482)
* add medical menu

* add R/L note

* Translate display name

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-12 23:19:07 -04:00
amsteadrayle
1e3d9cc22a
Medical GUI - Show number of available treatment items in medical menu (#9474)
* Initial implementation of item count display

* Put everything inside function, add padding

* Extract and explain null string

* Fix tab in config file

* Add function header

* Use ACE item counting function

* Extract column width to variable

* Move constants declaration closer to usage

* Add special case for sutures

* Add setting to enable/disable

* Expand to allow showing in tooltip

* Split into counting and formatting function

* Fix incorrect check for case with no items

* Remove ineffective padding from tooltip

* Check for surgical kit item instead of display name

* Update return description in header

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

* Add `private` keyword for inline functions

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

* capitalization/vars

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

* nil checks, localize macro

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

* Remove button text mode and setting

* possessive

* Update addons/medical_gui/functions/fnc_formatItemCounts.sqf

---------

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>
2023-10-12 22:39:23 -04:00
amsteadrayle
e52594112d
Medical GUI - Add keybinds to navigate the Medical Menu (#9477)
* Add keybinds to select categories and body parts

* Add some comments, rearrange, remove debug prints

* Remove unneeded escape key handling

* Replace function with inline code
2023-10-12 12:50:48 -04:00
PabstMirror
58cedab493
Repair - Fix script error if vehicle is null (#9479) 2023-10-12 12:47:59 -04:00
Tim Beswick
bd377c49fc
Repair - Allow setting spare wheels/tracks count in config (#9481)
* Allow setting spare wheels/tracks count in config

* Update repair framework docs
2023-10-12 12:45:56 -04:00
amsteadrayle
2eb914836c
Medical GUI - Add R and L labels on body image (#9480)
Add R and L labels on body image
2023-10-12 12:44:13 -04:00
PabstMirror
b818f9f6e4 Prep 3.16.0 Build 71 2023-10-11 16:01:11 -05:00
PabstMirror
0b22c981e9 Merge branch 'master' into release-3.16.0 2023-10-11 16:00:33 -05:00
Hypoxic
176482381a
Field Manual - Add Framework (#9320)
* Field Manual Framework

Created barebones framework for addition of the Field Manual

* Created Stringtable.xml

Created Stringtable.xml

Created a few strings... more to come

* Update addons/fieldmanual/config.cpp

Moved opening brace

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>

* Update addons/fieldmanual/config.cpp

new lines at end of file

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>

* update stringtable.xml

Added arguments to ACE_Field_Rations_Base
Added strings for descriptions of subclasses

* update stringtable.xml

Added medical item documentation
Added field ration documentation

* Update stringtable.xml

Added fortify tool documentation

* updated stringtable.xml and cfgHints.hpp

Added item documentation
Cleaned up other strings
Added additional arguments and made them universal

* updated/reordered contents. added images

Reordered CfgHints.hpp
Added Range Tables string
Reordered stringtable
Added images for inline use

* changed indentation style

changed indentation style to guidelines
added empty line to the end of each file

* Update addons/fieldmanual/CfgHints.hpp

remove redundant includes

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

* Update addons/fieldmanual/CfgHintCategories.hpp

remove redundant includes

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

* Update stringtable.xml

added explosives string - no image yet

* Update stringtable.xml

added dead man's switch - no image as of yet

* Update addons/fieldmanual/script_component.hpp

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/fieldmanual/script_component.hpp

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/fieldmanual/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update stringtable.xml

Removed containers
Modified table to 4 space indentation
Started using Tabler

* update cfghints and stringtable

moved the fortify tool to items and removed it's specialized class
added DAGR and MicroDAGR strings - no image

* restructure

CfgHints.cpp - added additional arguments + placeholders for forward compatibility
Removed images and img from strings - will add in a different PR
Stringtable.xml - added 99% of content

* update strings

updated stringtables
consolidated cfghint base classes

* cfghints

fixed multiline string code

* Update CfgHints.hpp

Missed trailing \

* update cfghints.hpp

fixed leading \
still trying to get the pboproject to like it

* Update stringtable.xml

deleted original stringtable entry due to error with
Arma/Vlidate (pull_request)

* Update addons/fieldmanual/script_component.hpp

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/fieldmanual/CfgHintCategories.hpp

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Apply suggestions from code review

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

* Update stringtable.xml

changed structures for spray paint to surfaces

* Apply suggestions from code review

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

* Dynamically get item names

* stringtables, better unbound key handling

* disable preprocess (rip tools)

* bound key change

* standardize on medical keybinds

* fix medial menu keybind

---------

Co-authored-by: Hypoxic <amartini@martinicreations.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-10-11 15:53:10 -05:00
amsteadrayle
119d8bce5d
Medical GUI - Change default body color to improve contrast (#9476)
Change default body color to improve contrast
2023-10-11 07:40:13 -04:00
amsteadrayle
008cd5a851
Medical GUI - Add outline to selected body part in Medical Menu (#9471)
* Add functionality to show selected body part on body image

* Add controls for patient information display

* Receive selected body part through argument

* Improve selected check

* Add body part outline textures

* Second pass at outline textures

* Third pass at outline textures

* Add setting for outline color

* Fix capitalization

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

* Fix capitalization

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-11 05:25:28 -04:00
amsteadrayle
c407aebe6a
Medical GUI - Display qualitative bleed rate in injury list (#9469)
* Display qualitative bleed rate in injury list

* Remove debug print

* Reference existing vitals metrics in bleed rates

* Use `default` case for highest bleed rate

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-11 05:23:31 -04:00
PabstMirror
60143be55f
Arsenal - Add stats for buddy-loading launchers and belt linking (#9470)
* reload launchers - show if enable arsenal stat

* Apply suggestions from code review

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

* Add ACE_isBelt stat

* buddy

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-10-09 19:20:23 -04:00
Fabio Schick
b4c72d8255
Captives - Allow disarming and blindfolding captives in vehicles (#9463)
* Can disarm captives in vehicles

* Can blindfold captives in vehicles

* Fix dropping goggles/blindfold into large vehicles

* Apply suggestions from code review

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:58:49 -03:00
amsteadrayle
941207c45c
Medical GUI - Peek Medical Info on Hit (#9467)
* Basic implementation of medical status peek on hit

* Fix flickering on repeated hits

* Overhaul to show damaged body part

* Add setting to enable/disable

* Add setting for duration

* Fix capitalization

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

* Use recommended equality check

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

* Default to off

* change setting limits

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-09 14:57:47 -03:00
PabstMirror
97febbe574
Laser - Fix LST conditions (#9472) 2023-10-09 13:58:00 -03:00
amsteadrayle
0e2c7167a5
Medical GUI - Add keybind to show player's patient information display (#9464)
* Add keybind to show patient information display

* Return false

* Add fadeout delay and associated setting

* Switch to CBA setting rounding

* Change setting type to time

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

* Fix incorrect behavior on repeated key presses

* Tweak setting name and description

* Tweak to prevent overlapping WUAE

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-08 17:34:51 -04:00
amsteadrayle
78bb0514d1
Medical GUI - Reformat injury list to clarify global vs. limb-specific information (#9468)
* Reorder injury list to clarify global vs. local

* Add non-issue entries and deemphasize with color

* Give non-issue color to "No injuries..." entry

* Hook up to string tables

* move bleeding above blood volume lost

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-10-07 12:25:41 -04:00
PabstMirror
7b32cb76f8
Interact Menu - Fix zeus cursor menu closing (#9466) 2023-10-06 19:39:11 -05:00
PabstMirror
e8d1695c83
Zeus - Show where trench will go (#9462)
* Zeus - Show where trench will go

* Update fnc_moduleLayTrench.sqf
2023-10-04 17:10:21 -05:00
PabstMirror
bd43c32334
Trenches - Terrain Trenching (#9148)
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Trenches - Terrain Trenching (simple blocks)

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf

* Handle locality

* move code around, stringtable

* use third block for floor

* cleanup debug

* update includes, add tooltip
2023-10-04 14:21:50 -04:00
PabstMirror
98e189bfb4
Arsenal - Always show muzzle velocity even if not configured for AB (#9457) 2023-10-04 14:21:07 -04:00
PabstMirror
8143cdc1da
Medical AI - Add setting to replace gear for AI (#9458) 2023-10-04 14:19:10 -04:00
Grim
f088d9bfa1
General - uiNamespace cleanup (#9425)
* fix clear trauma on stitch

* add compileFinal and move to hashmap

* add missin param

* fix captives

* explosives/medtreat

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-04 14:09:05 -04:00
PabstMirror
50fba4545f
Zeus - Fix bis_fnc_activateaddons error in moduleCurator (#9459)
Close #9445
2023-10-03 08:08:04 -03:00
LorenLuke
a5a8b5387a
Laser - Add Individual Laser Code Digit Control (#9434)
* Initial Commit

* Use DIK Codes

* Update headers and dev code for new default frequency

---------
2023-10-02 12:29:38 -05:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging (#9455) 2023-10-02 11:05:56 -04:00
PabstMirror
3626b37c01
Tagging - Fix stringtable (#9456) 2023-10-02 11:05:13 -04:00
Drofseh
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags (#9442)
* add grave digging to body bags

* move buryBodyBag action to config, change grave ui icon to headstone

* improvements from code review

* switch direction check to man instead of bodybag, nominally allowing anything to be buried

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:55:13 -04:00
BrettMayson
66deb59037
Medical Treatment - Add event and setting for grave creation (#9441)
graves: event and setting for markers

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:31:38 -04:00
Grim
31a64a33b6
Compat SOG - Add explosives support to 1.3 mines (#9450)
* add fuse claymore

* add WP mines

* missing semicolon

* add dummy
2023-10-01 14:30:24 -04:00
Apricot
6429d0639f
Tagging - Add new colors and filled square tag (#9443)
* Adds yellow and white tags and filled square tag

Add:
Yellow Splay
White Splay
Filled Square tag for all colors

Change (and remove):
Remove color variations from the "X" strings and unify it.
Tweak some Japanese strings.

* tweak japanese
2023-10-01 13:43:03 -04:00
Drofseh
b9580a0349
Medical Treatment - Change isAwake check for grave digging to only apply to CAManBase (#9451)
* Move awake check for bodybag grave

* Apply suggestions from code review

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 13:42:07 -04:00
PabstMirror
38c79347ae
Misc - Config caplitzation fixes (#9452) 2023-10-01 12:09:02 -05:00
Marstruc
a8bd08136e
Medical Treatment - Add new Grave model (#9444)
* Added Grave model, swapped Grave classnames

* Change p3d name of Grave model

* Update addons/medical_treatment/CfgVehicles.hpp

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

* Updated grave model, textures, classname.

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 08:48:31 -04:00
Drofseh
dbf288851e
Medical Treatement - Don't allow conscious patients to be buried (#9448)
Don't allow conscious patients to be buried
2023-09-30 11:32:06 -04:00
Psycool
c49c5afcba
Fixed wrong strings (#9446)
* 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
2023-09-29 12:27:51 -05:00
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
PabstMirror
03332f0019 Prep 3.16.0 Build 70 2023-09-26 16:09:34 -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