Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,617 Commits 73 Branches 88 Tags 752 MiB
eedbb0b5bc
Commit Graph

12828 Commits

Author SHA1 Message Date
lambdatiger
a976b28c69 magic number clean up and white space 2024-02-14 19:57:49 -06:00
lambdatiger
ae116e2577 variable name changes 2024-02-14 19:55:26 -06:00
lambdatiger
4d9f61eeaf
Update addons/frag/functions/fnc_dev_drawTrace.sqf 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 18:50:01 -06:00
lambdatiger
61029ba723
Update addons/frag/functions/fnc_dev_addRound.sqf 
If the round isn't in the hashmap anymore, we have to stop the PFH.
Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 17:56:05 -06:00
lambdatiger
fa241cacb5
Removed doublespace 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 17:14:43 -06:00
lambdatiger
1da1c68803
Apply suggestions from code review 
Small formatting changes and small errors

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 16:50:09 -06:00
johnb432
fd5e56ffbc
Arsenal - Improved sorting, insignia detection, identity info verification and minor cleanup (#9795) 
* Changed sorting + minor cleanup

* Update addons/arsenal/functions/fnc_fillLeftPanel.sqf

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

* check and log missing extended info

* fix extended loadout logging

* Made voice stuff config case

* use lowercase voice everywhere

* check loadout voice against configCase

* Update fnc_verifyLoadout.sqf

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

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

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

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

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 11:22:27 -08:00
BAXENdev
a0f3933bf0
Medical - Change max medication dosage behavior (#9746) 
* Consistentency Update with Overdosing

* Added Description to Condition Cases

* Updated to CASE 2

Overdose behavior:
ODs on uses `_maxDose + {1 or 2 or 3}` from `_maxDose + {0 or 1 or 2}`

* Update fnc_onMedicationUsage.sqf

* Update fnc_onMedicationUsage.sqf

* Added riskDose range and updated medications

* maxDose -> maxSafeDose | riskDose -> chanceDoses

* Fixed maxDose reference in trace

* Added chanceDoses to trace

* Fixed use of TRACE macro

* Updated comments and variable maxSafeDose -> maxDose

* Updated comment and overdose formula

* chanceDoses -> maxDoseDeviation

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

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

* Update addons/medical_treatment/ACE_Medical_Treatment.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 02:45:04 -08:00
johnb432
05a5ccd140
Arsenal - Add mod icons to editor arsenal attribute (#9797) 2024-02-12 15:15:48 -03:00
BrettMayson
1002dfe31b
Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
Grim
d6eb6b981c
Common - Allow multiple events to clear a cached call (#9770) 2024-02-11 22:13:37 -03:00
Grim
1e1d1d63f2
Arsenal - Add ace_arsenal_loadoutVerified event (#9792) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-11 20:25:12 -03:00
Grim
b2849aaa29
Fix filling loadouts list during preInit (#9794) 2024-02-11 20:21:29 -03:00
Grim
f3f9d18f55
Arsenal - Fill loadouts list over multiple frames (#9789) 2024-02-11 19:35:42 -03:00
Grim
bb7b05fd0d
Arsenal - Left panel code improvements (#9787) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-11 19:34:24 -03:00
Grim
95ec6eb765
Arsenal - Cleanup action UI code (#9784) 
* Arsenal - Cleanup action UI code

* derp
 2024-02-11 19:23:44 -03:00
Grim
a47ae27080
Nightvision - Register effects during preInit (#9788) 2024-02-11 13:55:48 -03:00
johnb432
cdc51643bb
Inventory - Remove duplicate code (#9791) 
Update XEH_preStart.sqf
 2024-02-11 07:33:58 -08:00
PabstMirror
e75ef3de06
General - Cleanup remaining HEMTT warnings/suggestions (#9786) 
* General - Cleanup remaining HEMTT warnings/suggestions

* Update addons/medical_engine/script_macros_medical.hpp
 2024-02-10 16:58:14 +01:00
Grim
6928adfc72
Arsenal - Improve performance of loadout verification (#9316) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-10 12:58:02 -03:00
lambdatiger
665707bbda a Brett (HEMTT) suggested change I miss 2024-02-08 17:29:03 -06:00
lambdatiger
a4c88ec713 removd unneeded define 2024-02-08 17:23:33 -06:00
lambdatiger
49c6187c17 Sync main repo 2024-02-08 17:19:54 -06:00
lambdatiger
2ad2564a1e removed all spaces from macros 2024-02-08 17:12:11 -06:00
lambdatiger
60543a5f59 added print incomplete only option to fnc_debugAmmo 2024-02-08 17:11:57 -06:00
lambdatiger
f63b4088eb Added commented 2.18 commands and updated script component 2024-02-08 17:11:36 -06:00
lambdatiger
07f055e16d updated some round types 2024-02-08 17:10:04 -06:00
Grim
ee79decb45
CSW - Code cleanup (#9777) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 20:36:13 -03:00
Grim
802560da8a
CSW - Delay init for CSW with simulation disabled (#9778) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 20:25:49 -03:00
BrettMayson
1649422cbd
Medical Vitals - Add SPO2 (#9360) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-07 17:50:18 -03:00
Fabio Schick
2f9b7002c3
Explosives - Add Cellphone/Detonator Keybinds (#9687) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 17:47:01 -03:00
johnb432
28e45c2979
Laser - Public getter and setter for laser codes (#9772) 
* Getter and setter for laser codes

* Documentation

* Sanitising input
 2024-02-07 08:49:36 -08:00
Grim
ae532c72f7
Medical - Prevent uncon AI from talking (#9776) 2024-02-07 12:56:24 -03:00
Smith
8731bcc8b5
Cargo - Add alternative unloading item from vehicle cargo (#8827) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-07 09:16:18 -03:00
Grim
e69ffb6f21
Arsenal Actions - Add support for multiline text & updating on cargo event (#9771) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-06 20:34:52 -03:00
johnb432
8de0740e94
Reload - Add manual reload for vehicle weapons - continued (#9398) 
* Add manual reload to turrets

* Added reload via reload keybind

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Engine based reloading, added more checks

* Update addons/reload/functions/fnc_canSwapTurretMagazine.sqf

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

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-06 15:14:25 -08:00
Grim
244bee4a61
Medical Engine - Prevent uncon units from ragdolling on death (#9762) 2024-02-06 20:11:47 -03:00
Grim
77a49a081a
Small Arms - Fix magazineReloadTime for vehicle FN Minimi SPW (#9774) 2024-02-06 20:06:49 -03:00
johnb432
907758385c
Common - Cleanup define.hpp (#9773) 
Update define.hpp
 2024-02-06 09:29:24 -08:00
Mike-MF
5a3f3d3b82
Add CUP Terrains Compatibility (#9627) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2024-02-05 15:58:15 -03:00
Dystopian
b54992b8fc
Towing - Fix some issues (#9007) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 15:54:51 -03:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 14:04:24 -03:00
Grim
6c60b67494
Arsenal - Exit refresh early if no display is found (#9754) 
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
 2024-02-05 10:57:22 -03:00
Grim
4bb9d6c42c
Medical - Add Painkillers (#9720) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-05 10:56:25 -03:00
johnb432
b440cf9cb2
Arsenal/RHS Compats - Removed bad illuminator stats for RHS attachments (#9766) 2024-02-04 16:24:14 -03:00
alexban011
f1e3753606
Common - Fix syntax error in fnc_disableUserInput.sqf (#9767) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 16:24:04 -03:00
Grim
5bd1fa7629
Common - Update header for FUNC(getWeight) (#9765) 2024-02-04 16:08:07 -03:00
Grim
ef9195f21a
Fix hellfire script error (#9764) 2024-02-04 15:12:13 -03:00
BrettMayson
1e404cf85b
General - SQF Improvements (#9698) 
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 14:50:24 -03:00
johnb432
8d6555ad0f
Arsenal - Make face tab adhere to mod icon setting (#9763) 2024-02-04 14:45:23 -03:00
Joko
2a6fd19762
Cookoff - Improve ammo detonation sounds (#5327) 
* initital commit

* use Define for SOS

* fix some issues that got introduced in 1.70

* Prepare config for sounds

* add New Sounds 

improve distanced volume values

* add LAxemann to Author

* add Object Pooling

improve Distances

* fix small mistake

* change pool clearing timing

* change pool wait time

* fix Cookoff sound cleanup

* change to Jonpas Method

change random Distance add

* improve sound Volume over Distance (asked by Bux)

improve mid sounds

* improve a calculation

* Use playSound3D locally

* Make sounds configurable by 3rd party mods

* Added comments, used macros

* Update CfgSounds.hpp

---------

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

* Changed conditions to check

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

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
 2024-01-22 16:41:46 -06:00
PabstMirror
7e255bf05b
Tools - Fix header arg types (#9752) 
Fix header arg types
 2024-01-22 16:33:30 -06:00
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