1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Commit Graph

11693 Commits

Author SHA1 Message Date
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items ()
* 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 () 2021-10-06 22:16:42 -05:00
Dedmen Miller
d836cbfe6e
Fix vanilla NV Marker lifetime ()
* 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 () 2021-10-05 15:37:27 -04:00
Dedmen Miller
7347d563b1
Add event property to detect temporary detach/reattach () 2021-10-05 12:32:38 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode ()
* 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 ()
_useEffects was probably inverted. Makes ERA/SLAT not explode when repairing unrelated hitpoints. See .
2021-10-05 12:27:55 -05:00
PabstMirror
cb07e2ceba
Tools - Update /includes for 2.06 and cba ()
* 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 ()
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 ()
* 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 ()

* 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 () 2021-10-02 06:52:50 -04:00
mharis001
310da98c5e
Arsenal - Fix updateUniqueItemsList incorrectly identifying backpacks () 2021-10-02 06:52:33 -04:00
mharis001
64db683e53
Arsenal - Fix items in custom panels having mass of zero () 2021-10-02 06:52:20 -04:00
Filip Maciejewski
9eb615ee66
Various polish translation updates () 2021-10-01 21:55:17 -05:00
Filip Maciejewski
3b90b5eb7f
Grenades - Polish translations updates ()
* Grenades - Polish translations updates

* Remove rogue tab
2021-10-01 21:55:03 -05:00
Filip Maciejewski
26d0a85650
Medical - Polish translations updates () 2021-10-01 21:51:19 -05:00
PabstMirror
d8fa8220c4
Realisticnames - Fix ubc () 2021-09-25 15:03:09 -05:00
Salluci
48912be73c
Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff ()
* 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 () 2021-09-25 11:14:17 -05:00
Vdauphin
e31d931078
Cargo - Fix can't load Slingload_01_Base_F ()
* 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 ()
* 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 ()
* 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 () 2021-09-25 10:35:45 -05:00
Dystopian
7687429b82
Fix keyhandler removing when drop () 2021-09-18 11:06:01 -05:00
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles () 2021-09-13 16:33:56 -05:00
Elgin675
565aa8cf0e
Add French Translation () 2021-09-07 13:35:16 -05:00
PabstMirror
efe09682cc
Add SQFC support ()
* 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) ()
* 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 ()
* 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 ()
* 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 ()
* 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 ()
* 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 () 2021-09-01 12:46:48 -05:00
Salluci
afde782d12
change 7.62x67 to .300 WM () 2021-09-01 12:12:22 -05:00
Salluci
b6c86d8a8a
Add MRAWS/Vorona support to reload_launchers () 2021-09-01 12:11:58 -05:00
Salluci
10e56c090d
Cleanup config & allow LIM-85 to swap barrel () 2021-09-01 12:11:02 -05:00
Vdauphin
f602c19b3d FIX: inverted transport and transported class parachute 2021-09-01 18:10:24 +02:00
PabstMirror
0c1d7177c0
Common - Block user input on headbug fix ()
* Common - Block input on headbug fix

