Commit Graph

14226 Commits

Author SHA1 Message Date
10Dozen
f232f84c6c
Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items (#8379)
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

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

* Empty lines

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

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

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

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

[ci skip]
2021-10-05 13:29:21 +02:00
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
∂ω∂
2e6c025a2e
medical: Fix wiki docs for ace_treatment* events (#8425) 2021-09-04 15:10:34 -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
Salluci
01d6fdf97a
Add TZ-8-255B1 to refuel vehicles (#8359) 2021-08-23 12:52:10 -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