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,114 Commits 73 Branches 88 Tags 752 MiB
35c48c8915
Commit Graph

14114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kyle Mckay
0a27a275d1
Update my GitHub link (#7991) 2020-11-04 23:22:51 +00:00
Björn Dahlgren
ae13438ce2
Add Dahlgren to maintainers (#7985) 2020-11-04 19:57:04 +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
jonpas
42f4edc9b7
Documentation - Remove slideshow note (#7715) 
* Documentation - Remove slideshow note

Fix in Arma 3 v2.00

* Remove another issue reference
 2020-10-29 11:36:41 -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
Joko
153644b77a
Reload/Interaction - Fix 2 hemtt ingame errors (#7924) 
* fix 2 hemtt ingame errors

* Extract broken calls to function

* Update addons/interaction/functions/fnc_doRemoteControl.sqf

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

Co-authored-by: Dystopian <sddex@ya.ru>
 2020-10-21 11:17:42 -05:00
Brett
25cc139dba
Vehicle Lock: add events (#7938) 
* vehiclelock: events

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

* Update addons/vehiclelock/functions/fnc_lockpick.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-10-21 10:38:07 -05:00
BaerMitUmlaut
e07d2ae5d5
Make refuel nozzle unbreakable (#7957) 2020-10-21 10:37:14 -05:00
Saborknight
cab4d1dac1
Documentation - Fix typos and missing semi-colon in Arsenal (#7956) 
Because when I copied it, it definitely was an oopsie moment.
 2020-10-12 10:53:42 +02:00
Filip Maciejewski
73e151ea5d
Include only highest res mipmaps in maptools overlay textures (#7953) 
2048x2048 boys
 2020-10-10 23:44:11 +02:00
BaerMitUmlaut
4cfe26b842
Disable damage for all cargo objects (#7946) 2020-10-10 18:58:38 +02:00
BaerMitUmlaut
56baf2bfd0
Fix engine fire position of Kamaz trucks (#7945) 2020-10-09 12:55:16 -05:00
Cyruz143
d19bdceda1
Grenades - Remove ref to missing audio (#7928) 
* Remove ref to missing audio

* Removing unused dummy files
 2020-10-09 12:54:41 -05:00
Elgin675
aa74178702
Translation - add/fix french keys in 'explosives' module (#7942) 2020-10-05 11:40:26 -05:00
Björn Dahlgren
8651d4c97d
Fastroping - Fix inconsistent usage of ARR macro (#7936) 2020-10-05 11:40:03 -05:00
Björn Dahlgren
4e83b387e5
Tools - Set non zero exit code if any addons fail to build (#7937) 2020-10-04 18:54:04 +02:00
Taha
e53bc23ebf
Turkish Language Update (#7909) 
Added missing translation to Turkish
 2020-10-04 10:57:46 -05:00
PabstMirror
5fa490aef3
Update CfgVehicles.hpp (#7935) 2020-10-03 20:21:48 -05:00
Neviothr
6278b67370
Frag - Add frag values to R_MRAAWS_HE_F (#7927) 
* Add frag values to R_MRAAWS_HE_F

* damn tabs

* Use GVAR() macro
 2020-10-03 18:32:21 -05:00
Freddo
e27110aac3
Explosives - Add CBA settings for max/min/default timer values (#7916) 
* Transfer to CBA settings, add timer options

* Remove wiki note

* Tweak arrays, stringtables

* moveToSQF
 2020-10-03 12:00:06 -05:00
Dedmen Miller
74d74ede71
Fixed casting const char* to char* in extension (#7925) 2020-10-03 10:26:06 -05:00
Björn Dahlgren
8e7f9b6db5
Medical Treatment - Fix invalid usage of ARR macro (#7933) 2020-10-03 10:21:29 -05:00
Björn Dahlgren
c4e7092ebf
Hearing - Fix invalid usage of ARR macro (#7932) 2020-10-03 10:21:20 -05:00
Björn Dahlgren
2f3732003f
Fastroping - Fix invalid usage of ARR macro (#7931) 2020-10-03 10:21:10 -05:00
Björn Dahlgren
aa3d28e5be
Arsenal - Fix invalid usage of ARR macro (#7930) 2020-10-03 10:20:59 -05:00