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,892 Commits 73 Branches 88 Tags 752 MiB
28c166d650
Commit Graph

12175 Commits

Author SHA1 Message Date
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
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
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
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
BaerMitUmlaut
54c9cf6c61
S.O.G. Prairie Fire Compatibility (#8284) 
* Added initial compat

* Added G-Forces compatibility

* Added Reload compatibility

* Add fuel capacities to planes and helicopters

* Add fuel capacities to wheeled and tracked vehicles, added fuel cargo config

* Add fuel capacities to OH-6

* Removed custom fuel capacities from Mi-2 with external tanks

* Fix config errors

* Add CSW compatibility for static guns

* Add ACE arsenal to EMM main menu

* Add CBA versioning check for SOG:PF

* Add vn_emm to requiredAddons

required for main menu patching

* Fix arsenal not being added to main menu

* Fix styling of ACE Arsenal button

* Add CSW compat for mortars

* Disable dragging of large statics

* Disable frag for molotov

* Set damage type of melee ammo

* Add custom damage handling for punji traps

* Add ACE Explosives compat to M18 Claymores

* Improve digDistance of Claymore x3

* Add ACE Explosives compat to M14 and M16 mines

* Add Explosives compat for M16 Trip Wire mines

* Add Explosives compat for F1 Trip Wire mines

* Add Explosives compat for Arty Shell Trip wire mine

* Improve interaction points for explosives

* Add Explosives compat for Satchel charge and AT mine

* Add Explosives compat for Punji traps, improve comments

* Add Explosives compat to M112 Breaching charge

* Rename mines.hpp to explosives.hpp

* Allow digging spiderholes with entrenching tool

* Fix minor config errors

* Add CSW pictures, models and stringtable entries

* Add missing stringtable entries

* Add CSW weapon pictures and stringtable entries

* Handle punji trap damage with disabled medical

* Disable cookoff for bicycles

* Remove custom digging tools (needs deeper changes)

* Improve spiderhole digging translation

* Fill CfgPatches units and weapons arrays for Zeus

* Add witty comment

* Use lowercase for external component names

* Fix indentation

* Fix missing base class

* Remove accidentally added files

* pboProject fixes for S.O.G. Prairie Fire Compatibility (#8311)

* Change macros to work with pboproject

* Add placeholders for VN p3d files

* Add ending newlines

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

* Fix UBC

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-10-05 13:28:43 +02:00
mharis001
66ce0ba5ff
Arsenal - Restore curator camera state when exiting (#8464) 2021-10-02 06:52:50 -04:00
mharis001
310da98c5e
Arsenal - Fix updateUniqueItemsList incorrectly identifying backpacks (#8463) 2021-10-02 06:52:33 -04:00
mharis001
64db683e53
Arsenal - Fix items in custom panels having mass of zero (#8462) 2021-10-02 06:52:20 -04:00
Filip Maciejewski
9eb615ee66
Various polish translation updates (#8465) 2021-10-01 21:55:17 -05:00
Filip Maciejewski
3b90b5eb7f
Grenades - Polish translations updates (#8466) 
* Grenades - Polish translations updates

* Remove rogue tab
 2021-10-01 21:55:03 -05:00
Filip Maciejewski
26d0a85650
Medical - Polish translations updates (#8467) 2021-10-01 21:51:19 -05:00
PabstMirror
d8fa8220c4
Realisticnames - Fix ubc (#8421) 2021-09-25 15:03:09 -05:00
Salluci
48912be73c
Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388) 
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-09-25 11:16:15 -05:00
Salluci
f9d064e5f4
Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
Vdauphin
e31d931078
Cargo - Fix can't load Slingload_01_Base_F (#8437) 
* fix can't load Slingload_01_Base_F

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)

* add a comment next to the changed line 

add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
 2021-09-25 10:55:47 -05:00
Salluci
d5328781db
DAGR / Kestrel - Fix deviceKey condition (#8368) 
* Fix DAGR keybind

* Fix Kestrel keybind

* Consistency with other deviceKey conditions
 2021-09-25 10:43:09 -05:00
Salluci
a4f24cbe3d
CSW - Fix AI reloading from GroundWeaponHolder (#8399) 
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
 2021-09-25 10:39:03 -05:00
Salluci
82a8350fb4
Add weapon data for the Contact M14 (#8412) 2021-09-25 10:35:45 -05:00
Dystopian
7687429b82
Fix keyhandler removing when drop (#8443) 2021-09-18 11:06:01 -05:00
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05:00
Elgin675
565aa8cf0e
Add French Translation (#8427) 2021-09-07 13:35:16 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235) 
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

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

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-09-03 19:08:34 -05:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162) 
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-09-03 14:50:54 -05:00
Brandon Danyluk
0f7376f60c
Vehicles - Add Auto-Throttle to Planes (#8275) 
* Add auto throttle to planes

* add newline

* clarify things

* Use a better deltaTime value. Takes into account game pause

* add coment

* Add auto throttle cancellation on user input

* misc fixes
 2021-09-03 14:39:52 -05:00
Salluci
be8a50c8a9
Captives - Add caller to captiveStatusChanged event (#8360) 
* Add caller to ace_captiveStatusChanged event

* missing bracket

* Spaces, default value for _caller in setHandcuffed

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

* use default value in SetSurrendered

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

* update function example in doRemoveHandcuffs

* fix undefined variable

a lesson in not copy-pasting code

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

* ditto last commit

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-09-03 14:38:49 -05:00
∂ω∂
f7126383fe
Medical - Add treatment status events (#8385) 
* Medical: Add item params to ace_treatmentSucceded

* Medical: Add treatment[Started,Failed] events
 2021-09-03 14:37:48 -05:00
Salluci
ce91d19f28
Realistic Names - Add strings for Khaki MX variants (#8411) 
* Add Khaki MX variants

* German Translations

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

* Translations

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

* Translations

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

* Whoops

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

* Capitalize

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-09-03 14:36:58 -05:00
Salluci
ee44319801
Fix typo (#8416) 2021-09-01 12:46:48 -05:00
Salluci
afde782d12
change 7.62x67 to .300 WM (#8395) 2021-09-01 12:12:22 -05:00
Salluci
b6c86d8a8a
Add MRAWS/Vorona support to reload_launchers (#8408) 2021-09-01 12:11:58 -05:00
Salluci
10e56c090d
Cleanup config & allow LIM-85 to swap barrel (#8409) 2021-09-01 12:11:02 -05:00
PabstMirror
0c1d7177c0
Common - Block user input on headbug fix (#8398) 
* Common - Block input on headbug fix

* keep return
 2021-08-28 14:56:13 -05:00
Salluci
039af66a8f
Medical - Fix #8389 (#8390) 
* fix implicit dependency between medical damage and medical engine

* move stringtable

* valve pls fix

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-08-23 18:27:00 -05:00
PabstMirror
83cbec73ce
medical - re-enable movedToSQF for enableVehicleCrashes (#8391) 2021-08-23 18:26:32 -05:00
Serg Vergun
0d5a4d89d8
Remove duplicates from mags array (#8367) 2021-08-23 12:44:06 -05:00
Salluci
2944064c06
Add spare barrel to misc items (#8374) 2021-08-23 12:43:05 -05:00
Kyle Mckay
56123591a0
Update contribution documents (#8382) 
* Update code guidelines for script_component

* Update contributing documents for pull requests

- Reflect true attribution practices
- Reflect true merge process (this changed a long time ago)

* Remove listed maintainer from component readmes

We have almost never used these and serve as a source of confusion for
new contributors.
 2021-08-16 20:17:56 +01:00
Kyle Mckay
62679832df
Zeus - Move to native CBA Settings (#8381) 
* Zeus - Move to CBA settings

* Zeus - Update BI module functions to 2.04 versions
 2021-08-16 12:01:50 +01:00
Sergey Veryaskin
106ef17071
Translation - Russian (#8376) 
* Translation - Russian

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-08-11 15:44:04 -05:00
PabstMirror
e6a0772adb
Cargo - Fix UBC on iDAB (#8358) 2021-08-06 15:15:20 -05:00
Vdauphin
34069ed031
Update CfgVehicles.hpp (#8344) 2021-08-04 12:34:44 -05:00
Serg Vergun
3827178606
Remove 4th never used parameter (#8342) 2021-08-03 13:06:12 -05:00
Brandon Danyluk
82c14a0ae2 SACLOS tweaks 2021-08-02 17:32:35 -06:00
Brandon Danyluk
98e66d20ab remove malyutka 2021-08-02 16:53:14 -06:00
Brandon Danyluk
76c5c6e6d3 make over-fly trajectory over-fly 2021-08-02 16:51:46 -06:00
Brandon Danyluk
7b7d79fbd3 fix uninitialised values 2021-08-02 16:28:29 -06:00
Brandon Danyluk
aff19ec6ea fix NLAW navigation profile 2021-08-02 16:22:38 -06:00
Serg Vergun
fa6da1ae7c
Vehicles - Add configurable engine startup delay (#8327) 
* Add configurable engine startup delay

* add suggested change

Add space char

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

* Squashed commit of the following:

commit 14f5483d8fa49d36effa8b18a3df392ed39b19da
Author: Serg Vergun <1197314+severgun@users.noreply.github.com>
Date:   Fri Jul 23 20:23:52 2021 +0300

    Add 0 cap and update docs

commit e3ce7f273882b3f4e2cba916c39b506f857b20db
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:42:42 2021 +0300

    add parentheses

commit b36eedc61b5e6bb868c37901bd4191767fbdaff8
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:34:30 2021 +0300

    Add ability to set engine startup delay per vehicle by script

* Change function name

* add suggested exitWith condition

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

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

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

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-07-27 12:47:07 -05:00
PabstMirror
fafd7b3928
Inventory - Fix default return for currentItemListBox (#8340) 2021-07-27 12:39:45 -05:00
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
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
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
59e3b07c36
Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -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
PabstMirror
e3e3605007 fix tabs in aim9 2021-05-23 16:46:46 -05:00
PabstMirror
9122535daa Fix tabs and manpad UBC 2021-05-23 16:38:45 -05:00
LorenLuke
52116c7fae Changes poisson disc to centered random. (#8257) 
It looks nicer and distributes more realistically. I don't know what I was thinking when I first put in poisson disc.
 2021-05-23 16:38:45 -05:00
PabstMirror
d3de5a9e69 Patachute - Add sound effect when cutting (#8239) 2021-05-23 16:38:44 -05:00
Drofseh
e082d7523f Fix wrong shot size in birdshot strings (#8253) 2021-05-23 16:38:44 -05:00
JoramD
ede5c1da58 Night Vision - Add color variants to all generations (#8209) 2021-05-23 16:38:44 -05:00
jonpas
a715a5f52e Markers - Fix JIP scale (#8248) 2021-05-23 16:38:44 -05:00
JoramD
00eead47c1 Parachute - Add failure chance (#8226) 
* Initial push

* disable forgotten define

* Improve exitWith check

* Requested/suggested changes

* Requested changes

* Requested changes
 2021-05-23 16:38:44 -05:00
Lupus the Canine
4726108c8e Cargo - paradrop fixes (#8203) 
* Small fixes in ace_cargo

Makes paradropItem and unloadItem invoke event "ace_cargoUnloaded" with parameters _itemObject, _vehicle and "paradrop" or "unload" respectivelty.
paradropItem invoked said event but if item was classname it would send classname to event which is not particularly useful.

* Update XEH_postInit.sqf

Moved event invocation to unloadItem, this provides ability to always pass object to eventhandlers.

* code refactor

refactored according to https://github.com/acemod/ACE3/pull/8203#discussion_r610394484

* Update fnc_paradropItem.sqf

apply new fix

* Revert "Update fnc_paradropItem.sqf"

This reverts commit 3db5cc1910.

* Update fnc_paradropItem.sqf

fixed hint that was broken by previous fixes

* style check

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

* style check

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

* naming convention

replaced object references called _item with _object.

* Update fnc_paradropItem.sqf

Co-authored-by: commy2 <commy-2@gmx.de>
 2021-05-23 16:38:44 -05:00
PabstMirror
c425b35c5f Markers - Fix marker scale (#8233) 2021-05-23 16:38:44 -05:00
Dedmen Miller
825596bffe Attach - Added attached/detaching events (#8193) 
* Added ace_attach attached/detach events

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:44 -05:00
Abogado
cc0d8a5ada Translations - Spanish (#8229) 
Complete to date spanish translation.
 2021-05-23 16:38:44 -05:00
JoramD
e2e747e169 MicroDAGR - Add mode switching keybinds (#8216) 
* Initial push

* Mode cycling

* Use defines
 2021-05-23 16:38:44 -05:00
JoramD
d8bdde07b3 Initial push (#8225) 2021-05-23 16:38:43 -05:00
frankplow
f1338e65f4 Markers - Add scale slider (#8059) 
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:43 -05:00
jonpas
a80a0b870b Interact Menu - Make List default (#8217) 2021-05-23 16:38:43 -05:00
Dystopian
89fb57fdcf User Interface - Add setting for Development Build watermark (#8140) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:43 -05:00
TyroneMF
d41c5bd053 Dragging - Fix build issue (#8219) 2021-05-23 16:38:43 -05:00
Dániel Boros
026b94903e Dragging - Add new dragging animations (#7950) 
* New custom animation added

* Adjusted CfgMoves and the script components

* New drop animation and key handler

* CBA settings and new ManActions added

* Adjustments to the drop animation

* Added translations and fixed some stuff

* Update CfgMovesBasic.hpp

* Fix translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Use the same key to drop object

* Update addons/dragging/stringtable.xml

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

* Fix French translation

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

* Lower the weapon accuracy of the drag animations

* Removed auto-switch to handgun

* Update fnc_startDrag.sqf

 - Holding a launcher breaks the firing animation.
 - Now the unit has to hold either a primary weapon or handgun.

* Handle the unit's current weapon

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

* Update addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf

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

* Update addons/dragging/initSettings.sqf

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:43 -05:00
Salluci
c7d4981329 Medical - Add Vehicle Crashes setting (#8149) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:43 -05:00
PabstMirror
e3a3e29444 Tools - Add script to check sqf/config with sqfvm (#8137) 2021-05-23 16:38:43 -05:00
Kyle J. McKeown
7c879976ce Name Tags - Add ability to set custom rank icon (#8174) 2021-05-23 16:38:43 -05:00
Steve Zhao
fa870a3ccd Medical - Allow unconscious unit in Taru pods (#8168) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-05-23 16:38:43 -05:00
R3voA3
517b576193 Map - Fix stuck map compass size (add 0.1 zoom duration) (#8176) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-05-23 16:38:43 -05:00
commy2
9d6843fdb3 Fix Injured Sounds Not Playing At Altitudes Above 70 (#8212) 2021-05-23 16:38:43 -05:00
Brett
b181f1badf Medical - Add Alternative Survival Chance (#8192) 
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
 2021-05-23 16:38:43 -05:00
jonpas
4e3d3ceeae Mk6 Mortar - Fix README.md typo (#8205) 2021-05-23 16:38:43 -05:00
Pascal Dunaj
44ecfc8ac3 Typo in usage example (#8201) 2021-05-23 16:38:43 -05:00
PabstMirror
c5972e692c Various - Add missing units/weapons to cfgPatches (#8175) 
* Various - Add missing units/weapons to cfgPatches

* Update config.cpp
 2021-05-23 16:38:42 -05:00
Brandon Danyluk
2694453b56 init commit of cruise missile 2021-05-23 00:24:13 -06:00
Brandon Danyluk
22e5596399 Add missile hiding for malyutka 2021-05-21 15:36:32 -06:00
LorenLuke
750030c6f1
Changes poisson disc to centered random. (#8257) 
It looks nicer and distributes more realistically. I don't know what I was thinking when I first put in poisson disc.
 2021-05-20 13:08:37 -05:00
PabstMirror
99bfef1592
Patachute - Add sound effect when cutting (#8239) 2021-05-19 23:39:34 -05:00
Brandon Danyluk
790faf1c21 Add settings for various things 2021-05-18 21:32:04 -06:00
Brandon Danyluk
395b2b2d12 Avoid overshooting target 2021-05-18 04:12:44 -06:00
Brandon Danyluk
f7bd523221 Update doppler seeker to allow the tracking and killing of projectiles 2021-05-18 03:44:05 -06:00
Brandon Danyluk
36d75765c6 avoid making un-needed calls to the server 2021-05-18 03:18:42 -06:00
Brandon Danyluk
e67aefcf51 change events to allow for any number of arguments 2021-05-18 02:46:30 -06:00
Brandon Danyluk
72ca725242 add local event for mission makers 2021-05-18 02:42:42 -06:00
Brandon Danyluk
f825d6ff92 Only launch if we are above a threshold angle 2021-05-18 02:37:34 -06:00
Brandon Danyluk
a25cf7031b Optimise iron dome 2021-05-18 02:23:52 -06:00
Brandon Danyluk
980c3d0546 Add Iron Dome interceptor API 2021-05-18 00:32:55 -06:00
Drofseh
be1045c43f
Fix wrong shot size in birdshot strings (#8253) 2021-05-09 17:13:07 -05:00
JoramD
2e1e6daef5
Night Vision - Add color variants to all generations (#8209) 2021-05-09 18:49:56 +02:00
jonpas
97701fc075
Markers - Fix JIP scale (#8248) 2021-05-08 23:30:09 -05:00
Brandon Danyluk
b82484b73c add trail to vikhr 2021-05-08 03:11:20 -06:00
Brandon Danyluk
6165be0c2f tweak Vikhr guidance 2021-05-08 03:10:19 -06:00
Brandon Danyluk
c71be6543e tweak metis guidance params 2021-05-08 03:04:29 -06:00
Brandon Danyluk
ef529d286f tweak HOT guidance params 2021-05-08 03:00:51 -06:00
Brandon Danyluk
175652456b add the ability to see a light trail 2021-05-08 02:49:16 -06:00
Brandon Danyluk
5315b11177 add MCLOS guidance 2021-05-08 02:49:07 -06:00
Brandon Danyluk
fc7b310529 Add realistic 9m14 behaviour 
the 9m14 control joystick can attach 4 9m14 launchers at a time. Replicate that here
 2021-05-08 02:48:40 -06:00
Brandon Danyluk
8b3e90925e Add joystick model 2021-05-07 04:19:26 -06:00
Brandon Danyluk
f4f3224947 fix game crashing on load 2021-05-06 20:20:20 -06:00
Brandon Danyluk
e76fde4c0d perplexed 2021-05-06 20:03:59 -06:00
Brandon Danyluk
a0e193a241 crash on load 2021-05-06 19:18:44 -06:00
Brandon Danyluk
d8fb60808a update stringtables so they are in titlecase 2021-05-06 19:06:10 -06:00
Brandon Danyluk
20a3277ac8 init commit 9m14 2021-05-06 15:01:50 -06:00
Brandon Danyluk
80b2595abb tabs -> spaces again 2021-05-02 01:40:23 -06:00
Brandon Danyluk
7988469fe3 localise vikhr 2021-05-02 01:37:03 -06:00
Brandon Danyluk
72297be13e localise sdb 2021-05-02 01:31:52 -06:00
Brandon Danyluk
0a28e3e5a3 localise sam 2021-05-02 01:28:28 -06:00
Brandon Danyluk
f45ee879ac localise missile guidance 2021-05-02 00:34:45 -06:00
Brandon Danyluk
0d38505ea3 localise maverick 2021-05-02 00:17:13 -06:00
Brandon Danyluk
5edabba174 actually localise manpad 2021-05-02 00:04:11 -06:00
Brandon Danyluk
c67bc4d98e localise manpad 2021-05-02 00:00:56 -06:00
Brandon Danyluk
c0e623af9b fix IR tracker losing lock immediately due to being blocked by launcher 2021-05-01 23:58:15 -06:00
Brandon Danyluk
988768ae3d localise gbu 2021-05-01 23:36:45 -06:00
Brandon Danyluk
f12e93414a localise aim9 2021-05-01 23:32:37 -06:00
Brandon Danyluk
79bd76a9a1 localise aim120 2021-05-01 23:20:50 -06:00
Brandon Danyluk
89e64dfcdc tabs -> spaces 2021-05-01 23:04:08 -06:00
Brandon Danyluk
f3bea7bb30 change how IR seeker performs 
The angle check is better now. Relative velocites guarenteed
 2021-05-01 22:58:11 -06:00
Brandon Danyluk
356ff4ce4d Tweak hellfire attack profile 2021-05-01 22:04:11 -06:00
Brandon Danyluk
b4e5a29119 Add hellfire mid course guidance 2021-05-01 21:42:49 -06:00
Brandon Danyluk
edc8250be2 fix missing semicolons 2021-05-01 21:36:20 -06:00
Brandon Danyluk
de05c68f99 Process all navigation onFired. Send the correct array to function 2021-05-01 20:55:26 -06:00
Brandon Danyluk
197c1a7cae Add new navigation profile. Tweak javelin mid-course guidance 2021-05-01 20:34:41 -06:00
Brandon Danyluk
f5b316176c Add paremter to allow weathervaning 
Weapons usually tend toward the velocity vector due to aerodynamics - calculate side slip and use calculation to do this
 2021-05-01 20:19:22 -06:00
JoramD
60cab0af6b
Parachute - Add failure chance (#8226) 
* Initial push

* disable forgotten define

* Improve exitWith check

* Requested/suggested changes

* Requested changes

* Requested changes
 2021-04-30 22:48:02 -05:00
Lupus the Canine
2973ea5814
Cargo - paradrop fixes (#8203) 
* Small fixes in ace_cargo

Makes paradropItem and unloadItem invoke event "ace_cargoUnloaded" with parameters _itemObject, _vehicle and "paradrop" or "unload" respectivelty.
paradropItem invoked said event but if item was classname it would send classname to event which is not particularly useful.

* Update XEH_postInit.sqf

Moved event invocation to unloadItem, this provides ability to always pass object to eventhandlers.

* code refactor

refactored according to https://github.com/acemod/ACE3/pull/8203#discussion_r610394484

* Update fnc_paradropItem.sqf

apply new fix

* Revert "Update fnc_paradropItem.sqf"

This reverts commit 3db5cc1910.

* Update fnc_paradropItem.sqf

fixed hint that was broken by previous fixes

* style check

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

* style check

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

* naming convention

replaced object references called _item with _object.

* Update fnc_paradropItem.sqf

Co-authored-by: commy2 <commy-2@gmx.de>
 2021-04-30 22:38:57 -05:00
PabstMirror
537e5d7cb0
Markers - Fix marker scale (#8233) 2021-04-26 17:31:59 -05:00
Dedmen Miller
d50515694c
Attach - Added attached/detaching events (#8193) 
* Added ace_attach attached/detach events

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-26 11:56:11 -05:00
Abogado
f96b410fa0
Translations - Spanish (#8229) 
Complete to date spanish translation.
 2021-04-26 11:48:02 -05:00
JoramD
3a74ed3125
MicroDAGR - Add mode switching keybinds (#8216) 
* Initial push

* Mode cycling

* Use defines
 2021-04-21 22:37:25 -05:00
JoramD
5a57b9fdc5
Initial push (#8225) 2021-04-21 22:32:05 -05:00
Brandon Danyluk
73b059859c fix all script components 2021-04-21 15:58:39 -06:00
Brandon Danyluk
6cfc0754d8 Add action to get into jdam settings 2021-04-21 15:53:52 -06:00
Brandon Danyluk
73980337b7 Fix Wiesel ATGM animation. Tweak SACLOS values 2021-04-21 15:16:38 -06:00
Brandon Danyluk
a057768e7f remove debugh print 2021-04-21 15:03:49 -06:00
frankplow
6843a221ad
Markers - Add scale slider (#8059) 
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-21 22:36:08 +02:00
jonpas
ae33943973
Interact Menu - Make List default (#8217) 2021-04-21 22:35:35 +02:00
Brandon Danyluk
675b07d2ed Add all ground based missiles. Tweak AIM-9 flare angle 2021-04-21 13:41:23 -06:00
Brandon Danyluk
cba9dcd8e7 fix SAM animations 2021-04-21 12:48:44 -06:00
Brandon Danyluk
a91b3aa1c9 Add long range SAMs 2021-04-21 01:41:56 -06:00
Brandon Danyluk
6b3be24be7 Add Vikhr ATGM 2021-04-21 00:52:55 -06:00
Brandon Danyluk
ba2eb48a43 update todo 2021-04-21 00:24:39 -06:00
Brandon Danyluk
afbb1f66c0 update todo 2021-04-21 00:24:15 -06:00
Brandon Danyluk
19dcf00aff Fix NLAW and PLOS 
The missile pitches up due to initial angle stuff. I don't know if this is behaviour we want to fix or not?
 2021-04-21 00:23:21 -06:00
Brandon Danyluk
9d26335271 Fix SACLOS missiles 2021-04-20 18:11:44 -06:00
Brandon Danyluk
aea24c6de4 Better attack angle calculation. Does not get exactly right, but works for all cases. 
Need to implement a PID controller navigation type to get a correct attack angle
 2021-04-20 15:31:38 -06:00
Dystopian
5aa715689b
User Interface - Add setting for Development Build watermark (#8140) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-20 23:26:48 +02:00
Brandon Danyluk
438cb8b90f tweak JDAM guidance 2021-04-20 11:10:29 -06:00
TyroneMF
a82cd2f6d1
Dragging - Fix build issue (#8219) 2021-04-20 17:37:22 +02:00
Dániel Boros
af54808f67
Dragging - Add new dragging animations (#7950) 
* New custom animation added

* Adjusted CfgMoves and the script components

* New drop animation and key handler

* CBA settings and new ManActions added

* Adjustments to the drop animation

* Added translations and fixed some stuff

* Update CfgMovesBasic.hpp

* Fix translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Use the same key to drop object

* Update addons/dragging/stringtable.xml

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

* Fix French translation

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

* Lower the weapon accuracy of the drag animations

* Removed auto-switch to handgun

* Update fnc_startDrag.sqf

 - Holding a launcher breaks the firing animation.
 - Now the unit has to hold either a primary weapon or handgun.

* Handle the unit's current weapon

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

* Update addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf

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

* Update addons/dragging/initSettings.sqf

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-20 13:33:58 +02:00
Salluci
f6cefa76a2
Medical - Add Vehicle Crashes setting (#8149) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-20 13:10:50 +02:00
PabstMirror
88b1c5b917
Tools - Add script to check sqf/config with sqfvm (#8137) 2021-04-20 12:39:05 +02:00
Kyle J. McKeown
5aa6e564e0
Name Tags - Add ability to set custom rank icon (#8174) 2021-04-20 12:00:36 +02:00
Steve Zhao
dd454bdfbe
Medical - Allow unconscious unit in Taru pods (#8168) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-04-20 11:59:11 +02:00
R3voA3
5f1724d9b9
Map - Fix stuck map compass size (add 0.1 zoom duration) (#8176) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-04-20 11:57:33 +02:00
Brandon Danyluk
12bcb95e93 fix gimbal lock via rotating with quaternions 2021-04-19 21:31:15 -06:00
Brandon Danyluk
1cb84087c3 update todo 2021-04-19 01:41:48 -06:00
Brandon Danyluk
44b7b874fd Add SDB and JDAM 2021-04-19 01:27:49 -06:00
Brandon Danyluk
3878c67c87 add TOO TGP 2021-04-18 23:05:56 -06:00
Brandon Danyluk
e1cdbb777f Add GPS selector dialog for GPS munitions 2021-04-18 03:30:10 -06:00
commy2
72b88cc6dc
Fix Injured Sounds Not Playing At Altitudes Above 70 (#8212) 2021-04-17 22:28:52 +02:00
Brandon Danyluk
b18508b8f3 update todo for ground based weapons 2021-04-17 01:27:19 -06:00
Brandon Danyluk
23cd1ef268 update todo 2021-04-17 01:18:52 -06:00
Brandon Danyluk
e7919dabd2 Add all GBU-12s that exist for all planes 2021-04-17 01:11:33 -06:00
Brandon Danyluk
f942231358 add R-73/4 2021-04-17 00:40:38 -06:00
Brandon Danyluk
d622e4d530 add ASRAAM 2021-04-16 23:00:02 -06:00
Brandon Danyluk
8b88142b03 Add AIM-120A 2021-04-16 20:05:49 -06:00
Brandon Danyluk
265670cafa Tweak flight parameters. Add R-77 2021-04-16 19:50:00 -06:00
Brandon Danyluk
fe1e6d45cb update dragon to not use new guidance 2021-04-16 19:02:03 -06:00
Brandon Danyluk
8f03b5be9e Change AIM-9 agility 2021-04-16 16:18:28 -06:00
Brandon Danyluk
1b000d658a Allow for debug info to be displayed via variable 2021-04-16 15:43:31 -06:00
Brandon Danyluk
abc5babb50 Implement optical mavericks 2021-04-16 00:33:38 -06:00
Brandon Danyluk
0848d74aeb add config entries 2021-04-15 22:51:03 -06:00
Brandon Danyluk
26dee9f2e1 enable chaff decoy 2021-04-15 22:43:41 -06:00
Brandon Danyluk
8318b60982 Improve radar simulation 2021-04-15 22:29:02 -06:00
Brett
eeba8a8dbf
Medical - Add Alternative Survival Chance (#8192) 
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
 2021-04-15 11:54:00 +02:00
Brandon Danyluk
d0775283e3 implement course state machine 2021-04-14 02:29:27 -06:00
Brandon Danyluk
a485399c5e update todo 2021-04-14 00:25:15 -06:00
Brandon Danyluk
8d52a2eb16 todo: fix nlaw 2021-04-14 00:24:39 -06:00
Brandon Danyluk
fe2fedd1e8 more tweaks 2021-04-13 23:14:34 -06:00
Brandon Danyluk
c714fb526b small tweaks 2021-04-13 23:12:47 -06:00
Brandon Danyluk
e2c8ddfd3b IR seeker and AIM-9M 2021-04-13 22:45:18 -06:00
Brandon Danyluk
555f0c8921 SALH: only update seeker pos if it within small error 2021-04-13 20:51:21 -06:00
Brandon Danyluk
af2b9a280a multiple changes 2021-04-13 20:31:10 -06:00
Brandon Danyluk
a2d2dd0df9 chane navigation profiles to go for attack direction instead of target 2021-04-13 20:05:28 -06:00
Brandon Danyluk
d34201ed4e remove uneeded sets 2021-04-13 17:18:42 -06:00
Brandon Danyluk
e1436d6ece Change out missile types to reflect navigation scheme they use IRL 2021-04-13 16:27:33 -06:00
Brandon Danyluk
e9d474c995 remove placeholder 2021-04-13 16:21:25 -06:00
Brandon Danyluk
f96abc0b89 Fix bug with ZEM 2021-04-13 16:21:15 -06:00
Brandon Danyluk
1873467deb Add zero-effort miss. Seeker now feeds data to navigation 2021-04-13 16:10:39 -06:00
Brandon Danyluk
a93eb6433d implement augmented proportional navigation 2021-04-13 14:09:36 -06:00
Brandon Danyluk
187c6d35c3 Implement some generic modes of flight 2021-04-12 23:14:22 -06:00
Brandon Danyluk
789ae1cbe4 Add AIM-120 with ARH. Change AHR to not always seek all targets 2021-04-12 22:37:41 -06:00
Brandon Danyluk
34af87bb07 update todo with list of weapons 2021-04-12 18:04:48 -06:00
Brandon Danyluk
0d0019b272 add KAB-250 lgb 2021-04-12 18:04:40 -06:00
Brandon Danyluk
8948e8ac77 add camera tool to observe projectile in flight 2021-04-12 17:03:21 -06:00
Brandon Danyluk
e54e6ec254 Fix hellfire firing without lock. Change LOS navigation type 2021-04-12 16:44:59 -06:00
Brandon Danyluk
d6c5bcd025 adjust drag 2021-04-12 15:39:02 -06:00
Brandon Danyluk
fca022a401 scale deltatime in accordance to acctime. Change velocity so that it isnt always pointing out the nose. Dont scale Acmd as much 2021-04-12 15:18:01 -06:00
Brandon Danyluk
46abb93cb8 add GBU-12 to missile guidance 2021-04-12 02:51:02 -06:00
Brandon Danyluk
35c48c8915 fix dagr 2021-04-12 01:43:35 -06:00
Brandon Danyluk
5f45ad838d fix maverick 2021-04-12 01:12:24 -06:00
Brandon Danyluk
023fed45cb fix hellfire 2021-04-12 01:11:21 -06:00
Brandon Danyluk
3e50605b37 update todo 2021-04-12 01:10:36 -06:00
Brandon Danyluk
22d3ee838f Fix SALH 
With Pro-nav the irratic behaviour of the laser caused the missile to over correct, so we average the position and use that running average for the target
 2021-04-12 01:09:12 -06:00
Brandon Danyluk
4124a317f2 Update todo 2021-04-12 00:16:44 -06:00
Brandon Danyluk
4f8ea33e36 Fix NLAW 2021-04-12 00:16:10 -06:00
Brandon Danyluk
cf40622b52 Fix metis and HOT to use new scheme 2021-04-12 00:12:16 -06:00
Brandon Danyluk
bac6a0b6dd implement LOS guidance, rename previous LOS guidance 2021-04-11 23:50:03 -06:00
Brandon Danyluk
224a243713 implement LOS guidance and Bang-Bang control 2021-04-11 17:58:44 -06:00
Brandon Danyluk
450d1a2a09 allow for bang bang guidance 2021-04-10 19:02:31 -06:00
Brandon Danyluk
0af82a56f4 allow for different types of navigation 2021-04-10 18:49:47 -06:00
Brandon Danyluk
7caabc1642 small tweaks 2021-04-10 18:41:09 -06:00
Brandon Danyluk
4d5d395f61 adjust hellfire attack profile to work with pro-nav 2021-04-10 18:32:55 -06:00
Brandon Danyluk
5cd61d1301 set default navigation type 2021-04-10 13:16:08 -06:00
Brandon Danyluk
fd8a55addf make navigation a modifyable system 2021-04-10 13:11:20 -06:00
Brandon Danyluk
fa064f9287 small adjustents 2021-04-10 11:27:41 -06:00
Brandon Danyluk
ea0bb8fa37 pro-nav works flawlessly 2021-04-10 11:15:27 -06:00
jonpas
f37f8bbe80
Mk6 Mortar - Fix README.md typo (#8205) 2021-04-09 13:15:40 -05:00
Pascal Dunaj
94d5e93485
Typo in usage example (#8201) 2021-04-08 13:35:10 -05:00
Brandon Danyluk
dee326606c pn crap 2021-04-06 21:01:07 -06:00
Brandon Danyluk
53ff3bb1f5 proportional navigation now "works" 2021-04-03 21:04:16 -06:00
Brandon Danyluk
7179a91c77 small changes 2021-04-01 20:12:49 -06:00
Brandon Danyluk
17175db48e v2 of proporitonal nav 2021-03-31 17:16:00 -06:00
Brandon Danyluk
365860dd09 attempt at missile dynamics 2021-03-26 23:15:29 -06:00
Brandon Danyluk
2fd4f70c5b Add debug info 2021-03-18 23:43:07 -06:00
Brandon Danyluk
51542f9053 Basic proportional navigation and PID controller 2021-03-18 23:28:55 -06:00
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