Commit Graph

14502 Commits

Author SHA1 Message Date
Dystopian
27bd25c4b8
Interact Menu - Simplify fnc_renderActionPoints (#8186)
* Simplify fnc_renderActionPoints

* Replace nil-count with forEach
2021-07-24 12:10:49 -05:00
Elgin675
46df1bd811
Translations - Update / Fix French Translations (Markers, Medical Damage and Medical Treatment) (#8334)
* French translation - fix typo

* French translation - add french translation of `STR_ACE_Markers_MarkerDirectionScaleSlider_Tooltip` key

* French translation - Add french translation of `Medical_Treatment_CPRSuccessChance` keys
Fix french translation of `Medical_Treatment_TreatmentTimeCPR_DisplayName` key
2021-07-24 02:40:36 -05:00
DomT602
cb3adc22c0
RHS ARF Compat - Add ammo URAL & Kamaz, wirecutter backpacks and crew helmet (#8308)
* RHS ARF Compat - Add ammo URAL & Kamaz

Add the RHS_Ural_Ammo_Base and rhs_kamaz5350_ammo_base into the config to allow them to be used for rearming.

* Add wire cutter backpacks

* Missed the inheritance

* Add new tank crew helmet
2021-07-24 00:23:23 -05:00
Yannis Li
0e043e5fb7
fix: change conditional so a magazine is added to turret when array is not modified (#8287)
Co-authored-by: Yannis Li <yannis@trybe.ly>
2021-07-24 00:20:17 -05:00
Joko
08eadc7c19
Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
10Dozen
0b7aa7f3e5
Overheating - Drop jammed states on unit respawn (#8333)
* Overheating - Added respawn handler to drop jammed state

Fixes https://github.com/acemod/ACE3/issues/7651

* Description update

* Update addons/overheating/functions/fnc_handleRespawn.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:48:16 -05:00
Serg Vergun
489fab4cb8
Cargo - Prevent damage to items (created from classnames) on unloading (#8324) 2021-07-23 22:45:36 +02:00
Dystopian
35290a1a10
Interact Menu - Add settings for self interaction menu reordering (#8036) 2021-07-23 22:44:27 +02:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon (#8329)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
BaerMitUmlaut
c7ff918554
Medical Engine - Disable third party medical systems (#8289)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 21:32:36 +02:00
Lupus the Canine
4ae4dba3bb
DAGR - Align underlining in waypoint editing page (#8313)
* Allign uderlining in DAGR waypoint editing

* Removed duplicated DAGR_MENU_PSELECTION8
2021-07-23 13:51:35 -05:00
Dystopian
ad41bf2c60
Dragging - Add more objects configs (#8104)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 16:11:57 +02:00
pterolatypus
c81f371f5d
Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) (#7983) 2021-07-23 15:59:32 +02:00
BaerMitUmlaut
88bbb0dd69
Medical - Add functions to serialize / deserialize the medical state of a unit (#7944) 2021-07-23 15:49:04 +02:00
PabstMirror
65f172bb4b
Tools - Update includes (#8331) 2021-07-23 15:09:09 +02:00
10Dozen
d3ee39d8e4
Markers - Add direction/scale reset on Right Mouse Button (#8319)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:06:31 +02:00
Serg Vergun
5e56885b1e
Fix category duplication in Russian (#8326) 2021-07-22 11:59:17 -05:00
Kyle Mckay
e870e2f1f9
Common - Improve vehicle icon caching implementation (#8318)
* Use native hashmap for common vehicle icon caching

Should be more optimised
2021-07-18 18:26:23 +01:00
PabstMirror
75934f883c
Rangecard - All use inside vehicles via interaction menu (#8310) 2021-07-07 12:10:35 -05:00
StuntKeeper
1b43cd6951
Added missing Russian translations (#8307)
Added missing Russian translations and fixed a few incorrect ones in acemedical.
2021-07-06 14:25:52 -05:00
Elgin675
238d285344
French translation : fix Mine M6 and IED french translations (#8309) 2021-07-06 14:25:10 -05:00
Brandon Danyluk
25b1b47f5f Merge branch 'missileDynamics' of https://github.com/TheCandianVendingMachine/ACE3 into missileDynamics 2021-07-02 17:47:29 -06:00
Brandon Danyluk
d50491f44f Destroy projectile on all clients
The projectile needs to be destroyed on all clients to stop it from being simulated. If not destroyed where projectile is local, it will still explode when hitting the ground. If not destroyed on remote clients, the projectile will still be visible but deal no damage
2021-07-02 17:47:15 -06:00
Brett
8bd755e40a
capitalize huntir monitor (#8303) 2021-07-02 16:42:23 -05:00
PabstMirror
5acc2775ee Update 9m14_joystick.p3d
removed p:\ part from proxy path:
was: `\p:\a3\data_f\proxies\gunner_static_low01\gunner.p3d`
2021-07-02 11:46:58 -05:00
PabstMirror
dd83d4e720
release drafter - ignore dependencies (#8302) 2021-07-01 13:42:40 -05:00
Björn Dahlgren
2513ef25de
Add optionals to validation tools (#8290) 2021-06-29 13:21:08 -05:00
PabstMirror
59e3b07c36
Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -05:00
PabstMirror
2fc352f461
Vscode - Add test/build tasks (#8298)
Delete tasks.json
2021-06-28 00:01:04 -05:00
BaerMitUmlaut
9291d9b714
Medical - Hide cursor when unconscious (#8269)
* Hide cursor when blocking inputs

* Update addons/common/DisableMouseDialog.hpp

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

* Update addons/common/functions/fnc_disableUserInput.sqf

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

* Update addons/common/DisableMouseDialog.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-06-27 15:39:17 -05:00
BaerMitUmlaut
2ea0106550
Vehicle Lock - Increase vehicle key mass to 0.1 (#8270)
* Increase vehicle key mass to 0.1

* Update addons/vehiclelock/CfgMagazines.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-06-27 15:38:34 -05:00
mharis001
97ac12039f
Interaction - Disable open box action when inventory is locked (#8285) 2021-06-27 15:24:41 -05:00
mharis001
da3251c641
Explosives - Fix missing action name for setup helper object (#8288) 2021-06-27 15:17:25 -05:00
Brett
a417ea87d3
Arsenal - Add on loadout delete event (#8294) 2021-06-27 21:08:39 +02:00
Brett
2507e8f36b
fix minor cut re-opening (#8296) 2021-06-27 13:25:55 -05:00
PabstMirror
f8d2837b36
Parachute - Put both setting in same subcategory (#8299) 2021-06-27 13:01:56 -05:00
Brett
d5bc7f10f5
fix my name, add it to contributers (#8295) 2021-06-27 07:01:12 +02:00
mharis001
cc0d2424d4
Attach - Improve IR Strobe blinking pattern and increase lifetime (#8283)
* Improve IR Strobe blinking pattern and increase lifetime

* Improve readability of maxLifetime entry

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

* Apply suggestions from code review

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

Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2021-06-20 23:37:57 -05:00
Brandon Danyluk
d8eb425ece Better flare decoy calculation 2021-06-11 22:02:59 -06:00
Brandon Danyluk
038c82a489 better JDAM simulation
Attack heading and impact angle now are followed better
2021-06-11 20:37:36 -06:00
Brandon Danyluk
8142bb069b remove TERCOM guidance 2021-06-11 18:44:02 -06:00
Brandon Danyluk
4308d33c50 remove testing constants 2021-06-06 20:28:39 -06:00
Brandon Danyluk
79c6bf9167 Change GBU navigation 2021-06-02 00:34:48 -06:00
Brandon Danyluk
7cf29ba715 work on parsing heightmap 2021-06-01 14:13:45 -06:00
Sergey Veryaskin
c8812e093a
up russian language (#8263)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-05-25 21:06:00 -05:00
Brandon Danyluk
e6fcd110d2 add TERCOM state defines 2021-05-24 21:53:19 -06:00
Brandon Danyluk
597e188b9a Merge branch 'missileDynamics' of https://github.com/TheCandianVendingMachine/ACE3 into missileDynamics 2021-05-23 17:38:05 -06:00
Brandon Danyluk
f89bf62242 progress update: tercom now flies to acquisition basket 2021-05-23 17:38:00 -06:00
Elgin675
e4a96b7229
Update French Translation and Fix Typo (#8262) 2021-05-23 16:57:36 -05:00
Dystopian
b04b92c505
Fix make after hemtt pack (#8264) 2021-05-23 16:55:30 -05:00