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
14,612 Commits 73 Branches 88 Tags 752 MiB
1208f7a2ce
Commit Graph

14612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
10Dozen
3d9315529d
Medical Feedback - Add indication of Fractures and applied CATs/Splints (#8321) 
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-12 14:16:30 +02:00
ace3mod
341f4c3aef [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2021-10-12 11:33:43 +02:00
Brandon Danyluk
ca7fbe742c
Add Vehicle Towing (#8380) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-12 11:33:05 +02:00
Dystopian
65b9cf3754
Map - Use getLightingAt (more light sources illuminate map) (#8343) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-12 10:31:46 +02:00
Serg Vergun
f7b07c362d
Medical GUI - Add ability to customize Medical GUI colors (#8350) 
* Add ability to customize colors of injuries

Added CBA settings entries.
Updated default values.
Added English and Russian locales.

* copypaste cleanup

* move comments and make code more maintainable

* Apply suggestions from code review

Newline at end of files

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
 2021-10-12 10:11:55 +02:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345) 
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
 2021-10-12 10:08:10 +02:00
Walthzer
fad7f84625
Explosives - Add exclusion from dynamic defuse action (#8171) 
* Add GVAR(noDefusalAction)

* add changes

* Prep functions

* Update addons/explosives/functions/fnc_excludeMine.sqf

Uhm, strange. Its clearly allMines, yet Allmines didn't only build it also worked properly. Undocumented variable?

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Update addons/explosives/functions/fnc_stopExcludingMine.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Header Fixes

Fix information in the function headers

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

* Remove Individual Functions

* Compacter Functions

* Event

* remove tab (facepalm)

* Jonpass' Review Fixes

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

* Fix exitWith mistake

* Refractor of allowDefuse

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

* Update addons/explosives/functions/fnc_allowDefuse.sqf

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

* Update Documentation

* Rephrase documentation

* Another rephrase

* Relabel Locality

* Update addons/explosives/functions/fnc_allowDefuse.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-11 15:49:27 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461) 
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-11 15:48:30 -05:00
Vdauphin
ec12ee2137
Disarming - Add quantity to ace_disarming_dropItems event (#8232) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-11 22:08:02 +02:00
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
Serg Vergun
af66a9881c
Interaction Menu - Add triage colors to icons at passengers list (#8366) 2021-10-11 11:51:05 +02:00
Steve Zhao
0b2b4d7397
Medical - Improve keybind to open med menu for vehicle occupant under cursor (#8160) 
* add lineIntersectsSurfaces to med menu key

* fix _target = nil if no intersections

* only look through player and player vehicle

* Update addons/medical_gui/XEH_postInit.sqf

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
 2021-10-11 10:29:09 +02:00
GhostIsSpooky
1c921674a9
Fixed jerry can madness (#8348) 
Fixed refueling vehicles with high input rates when using fuel sources with low fuel capacity.
 2021-10-11 00:47:54 -05:00
Serg Vergun
128ddf2591
Nametags - Add setting to disable effect of ambient brightness on view distance (#8325) 
* Add setting to disable effect of ambient brightness on view dist

* Add periods and Title Case for English localization

* Apply suggested code. Make it more readable

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

* fix spelling

* fix mistype

* one more mistype

* Implement suggestions

Settings parameter as slider.
English and Russian localization.

* Update addons/nametags/functions/fnc_getCachedFlags.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-10-11 00:35:21 -05:00
GhostIsSpooky
0d34ac2838
add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497) 
Add missing Polish translations
 2021-10-11 00:27:06 +02:00
GhostIsSpooky
baff363915
Realistic Weights - Add Apex / Contact / Anti-Tank Weapons (#8357) 
* Add Apex / Contact / Tanks Weapons

* Inheritance fix

* Fix UBCs

* Weight for the RPK
 2021-10-10 12:54:12 -05:00
GhostIsSpooky
e3986f4528
Small Arms - Fix FNX-45 magazine round count (#8352) 
* Change FNX-45 magazine round count

* Style pass
 2021-10-10 12:02:26 -05:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468) 
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
 2021-10-10 18:55:14 +02:00
GhostIsSpooky
9479c29b42
Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
GhostIsSpooky
1b318433a2
Common - Add settings for additional progress bar information (#8428) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-10 18:49:41 +02:00
BaerMitUmlaut
6128b8ef06
Common - Only switch side if necessary on person loading (#6334) 
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-10 16:26:36 +02:00
GhostIsSpooky
0a203fdde4
Medical Feedback - Stop effects on featureCamera (#8373) 
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
 2021-10-10 16:24:10 +02:00
GhostIsSpooky
755c5ea50d
Hit Reactions - Add check for disabled damage (#8474) 2021-10-10 16:04:54 +02:00
Dedmen Miller
7bf9f3112e
Attach - Follow bone rotation for attached items (#8477) 2021-10-10 16:03:50 +02:00
PabstMirror
94c62d8ed3
Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243) 2021-10-10 15:41:47 +02:00
Ozan Eğitmen
64decdd189
Cargo - Add Option to Reopen Menu After Unload (#8487) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-10 15:37:16 +02:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-10 15:37:05 +02:00
jonpas
625721ac0b
No Uniform Restrictions - Update for vanilla 1.98-2.06 (#8495) 2021-10-09 22:53:36 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
Ozan Eğitmen
fb2b1ceadb
Explosives - Fix Dial Tone Sound Position (#8488) 
* explosives - fix dial tone sound position

* Use right hand pos instead of hardcoded pos
 2021-10-08 11:35:47 -05:00
PabstMirror
4b593f85d3
Tools - Add sog compat pDumbies (#8493) 2021-10-08 17:11:36 +02:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
GhostIsSpooky
a95e71fec8
Arsenal - Handle Weapon Items not in Box Virtual Items as Unique (#8375) 
* Handle unique items that are also weapon attachments

* only flatten once
 2021-10-07 12:39:55 -05:00
GhostIsSpooky
ce705310e3
Realistic Names - Add Contact DLC & PIP optics (#8413) 
* Add Contact DLC optics

* add DMS variants

* fix bracket, add pip optics

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-07 12:39:18 -05:00
10Dozen
f232f84c6c
Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items (#8379) 
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
 2021-10-07 00:10:19 -05:00
mharis001
d6559f22e0
Arsenal - Fix sort running twice (#8479) 2021-10-06 22:16:42 -05:00
Dedmen Miller
d836cbfe6e
Fix vanilla NV Marker lifetime (#8473) 
* Fix vanilla NV Marker lifetime

* Empty lines

* Fix whitespace
 2021-10-06 22:16:13 -05:00
mharis001
09d1284ad9
Arsenal - Fix sortPanel clearing custom item names (#8478) 2021-10-05 15:37:27 -04:00
Dedmen Miller
7347d563b1
Add event property to detect temporary detach/reattach (#8476) 2021-10-05 12:32:38 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode (#8452) 
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
 2021-10-05 12:29:22 -05:00
GhostIsSpooky
5fbbb34d2d
Make unrelated things not explode when repairing (#8351) 
_useEffects was probably inverted. Makes ERA/SLAT not explode when repairing unrelated hitpoints. See #7452.
 2021-10-05 12:27:55 -05:00
ace3mod
1e30e1371e [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2021-10-05 19:26:17 +02:00
Dedmen Miller
7b51e16adf
use RHS loadorder for comapts (#8472) 2021-10-05 12:25:38 -05:00
Whigital
6b05da7632
Coding Guidelines inconsistencies (#8481) 2021-10-05 12:20:52 -05:00
PabstMirror
cb07e2ceba
Tools - Update /includes for 2.06 and cba (#8484) 
* Tools - Update /includes for 2.06 and cba

* Update required ArmA/CBA
 2021-10-05 12:05:42 -05:00
Filip Maciejewski
d0fd45e220
UI - Infantry speed indictator (#8384) 
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-05 18:47:24 +02:00
ace3mod
2134f6e837 [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2021-10-05 13:29:21 +02:00