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,658 Commits 73 Branches 88 Tags
bcbd76274867a5881e50a7aab195443aef267e8c
Commit Graph

14658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
981ef7e31e Bump path-parse from 1.0.6 to 1.0.7 in /docs/src (#8378) 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-08-12 20:26:00 -05: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
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
DomT602
cb3adc22c0 RHS ARF Compat - Add ammo URAL & Kamaz, wirecutter backpacks and crew helmet (#8308) 
* RHS ARF Compat - Add ammo URAL & Kamaz

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

* Add wire cutter backpacks

* Missed the inheritance

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

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

* Description update

* Update addons/overheating/functions/fnc_handleRespawn.sqf

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

* Removed duplicated DAGR_MENU_PSELECTION8
 2021-07-23 13:51:35 -05:00