* keep return
2021-08-28 14:56:13 -05:00
Salluci
039af66a8f
Medical - Fix ()
* 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 () 2021-08-23 18:26:32 -05:00
Serg Vergun
0d5a4d89d8
Remove duplicates from mags array () 2021-08-23 12:44:06 -05:00
Salluci
2944064c06
Add spare barrel to misc items () 2021-08-23 12:43:05 -05:00
Vdauphin
d69fff6f9f Check if a parachute is already attached
Objct can be attached to a parachute if the unloading is done throught ViV command
2021-08-22 18:09:06 +02:00
Kyle Mckay
56123591a0
Update contribution documents ()
* 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 ()
* 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 ()
* 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 () 2021-08-06 15:15:20 -05:00
Vdauphin
34069ed031
Update CfgVehicles.hpp () 2021-08-04 12:34:44 -05:00
Vdauphin
0025268eb0 fix twice parachute
- acify
2021-08-04 18:56:48 +02:00
Vdauphin
74c4b274ff FIX missing object for paradrop function 2021-08-03 23:10:44 +02:00
Vdauphin
07f3a5f216 Fix merge conflicts 2021-08-03 22:43:42 +02:00
Vdauphin
460b5fa453 Merge remote-tracking branch 'upstream/master' into patch-3 2021-08-03 22:43:16 +02:00
Vdauphin
267af79d81 Add support for paradropItem
- factorise the code
2021-08-03 22:36:21 +02:00
Serg Vergun
3827178606
Remove 4th never used parameter () 2021-08-03 13:06:12 -05:00
Serg Vergun
fa6da1ae7c
Vehicles - Add configurable engine startup delay ()
* 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 () 2021-07-27 12:39:45 -05:00
Dystopian
27bd25c4b8
Interact Menu - Simplify fnc_renderActionPoints ()
* 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) ()
* 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 ()
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 () 2021-07-23 17:25:00 -05:00
10Dozen
0b7aa7f3e5
Overheating - Drop jammed states on unit respawn ()
* 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 () 2021-07-23 22:45:36 +02:00
Dystopian
35290a1a10
Interact Menu - Add settings for self interaction menu reordering () 2021-07-23 22:44:27 +02:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon ()
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
BaerMitUmlaut
c7ff918554
Medical Engine - Disable third party medical systems ()
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 ()
* 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 ()
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) () 2021-07-23 15:59:32 +02:00
BaerMitUmlaut
88bbb0dd69
Medical - Add functions to serialize / deserialize the medical state of a unit () 2021-07-23 15:49:04 +02:00
10Dozen
d3ee39d8e4
Markers - Add direction/scale reset on Right Mouse Button ()
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 () 2021-07-22 11:59:17 -05:00
Kyle Mckay
e870e2f1f9
Common - Improve vehicle icon caching implementation ()
* 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 () 2021-07-07 12:10:35 -05:00
StuntKeeper
1b43cd6951
Added missing Russian translations ()
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 () 2021-07-06 14:25:10 -05:00
Brett
8bd755e40a
capitalize huntir monitor () 2021-07-02 16:42:23 -05:00
PabstMirror
59e3b07c36
Common - Fix gesture anim lockout for some launchers () 2021-06-28 00:01:32 -05:00
BaerMitUmlaut
9291d9b714
Medical - Hide cursor when unconscious ()
* 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 ()
* 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 () 2021-06-27 15:24:41 -05:00
mharis001
da3251c641
Explosives - Fix missing action name for setup helper object () 2021-06-27 15:17:25 -05:00
Brett
a417ea87d3
Arsenal - Add on loadout delete event () 2021-06-27 21:08:39 +02:00
Brett
2507e8f36b
fix minor cut re-opening () 2021-06-27 13:25:55 -05:00
PabstMirror
f8d2837b36
Parachute - Put both setting in same subcategory () 2021-06-27 13:01:56 -05:00
Brett
d5bc7f10f5
fix my name, add it to contributers () 2021-06-27 07:01:12 +02:00
mharis001
cc0d2424d4
Attach - Improve IR Strobe blinking pattern and increase lifetime ()
* 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
Sergey Veryaskin
c8812e093a
up russian language ()
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-05-25 21:06:00 -05:00
Elgin675
e4a96b7229
Update French Translation and Fix Typo () 2021-05-23 16:57:36 -05:00
LorenLuke
750030c6f1
Changes poisson disc to centered random. ()
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 () 2021-05-19 23:39:34 -05:00
Drofseh
be1045c43f
Fix wrong shot size in birdshot strings () 2021-05-09 17:13:07 -05:00
JoramD
2e1e6daef5
Night Vision - Add color variants to all generations () 2021-05-09 18:49:56 +02:00
jonpas
97701fc075
Markers - Fix JIP scale () 2021-05-08 23:30:09 -05:00
Vdauphin
76806db31b Merge remote-tracking branch 'upstream/master' into patch-3 2021-05-09 00:23:54 +02:00
JoramD
60cab0af6b
Parachute - Add failure chance ()
* 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 ()
* 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 () 2021-04-26 17:31:59 -05:00
Dedmen Miller
d50515694c
Attach - Added attached/detaching events ()
* 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 ()
Complete to date spanish translation.
2021-04-26 11:48:02 -05:00
JoramD
3a74ed3125
MicroDAGR - Add mode switching keybinds ()
* Initial push

* Mode cycling

* Use defines
2021-04-21 22:37:25 -05:00