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,215 Commits 73 Branches 88 Tags 752 MiB
cb07e2ceba
Commit Graph

11616 Commits

Author SHA1 Message Date
PabstMirror
a90911a7fc
Various - Add missing units/weapons to cfgPatches (#8175) 
* Various - Add missing units/weapons to cfgPatches

* Update config.cpp
 2021-03-17 15:48:47 -05:00
Spindler Torsten
b167dff81a
Change displayShortName to MAVL for Maverick L (#8161) 
Co-authored-by: TeTeT Nimitz <tetet.nimitz@gmail.com>
 2021-03-12 12:57:56 -06:00
PabstMirror
8ac8da3188
Spectator - Fix displayUnloaded event (#8158) 2021-03-10 10:12:50 -06:00
PabstMirror
8bd4922fcc Prep 3.13.6 Build 60 2021-03-09 17:06:50 -06:00
PabstMirror
8615df6211 Merge branch 'master' into release-3.13.6 2021-03-09 17:06:37 -06:00
Steve Zhao
c0db53770a
Add descriptions for hellfire variants (#8157) 2021-03-09 17:04:17 -06:00
PabstMirror
9bc5d6af27 Prep 3.13.6 Build 59 2021-03-08 22:12:36 -06:00
PabstMirror
d2ceeed154 Merge branch 'master' into release-3.13.6 2021-03-08 22:07:18 -06:00
BaerMitUmlaut
dcfb5aa224
Enable forgotten unconscious fade in/out effects (#8156) 2021-03-08 17:14:19 -06:00
PabstMirror
05ab4ba677
Javelin - reduce soft-launch motor delay (#8152) 2021-03-07 13:25:14 -06:00
classic
7112bebaa7
Update Japanese translation (#8150) 2021-03-06 14:27:35 -06:00
Dystopian
69c3d2bb65
Add Weapon Attachments interaction (#7706) 
* Add Weapon Attachments interaction

* Apply recommended changes

* Format addPEH

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

* Remove toLower

* Update required CBA version

* Rename category to Accessories

* Change setting var name

* Add setting description

* Fix notification size

* Optimize with new commands

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-03-04 11:43:11 -06:00
classic
c60e4111d8
Update Japanese translation (#8146) 2021-03-04 11:27:06 -06:00
Neil Evers
d64050554d
Arsenal - Fix Zeus UI lockup after closing arsenal (#8102) 
* Fix Zeus UI lockup after closing arsenal

* Removed redundant line

* use ACE_player

* Always reset cameraview
 2021-03-03 22:11:24 -06:00
PabstMirror
2458e87333 Prep 3.13.6 Build 58 2021-03-03 16:04:10 -06:00
PabstMirror
fab4664b73
Update XEH_preInit.sqf (#8143) 2021-03-03 15:50:08 -06:00
PabstMirror
22faa51233
Common - Fix Gesture mutex for scroll-wheel reloads (#8142) 
* Common - Fix Gesture mutex for scroll-wheel reloads

* simplify gvars and add comments
 2021-03-03 15:31:07 -06:00
Salluci
496a6d800a
Medical - Show "Inventory" action on unconscious units (#8083) 
* Update XEH_preInit.sqf

* Style pass, remove double localize

* only run if (hasInterface) {

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-03-03 15:30:49 -06:00
Dystopian
98e74ab3d1
Cook off - Fix ammo box cook off when setting is Players only (#8066) 
* Fix ammo box cook off when setting is Players only

* Update addons/cookoff/functions/fnc_handleDamage.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:50:09 -06:00
Filip Maciejewski
4d71607e81
Arsenal - Less magic numbers (#8089) 
* Add macro for virtualItems index 0 (weapons)

* Add macro for virtualItems index 1 (attachments)

* Add macro for virtualItems index 2 (all items)

* Add macro for virtualItems index 3 (headgear)

* Add macro for virtualItems index 4 (uniform)

* Add macro for virtualItems index 5 (vest)

* Add macro for virtualItems index 6 (backpack)

* Add macro for virtualItems index 7 (goggles)
 2021-02-27 11:21:26 -06:00
pterolatypus
b2da1792e1
Medical Treatment - Settings to limit IVs to certain locations (#8116) 
* Settings to limit IVs to certain locations

* Changed to one setting

* Reworded settings for consistency
 2021-02-27 11:06:37 -06:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
jonpas
5a36d1a771
Advanced Throwing - Add object variable to disable pick up of attached throwables (#8031) 
* Advanced Throwing - Add object variable to disable pick up

Use: `OBJECT setVariable ["ace_advanced_throwing_disablePickUp", true]`

* Documentation - Add Advanced Throwing Framework

* Update addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf

* Update advanced-throwing-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:04:43 -06:00
Steve Zhao
13bce729ee
add icon for quickmount change seat (#8126) 
alpha-inverted version of "\a3\ui_f\data\GUI\Cfg\Hints\Seats_ca.paa"
 2021-02-27 10:36:10 -06:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
commy2
50578a2463
Fix Multiple Issues With Timestamps (#8034) 
* Fix Multiple Issues With Timestamps

* simplify

* improve parsing of timestamps

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 00:17:00 +01:00
PabstMirror
bac47bb292
Chery pick 6868fa5600 (#8139) 
Co-Authored-By: Toni Vicente <arv187@users.noreply.github.com>

Co-authored-by: Toni Vicente <arv187@users.noreply.github.com>
 2021-02-26 13:28:42 -06:00
PabstMirror
ad98ae479c
Flashsuppresssors - Update configs for 2.02 (#8105) 2021-02-24 11:41:32 -06:00
Vdauphin
d00e7a17a1
cookOff - Fix: Disable ammunition cookoff and turret effect when skipping destruction effects (#8122) 
* Disable ammunition cookoff and turret effect when skiping destruction effects

* Improve readability
 2021-02-23 11:42:15 -06:00
BaerMitUmlaut
61e8ae3c8b
Wirecutter - Replace fences with destroyed models when cut (#8106) 
* Add more fence types for wirecutter

* Replace fences with destroyed models when cut

* Move fence destruction to server side
 2021-02-23 11:03:55 -06:00
mharis001
5bc43fe247
Common - Improve getPylonTurret by using getAllPylonsInfo (#8087) 
* Improve getPylonTurret by using getAllPylonsInfo

* Fix indentation

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-23 10:57:57 -06:00
PabstMirror
0570c0b861
Update fnc_cbaSettings_loadFromConfig.sqf (#8118) 2021-02-19 11:18:21 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
jonpas
111202971b
Goggles - Allow wiping in more states (#8111) 2021-02-14 04:28:58 +01:00
PabstMirror
cb870693fd
CSW - use preferred XEH format (#8112) 2021-02-13 15:37:26 -06:00
Filip Maciejewski
b8820eb3da
Arsenal - Fix custom categories not working for some Misc item types (#8088) 2021-02-08 04:26:40 +01:00
PabstMirror
b50a49c287
Convert all true/false in configs to 0/1 (#8095) 2021-02-08 04:14:45 +01:00
TyroneMF
7a65acdc15
Medical Damage - Add setting for unconscious chance from pain (#8092) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-02-08 04:13:59 +01:00
Dystopian
08472f6343
Interact Menu - Combine parent menu with single child (#8060) 
* Combine parent menu with single child

* Adapt fastroping Cut ropes action for the setting

* Change setting name and description

* Fix action object when child action has different object

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

* Adapt quickmount Change Seat actions

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-04 11:01:35 -06:00
PabstMirror
091d0d2449
Tripod - Fix blocking mouse wheel input handler (#8090) 2021-02-04 10:48:58 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Dystopian
4acfc35e77
Cleanup unused variable (#8074) 2021-01-28 11:14:28 -06:00
jonpas
6522dba87e
Dragging - Fix mass synchronization (#8071) 
* Dragging - Fix mass synchronization

* Cleanup redundant argument
 2021-01-20 14:49:38 -06:00
Björn Dahlgren
fe544a274d
Ballistics - Add 30rnd 556 magazines to SCAR EGLM magwell (#8054) 2021-01-05 10:54:52 +01:00
Cyruz143
8eccabbc0a
Grenades - Use fnc_addToInventory (#8016) 
* Try and put converted item back in the same container

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Less hacky handling of container names

* Return value convention

Co-authored-by: Dystopian <sddex@ya.ru>
 2020-12-21 00:15:46 +01:00
Dystopian
50f740f9be
Optimize interaction menu conditions (#8037) 2020-12-17 21:28:54 +01:00
Brandon Danyluk
4058a7e42b
MissileGuidance - Active Radar Homing: Use AGL for nearestObjects check (#8045) 
* Use AGL for `nearestObjects` check

* remove empty line
 2020-12-15 21:01:53 -06:00
Smith
5a6b21dd0b
Map Gestures - Fix briefing mode group (#8025) 
* fix getting players from a group

* add brackets

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

* small refactoring

* remove useless parentheses

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
 2020-12-02 08:49:35 -06:00
Dedmen Miller
a64ba9f7a5
Arsenal - Remove useless isClass check in configClasses (#8018) 2020-11-29 19:21:53 +01:00
Dedmen Miller
0e88479220
Tagging - Remove useless isClass check in configClasses (#8017) 2020-11-29 19:21:41 +01:00
Cyruz143
2ec28c5946
Medical Engine - Hide actions that have ACE interactions (#8003) 2020-11-29 19:21:02 +01:00
Dystopian
9dc82ee187
Fix fnc_common_addToInventory using (#8013) 2020-11-25 13:22:25 -06:00
mharis001
137af792d2
Arsenal - Fix sort by load (#8011) 2020-11-24 15:29:43 +01:00
PabstMirror
109e12cc2b Prep 3.13.5 Build 57 2020-11-16 17:46:16 -06:00
PabstMirror
d887b4a635 Merge branch 'master' into release-3.13.5 2020-11-16 17:45:54 -06:00
BaerMitUmlaut
ad75c7c9b8
Common / Medical - Fix loading patients into turret only seats (#7980) 
* Fix loading patients into turret only seats

* Fix cargo logic, adjust function for captives (#8000)

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-15 12:57:27 -06:00
BaerMitUmlaut
629942885e
Fix players occasionally being invincible after respawning (#7999) 2020-11-10 10:07:42 -06:00
PabstMirror
a621d2eb72
Medical Statemachine - Ensure bleedout condition string is code (#7998) 2020-11-10 10:06:45 -06:00
Elgin675
92cd367765
Translations - Add French "Medical_Statemachine_CardiacArrestBleedout" keys (#7997) 2020-11-08 17:46:13 -06:00
Dedmen Miller
1efa25fe2b
Explosives - Add clackerAdded event (#7994) 
* Add clackerPlaced event

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-08 17:26:02 -06:00
BaerMitUmlaut
0c84cdd375
Fix unconscious medics not being healed by other AI medics (#7995) 2020-11-08 16:32:02 -06:00
BaerMitUmlaut
d27122fa16
Medical Status - Fix unconscious AI aiming at enemies (#7977) 
* Fix unconscious AI aiming at enemies

* Improve handling when locality changes

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-08 16:27:10 -06:00
Laid3acK
718d282263
Ballistics - Update the B 556x45 dual (#7982) 
* B_556x45_dual

* B_556x45_dual
 2020-11-08 16:26:30 -06:00
BaerMitUmlaut
0e642758d6
Medical Statemachine - Add setting to disallow bleedout in cardiac arrest (#7547) 
* Add setting to disable bleedout in cardiac arrest

* Improve setting name and description
 2020-11-08 16:24:44 -06:00
BaerMitUmlaut
119450f4e9
DAGR / Interaction Menu / Repair - Fix overwriting globals (#7990) 
* Remove global DAGR_NEXT variable

* Remove global ERR variable

* Fix overwriting global this variable

* Fix overwriting global total and hitpoint variables

* fix condition

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-08 15:54:14 +01:00
Elgin675
5d1aa28419
Translations - Add French "Medical_Treatment_bodybagWhileStillAlive" key (#7993) 2020-11-07 17:08:01 -06:00
Elgin675
95d4dc811b
Translations - Update French Translations (Arsenal, Markers and Medical GUI) (#7987) 
* Translation - Add french "Arsenal_sortByProtection" keys

* Translation - Add french "Markers_Timestamp" keys

* Translation - Add french "Medical_GUI_InteractionMenuShowTriage" keys
 2020-11-07 09:36:12 -06:00
Elgin675
712a27788f
Translations - Update / Fix French Translations (Medical Treatment) (#7988) 
* Translations - Fix French "TreatmentTime" keys.

* Translations - Add French "TreatmentTime" keys.

* Translations - Fix some french keys (medical_treatment).

* Translation - Add french "Treatment_WoundStitchTime" and "AllowBodyBagUnconscious "keys

* Translations - Fix french "Medical_Treatment_AllowSelfStitch_DisplayName" key

* Fix french "Medical_Treatment_MedicIV_Description" key

* Fix french "Medical_Treatment_AllowSelfIV_DisplayName" key
 2020-11-07 09:35:40 -06:00
PabstMirror
bc7194942f
Update fnc_sortStatement_protection.sqf (#7989) 2020-11-05 18:42:41 +01:00
PabstMirror
12ad406fa3 Prep 3.13.5 Build 56 2020-11-02 23:01:40 -06:00
BaerMitUmlaut
af2973a9f0
Fix spare wheels receiving fall damage (#7978) 2020-11-02 21:43:49 -06:00
PabstMirror
ff2136c98f
Update fnc_fillSort.sqf (#7981) 2020-11-02 21:42:48 -06:00
Brett
9226035d59
Arsenal - Conditional on sorts (#7889) 
* Arsenal - conditional on sorts

* fix: zero divisor

* update fnc_addSort

* Update fnc_fillSort.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-11-02 12:23:44 -06:00
BaerMitUmlaut
260706cb9f
Fix door opening for buildings with 10+ doors (#7975) 2020-11-02 12:22:53 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup (#7973) 2020-10-30 23:40:10 -05:00
PabstMirror
2ca13fc022
Medical - Cleanup preload debugging, bump to 2.00 (#7976) 2020-10-30 13:29:13 -05:00
mharis001
aab8d8eb32
Medical Treatment - Title case autoinjector item names (#7974) 2020-10-30 14:45:28 +01:00
PabstMirror
b991fe1343
Arsenal - Sort by protection (helm, uniform, vest) (#7952) 
* Arsenal - Sort by protection (helm, uniform, vest)

* Update fnc_sortStatement_protection.sqf

* split to 2 different sorts
 2020-10-29 11:38:31 -05:00
BaerMitUmlaut
b389740a29
Medical AI - Fix AI healing itself too fast when hit (#7955) 
* Fix AI healing itself too fast when hit

* make time constants gvars

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-29 11:38:24 -05:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions (#7951) 
* adjustable times for most constant treatment times

* add new line, formatting

* cleanup merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag (#7941) 
* medical: allow placing unconscious in a bodybag

* Always show body bag action on non-awake units

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-29 11:37:36 -05:00
Drofseh
ef56a2dc32
Remove MAR-10 magazines from AWM magwell (#7777) 2020-10-29 11:37:15 -05:00
Freddo
afb3dad22b
Markers - Add timestamps (#7947) 
* Add timestamps to markers

* Tiny tweaks

* Update addons/markers/functions/fnc_canTimestamp.sqf

Co-authored-by: Brett <brett@bmandesigns.com>

* Update addons/markers/functions/fnc_initInsertMarker.sqf

Co-authored-by: Brett <brett@bmandesigns.com>

* Add timestamp format setting

* Script cleanup, move checkbox under desc

* Fix stringtable validation

* Tweaks

* Remove styling from stringtable

* Edit timestamps instead of append

Credits to @PabstMirror

Co-authored-by: Brett <brett@bmandesigns.com>
 2020-10-29 11:36:59 -05:00
Daniel Gibson
174223bddf
Medical - Add Treatment Time Addon Settings (#7900) 
* Added Addon Settings for several Medical Treatment Times

Tourniquets, IV Bags, Syringes, Splints, and Body Bags.

* Fixed stringtable indentation

* And again
 2020-10-29 11:07:30 -05:00
mjc4wilton
2220822d30
Gunbag - Add BI Arsenal Compatibility (#7887) 
* Initial Commit

* Remove development components

* Adapt to ACE_player & resolve returned assignment

* Update addons/gunbag/functions/fnc_BIArsenalClose.sqf

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

Co-authored-by: commy2 <commy-2@gmx.de>
 2020-10-29 10:12:51 -05:00
Brett
78c307196d
Medical - Show triage level in interaction (#7940) 
* medical: show triage in interaction

* rename

* clean up comments

* Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf

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

* Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf

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

* Add setting (disabled, enabled, medicsOnly)

* Apply suggestions from code review

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-10-28 19:08:00 -05:00
Brett
a67d6eecb0
Arsenal - Provide reference to the current box (#7948) 
* arsenal: provide ref to current box

* use objNull instead of nil

* Update fnc_openBox.sqf
 2020-10-26 12:01:18 -05:00
PabstMirror
0f6a9ecb87
Zeus - Don't allow creating a new zeus module if we already are one (#7970) 2020-10-25 14:01:59 -05:00
Walthzer
84b18d3f06
Slideshow - Add "SlideChanged" event (#7954) 
* Implement Events in slideshow framework.

* Update function header

* Pass correct agruments to next call of autoTransiton.

* Add return of slideshow ID

Return slideshow ID so it can be stored for later use with the events.

* Replace repeat code with variable. _image.

* Redundant comment removal

* Update addons/slideshow/functions/fnc_createSlideshow.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-10-25 12:14:57 -05:00
Laid3acK
8e999ae0cf
Scopes - Weapons IronSightBaseAngle updated (#7958) 
* spar_IronSightBaseAngle

* spar_IronSightBaseAngle

* spar_IronSightBaseAngle
 2020-10-25 10:49:44 -05:00
Joko
153644b77a
Reload/Interaction - Fix 2 hemtt ingame errors (#7924) 
* fix 2 hemtt ingame errors

* Extract broken calls to function

* Update addons/interaction/functions/fnc_doRemoteControl.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

Co-authored-by: Dystopian <sddex@ya.ru>
 2020-10-21 11:17:42 -05:00
Brett
25cc139dba
Vehicle Lock: add events (#7938) 
* vehiclelock: events

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-21 10:38:07 -05:00
BaerMitUmlaut
e07d2ae5d5
Make refuel nozzle unbreakable (#7957) 2020-10-21 10:37:14 -05:00
Filip Maciejewski
73e151ea5d
Include only highest res mipmaps in maptools overlay textures (#7953) 
2048x2048 boys
 2020-10-10 23:44:11 +02:00
BaerMitUmlaut
4cfe26b842
Disable damage for all cargo objects (#7946) 2020-10-10 18:58:38 +02:00
BaerMitUmlaut
56baf2bfd0
Fix engine fire position of Kamaz trucks (#7945) 2020-10-09 12:55:16 -05:00
Cyruz143
d19bdceda1
Grenades - Remove ref to missing audio (#7928) 
* Remove ref to missing audio

* Removing unused dummy files
 2020-10-09 12:54:41 -05:00
Elgin675
aa74178702
Translation - add/fix french keys in 'explosives' module (#7942) 2020-10-05 11:40:26 -05:00
Björn Dahlgren
8651d4c97d
Fastroping - Fix inconsistent usage of ARR macro (#7936) 2020-10-05 11:40:03 -05:00
Taha
e53bc23ebf
Turkish Language Update (#7909) 
Added missing translation to Turkish
 2020-10-04 10:57:46 -05:00
PabstMirror
5fa490aef3
Update CfgVehicles.hpp (#7935) 2020-10-03 20:21:48 -05:00
Neviothr
6278b67370
Frag - Add frag values to R_MRAAWS_HE_F (#7927) 
* Add frag values to R_MRAAWS_HE_F

* damn tabs

* Use GVAR() macro
 2020-10-03 18:32:21 -05:00
Freddo
e27110aac3
Explosives - Add CBA settings for max/min/default timer values (#7916) 
* Transfer to CBA settings, add timer options

* Remove wiki note

* Tweak arrays, stringtables

* moveToSQF
 2020-10-03 12:00:06 -05:00
Björn Dahlgren
8e7f9b6db5
Medical Treatment - Fix invalid usage of ARR macro (#7933) 2020-10-03 10:21:29 -05:00
Björn Dahlgren
c4e7092ebf
Hearing - Fix invalid usage of ARR macro (#7932) 2020-10-03 10:21:20 -05:00
Björn Dahlgren
2f3732003f
Fastroping - Fix invalid usage of ARR macro (#7931) 2020-10-03 10:21:10 -05:00
Björn Dahlgren
aa3d28e5be
Arsenal - Fix invalid usage of ARR macro (#7930) 2020-10-03 10:20:59 -05:00
Elgin675
f25e023fd6
Translations - Fix french translations (Fastroping) (#7910) 
* Fix french fastroping translations

* Add nickname to 'authors.txt"
 2020-10-03 10:20:46 -05:00
Brett
e2e31efd54
Arsenal - Remove launcher sorts (#7890) 2020-09-29 19:04:37 +02:00
Cyruz143
38baa8dc6c
Check if vehicle has simEnabled before mounting (#7886) 2020-09-03 10:56:49 -05:00
PabstMirror
434b0b9a11 Prep 3.13.4 Build 55 2020-08-30 21:57:20 -05:00
PabstMirror
530b24e893 Merge branch 'master' into release-3.13.4 2020-08-30 21:57:02 -05:00
Cyruz143
ee75268205
Adding splits + torniquets to simple crate (#7885) 2020-08-30 21:55:26 -05:00
PabstMirror
d63c8f37fe
Arsenal - Fix sortPanel script error (#7883) 2020-08-30 09:43:44 -05:00
PabstMirror
6963c4c80f Prep 3.13.4 Build 54 2020-08-28 10:35:10 -05:00
PabstMirror
5a16aa1e8b Merge branch 'master' into release-3.13.4 2020-08-28 10:34:20 -05:00
classic
49c84e2ce1
Update Japanese translation (#7880) 2020-08-28 10:30:32 -05:00
Joko
dd41f3e799
Map Gestures - reduce the size of the procedural texture and don't generate mipmaps (#7876) 
* change procedural texture to static texture existing in a3 Assets

* use a smaller and no mimaps in the procedural texture
 2020-08-27 10:51:49 -05:00
Elgin675
5ee3424d4b
Translations - Update / Fix French Translations (Grenades and Advanced Throwing) (#7871) 
* Translation - add/fix french grenades keys

* Translation - fix french convertExplosives and Convert_Fuse keys

* Translations - fix some french keys in Advanced Throwing module
 2020-08-27 10:45:39 -05:00
Brett
b51cf3575c
Arsenal - Fix sorting when using search (#7877) 
* fix sorting when using search

* remove unused line

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-08-27 10:44:18 -05:00
Brett
241f1aefbd
fix face, voice, insignia in arsenal (#7879) 2020-08-27 10:37:20 -05:00
Brett
572e61d1cf
Arsenal - Fix fire rate sort caused by flashlight (#7878) 
* fix firerate sort caused by flashlight

* Update fnc_sortStatement_rateOfFire.sqf

* Update addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-08-27 10:35:55 -05:00
PabstMirror
b4f7963434 Prep 3.13.4 Build 53 2020-08-24 19:35:36 -05:00
PabstMirror
b4d89e919e
Misc - Fix UBCs (#7870) 2020-08-24 13:31:35 -05:00
Cyruz143
b21535665b
Grenades - Add throwable explosive charges (#7860) 
* First pass on adding throwable explosives

* Moved fnc call to postinit

* Disabled gits auto CRLF bs

* Changing fnc name and call

* Move names to string table

* Using vanilla icon and removing explosive depend

* More stringtable conversions

* Missing semi-colons causing RPT error

* Update addons/grenades/stringtable.xml

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

* Remove empty strings

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add compatibility with "realistic names" modules, and add french translation

* Fix little mistake

* Update addons/grenades/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Add setting

* Change setting name, use ace_settingsInitialized

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
 2020-08-24 12:45:56 -05:00
Elgin675
a919dd70b7
Translations - fix some french keys (ACE Uncategorized menu) (#7866) 2020-08-23 09:05:05 -05:00
Elgin675
61eea98976
Remove "ACE" prefix for Gunbag in Uncategorized menu (#7867) 2020-08-23 14:35:33 +02:00
mharis001
0f08a18f89
Medical - Add force walk option to fracture setting (#7852) 
* Medical - Add force walk option to fracture setting

* Add French translation

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Reduce calls to statusEffect_set (#7865)

* Reduce calls to statusEffect_set

* statusEffect_addType fracture to forcewalk

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-08-22 19:37:15 -05:00
Elgin675
dd2babb833
Translations - Update / Fix French Translations (Arsenal and Map Gestures) (#7863) 
* Translation - Add french "Arsenal_sortBy" keys

* Translation - Add / Fix french Map_Gestures keys
 2020-08-22 11:54:44 -05:00
Elgin675
9c0eebaa07
Map Gestures: Fix Briefing Mode setting strings (#7862) 2020-08-21 13:09:14 +02:00
Neviothr
5326d0acf5
ACE Arsenal - fix #6591, PCML has no ammo (#7850) 
As per @Superxpdude comment - https://github.com/acemod/ACE3/issues/6591#issuecomment-667706600
 2020-08-18 12:49:53 -05:00
Laid3acK
2f9c4b6b41
Ballistics - Add a 5.8mm magazine with the CMR-76 (QBU-88) (#7820) 
* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag
 2020-08-18 12:44:58 -05:00
Joko
bddf74cbb4
Map Gestures - Add Briefingscreen support, Different Camera Range, Improve Responsiveness, and Toggles for Curators and Spectators Maps (#7782) 
* Add Variable Range for Camera Users (Zeus, Spectator) + Settings

Add Setting to Disable Zeus and/or Spectator Map Draws
Add Ability to use Map Gestures on Briefing screen
Add Setting for Briefing Screen mode (All, Only Group, Only Side, Proximity, Disabled)

* disable DISABLE_COMPILE_CACHE

* minor cleanup and add some translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-08-18 12:44:16 -05:00
Brett
d72555ab0c
Arsenal - Add Sorting Algorithms (#7719) 
* support per tab sorting, and external algorithms

* improved sub sorting

* improve alphabetical search

* update mod sorting

* sort by accuracy

* sort right panel

* more sorts

* sort right tab

* fix empty

* stringtables

* Apply suggestions from code review

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

* more suggestions

* suggestions

* remember last sort

* Fix missing throw and put names

* bad copy paste in stringtable

* Update addons/arsenal/functions/fnc_sortPanel.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-08-18 12:43:35 -05:00
mharis001
4d769e4b8f
Cargo - Fix loaded cargo not being deleted when vehicle is destroyed (#7851) 2020-08-18 12:42:09 -05:00
mharis001
c8bb046d31
MicroDAGR - Fix contour interval info showing on compass (#7849) 2020-08-12 01:48:40 -04:00
Mysteryjuju
5c68f1dac3
Trenches - Add settings to configure dig/remove trenches durations (#7831) 
* Trenches - Add settings to configure dig/remove trenches durations

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Remove dirty tabs

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Update French translation

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Update addons/trenches/stringtable.xml

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Trenches - Change SLIDER to TIME settings & update english translations

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Change CBA settings function

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

Co-authored-by: Elgin675 <elgin675@hotmail.com>
 2020-08-09 10:12:54 -05:00
TyroneMF
1626d05201
Small Arms - Add stringtable (#7823) 
* Convert Small Arms to Stringtable

- Convert Small Arms component to stringtable
- Added Vector 45 additional magazines still listed as 30 rounds.

* Newlines end of file

* Fix stringtable

* Remove unnecessary string entries

* Apply suggestions from code review

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-08-09 10:12:30 -05:00
Daniel Lee
c2715a2e41
Add hearing protection to LDF and Spetsnaz helmets (#7843) 2020-08-09 10:11:50 -05:00
Jo David
9ef4371c18
MicroDAGR - Improve item model (#7838) 
* add nicer microdagr model

* rename files
(2 renames because of change in case (MicroDAGR -> microdagr)

* reduce gloss, reduce dirt on screen

* rotate model by 180° and use dummyweapon item model for better ground alignment when placing or dropping the microdagr
 2020-08-06 11:51:29 -05:00
Daniel Lee
48c7738c57
Add G-force reduction to Heli Pilot Coveralls [LDF] (#7825) 2020-08-04 10:43:53 -05:00
Gold John King
b42d6f013d
Update: Minor changes on Simplified Chinese translation. (#7829) 
* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Update SC Translation for triage card

Update SC Translation for triage card

* Update Chinesesimp Translations

Update: usage for doing something in SC.
Update: Bandaging action in SC.

* Update: Unlock action for SC Translation

Update: Unlock action for SC Translation
 2020-08-04 10:15:03 -05:00
Björn Dahlgren
7446ca1655
View Distance - Update view distance on video options changes (#7824) 2020-08-04 10:02:01 -05:00
Daniel Lee
7bc28768da
Add Contact CBRN facewear overlays (#7826) 2020-08-04 09:27:51 -05:00
Jo David
e8210fb56b
reduce gps model vertex count from 3623 to 200 (#7827) 2020-08-04 09:26:29 -05:00
Mysteryjuju
02a242b6e7
Enable trenches on snow on Thirsk Winter map (#7830) 
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
 2020-08-04 09:21:29 -05:00
Vdauphin
d3727d7c27
Tagging - Add: Support of localized string for tagging interaction (#7819) 
* Add support of localized string

* Add: Support of localized string for tagging interaction

https://github.com/acemod/ACE3/pull/7819#issuecomment-663993956

* Update addons/tagging/functions/fnc_applyCustomTag.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-07-27 09:08:37 -05:00
Brandon Danyluk
6b674f5395
Add config option for the use of pilot camera for weapons on that turret (#7812) 2020-07-22 10:37:56 -05:00
Whigital
a5fba9fe8e
RHS Compat - Add RHS:SAF compat (#7793) 
* initial skeleton

* mrud mines

* more mines

* explosives

* compat checking

* ballistics

* handgun

* ak api
 2020-07-22 10:36:57 -05:00