Commit Graph

11495 Commits

Author SHA1 Message Date
TBakerBR
b2731d79d2 Portuguese Translations (#7347) 2020-01-02 03:53:52 +01:00
jonpas
4daec7a350 Merge branch 'release' 2020-01-01 20:57:22 +01:00
PabstMirror
24e9999b34 Maptools - Fix warnings in mapGpsDisplay.p3d 2019-12-31 19:33:52 -06:00
jonpas
d060185704 Hellfire - Fix missing semi-colon 2019-12-30 20:54:21 +01:00
jonpas
c59667d0ba Prepare release 3.13.0 (build 2) 2019-12-30 19:33:35 +01:00
jonpas
ec63321343 Merge branch 'master' into release-3.13.0 2019-12-30 19:33:17 +01:00
Brandon Danyluk
f2fff98ad0 Add AGM-114L Active Radar Homing Hellfire (#7337)
* Create AGM-114L

* If we lose LOS dont continue tracking magically Allow for datalinked targets to donate data to the missile.

* Update documentation

* RHS 2x hellfire compatability

* Make ARH more realistic by not allowing to switch targets after firing

* Fix filename. Change Hellfire attack profile to lead target. Switch to two LOS checks.

We check two Line's of Sight to ensure that we are 100% gone from the target. A raw LOS check will be blocked by bushes and light trees while the checkVisibility wont while on the otherhand smoke will block a visiblity check but not a raw LOS check. We get best of both worlds with this.
I changed the attack profile so that it will lead moving targets. This isnt needed with the laser version because the user will "lead" the target if needed, but with the radar scan we have velocity information so we might as well lead the target as much as possible

* Change function calls to FUNC macro. Slightly change radar logic. Up poll frequency to 7hz

Instead of the missile immediately going active when the shooter doesn't have radar, check if targets are in datalink. If they are, use the datalink to guide the missile instead of its internal radar.

* Add logic for missiles launched without target

If a missile is fired without a locked target, it will immediately go active and target the first thing its seeker picks up. This is an incredibly dangerous trait of active radar homing missiles and is so in this implementation. Be careful!

* Change from `exitWith` to basic `then`

Legacy code that never got changed. This is essentially what happened before

* Update CfgMagazineWells.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-30 12:29:08 -06:00
dfr1238
f918b53caa Update Tchinese String (#7340)
* [Tchinese]Medical - Group Bandage Items

like title.
-make all bandage name on tch look like : bandage (%Type) 
-make all iv name on tch look live :IV(%Type %amount)

* Update tchinese translate
2019-12-29 20:57:28 -06:00
PabstMirror
d0d70c66ed
Repair - Handle turret hitpoints with no selection (#7338) 2019-12-28 10:26:57 -06:00
Elgin675
50f64eef20 French translation of the latest updates (#7321)
* Add description for 'showCheckAirTemperature' setting (weather)

* Add french translation for '(show)CheckAirTemperature' in weather module

* Add description for 'SettingShowClearGlasses' setting (goggles module)

* Add french translation for 'SettingShowClearGlasses' in goggles module

* Add localization for 'rangetables' categoriy settings (artillerytables module)

* Add french translation for artillerytables module

* Add french translation for Shotguns ammunition in ballistics module

* Add french translation for CTS 7290 in grenades module

* Minor modification of french translation for medical_treatment module

* Add french translation for 'SettingShowCheckAmmoSelf' in reload module

* French translation : correction of a typing error in advanced_throwing module

* Minor modifications of french translation for chemlights module
Homogenization of presentation, to be absolutely identical to the presentation of the vanilla glow sticks.

* French translation : reformulation of the overheating module menu text, which was redundant with the title.

* Changing the order of the overheating menu (logical grouping).

* Add description tooltip on 'quickmount' settings

* Add localization for 'fastrope' subcategory settings (Uncategorized Menu)

* Minor modifications/corrections of french translation :

- fastroping module
- magazinerepack module
- microdagr module
- overheating module
- switchunits module

* FIXED Previous commit ==> Add description tooltip on 'quickmount' settings

* Add french translation for quickmount tooltip menu

* move showActionInSelfInteraction to common

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-28 09:58:52 -06:00
PabstMirror
af0ab24040
Tagging - Convert to CBA Settings (#7336) 2019-12-26 20:38:36 -06:00
mharis001
085ebd89db Pass function by reference to Draw3D EH (#7333) 2019-12-26 19:42:48 -06:00
PabstMirror
53c53bbdbc
Stringtable Validator - Check for tabs and correct spacing (#7332)
* Stringtable Validator - Check for tabs and correct spacing

* Improve error descriptions, Cleanup

* Change encoding to utf-8

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-12-26 19:42:30 -06:00
Moonstroke82
8e24d95b37 Spanish translations (#7235)
* Spanish Dogtags added

* Spanish: UI / AI 7 Vehicles / Weapons / Zeus

Added some more translations into spanish for ai,ui,vehicles, weapons and zeus

* Turkish Translation Started

Turksih Translation for AI Aircraft Main Map and Medical Feedback started

* Apply Suggestions

Co-Authored-By: Ferran Obon <themagnetar@users.noreply.github.com>

* Isolate just spanish for now

* pt2

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Ferran Obon <ferran@idi-systems.com>
2019-12-26 15:49:15 -06:00
mharis001
50b8e14e92 Register ace arsenal feature camera (#7330) 2019-12-26 15:45:11 -06:00
dfr1238
02f5bfa980 [Tchinese]Medical - Group Bandage Items (#7329)
like title.
-make all bandage name on tch look like : bandage (%Type) 
-make all iv name on tch look live :IV(%Type %amount)
2019-12-25 20:39:32 -06:00
Brett
6a89bd5ee4 Medical - Group Bandage Items (#7324) 2019-12-24 23:41:53 +01:00
jonpas
d41dd37a30 Remove cursor config for vanilla sniper rifles - fix #7326 2019-12-24 15:18:59 +01:00
Dominik Butschek
39c42d6a7d Added missing Czech translation strings (#7323) 2019-12-21 19:34:06 +01:00
PabstMirror
9ea50f384a keep well on ready weapon? 2019-12-20 23:04:41 -06:00
PabstMirror
6a98a17bc4 Disposable - Remove magWell 2019-12-20 22:47:46 -06:00
Dominik Butschek
331d47c04e Addition to Czech translation (#7319)
* czech translation up to exlosives

* The rest of czech translation

* restore some lost in merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-20 13:38:53 -06:00
dfr1238
f5535f9a26 Update tchinese translate (#7320)
add new string on tchinese
2019-12-20 13:37:47 -06:00
PabstMirror
41900df610
Realistic Names - Fix IDAB Jeep name (#7318) 2019-12-19 19:40:18 -06:00
PabstMirror
833fd26780
Cleanup mk6 and fix nametag strings (#7317) 2019-12-19 13:16:36 -06:00
Elgin675
bd0ecd7edf French translation (#7298)
* Cleaning and reorganizing of some stringtable files (WIP) :

- Duplicate entries have been removed, and the arrangement improved, to help future translators.
- Some ACE_Settings.hpp files have been modified because they were not up to date.
- Minor french translation correction.

* Added French translation and / or correction for :

- Weaponselect module,
- Weather module,
- Winddeflection module,
- Yardage450 module,
- Zeus module.

* Convert Tabs to Spaces

* Minor corrections ; arrangement improved for few stringtable.xml files.

* Improved French translation, and adjust fews settings.

- Nombreuses corrections mineures, en vérifiant chaque menu un à un, puis chaque
  option dans le jeu lui-même. Ca m'a permit de constater qu'il y a certaines
  absurdités, y compris en anglais, qui ont donc été retraduites dans toutes les
  langues, mais qui ne correspondent pas vraiment à l'option telle qu'implémentée.
  Par exemple, le système de réarmement dans Eden est traduit de manière très
  étrange.

- Modification du fichier "addons/overheating/ACE_Settings.hpp", afin de changer
  l'ordre du menu "ACE Surchauffe". En effet la case "activé" était tout en bas,
  aussi je l'ai mise tout en haut (comme c'est déjà le cas pour toutes les options).

- Modification du fichier "addons/finger/ACE_Settings.hpp", concernant le pointage
  du doigt ACE, afin d'y ajouter une description dans les réglages des addons.
  Il y en avait déjà une (peu utile) dans les paramètres des commandes, mais pas
  dans les options des addons, ce qui rend l'option peu explicite pour un débutant.

* Corrections mineures

* correction erreurs

* correction erreurs (nametags)

* correction erreurs et modules obsolètes (nametags)

* correction erreurs et modules obsolètes (common)

* Mise en commentaire d'éléments obsolètes

* correction key error

* Added Vdauphin suggestions :).

* French translation - Replaced "Faction" (faction) to "Camp" (side)

addons/captives/stringtable.xml
addons/switchunits/stringtable.xml
addons/zeus/stringtable.xml

* Minor correction of french Concertina_wire translation

* - (PabstMirror suggestions) Replace tabs by spaces, in addons/common/stringtable.xml
- (PabstMirror suggestions) Replace xml comments by french plain text, in addons/common/stringtable.xml

- Replace xml comments by french plain text, addons/explosives/stringtable.xml
- Replace xml comments by french plain text, addons/nametags/stringtable.xml

* Removed accented capital letters for objects in french translation :

Capital accented letters were a problem because they were not classified alphabetically.
Thus in Eden or in the arsenal, objects starting with a capital accented letter were systematically at the top of the list.

modified:   addons/chemlights/stringtable.xml
modified:   addons/huntir/stringtable.xml

* Correction of a typing error (french concertina_wire translation
2019-12-19 11:08:31 -06:00
classic
15fad1e41b Update Japanese translation (#7316) 2019-12-19 16:36:06 +01:00
dfr1238
af837c4ffa Update new tchinese translate (#7315) 2019-12-19 16:20:18 +01:00
jonpas
984875525b Merge branch 'master' into release-3.13.0 2019-12-18 21:44:00 +01:00
jonpas
b6a1ce9b30
Fix version comparison (CBA Settings transfer) (#7313) 2019-12-18 21:43:40 +01:00
jonpas
52e2f2665b Merge branch 'master' into release-3.13.0 2019-12-18 19:03:08 +01:00
dfr1238
204a0c9331 update tchinese translate (#7309) 2019-12-18 18:31:34 +01:00
Filip Maciejewski
ead5105070 Add Check ammo self interaction setting (#7306) 2019-12-18 18:31:08 +01:00
Filip Maciejewski
7f62067a7b Add Wipe glasses self interaction (#7307) 2019-12-18 18:30:53 +01:00
jonpas
dd826589d2 Prepare release 3.13.0 2019-12-18 00:23:49 +01:00
PabstMirror
654feca3a1
Medical Feedback - Change pain scream frequency based on intensity (#7238)
* Add setting for pain scream frequency

* Apply suggestions from code review

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* remove setting

* Update stringtable.xml

* Update script_component.hpp
2019-12-17 11:17:49 -06:00
PabstMirror
8e3fd45500
Artillery rangletables (universal) (#6853)
* Initial

* Update artillerytables.cpp

* Pass by value, remove c17 features

* Tweak accuracy

* SQF work

- improve compat with a3 mlrs with remote cam (animationSourcePhase)
- handle non [0] turrets (rhs prp)
- add config entries
- use vectorCos to fix fp error (thanks commy)

* Support per mag air friction

* tweak friction

* Integrate with mk6

* more acos fixes

* Handle invalid memPointGunOptic (CUP_BM21_Base)

* Cleanup

* cleanup/tweaks

* Update checkConfigs.sqf

* Finish cleanup of ace_mk6mortar

* Update stringtable.xml

* fix bwc for ACE_RangeTable_82mm

* Update fnc_rangeTableCanUse.sqf

* build 32dll, fix some headers

* strncpy and move testing to seperate file

* Move to sub-category

* Update for ACE_Extensions changes and add warning to ace_common

* Update stringtable.xml

* Update addons/common/functions/fnc_checkFiles.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Update stringtable.xml

* Update stringtable.xml

* test extension.yml update logical operator

* Revert "test extension.yml update logical operator"

This reverts commit b1871724ad.

* more guess and test
2019-12-17 10:14:45 -06:00
Drofseh
240c7333e3 Ballistics - Add shotgun shell projectile magazine variety (#7119)
* Add multiple projectile types for shotguns

* remove extra blank line

* fix classname whitepace issue

* reduce trigger time

* Verbose names and No4 Bird

- Change classnames and string keys to be more verbose
- Change No7 Birdshot to No4 Birdshot
While No7 is one of the most common loads for target shooting and hunting small birds the extreme number of pellets is just too hard on FPS.
No4 is not typically used in target shooting, but it is a common load for hunting various birds so I think it's realistic to have it for civlian purposes and the number of pellets is substatially less so the FPS hit isn't so bad.
If someone else could test the No4 to see how it feels to them I'd appreciate it.

* add/change penetration

* fix indentation
2019-12-17 10:10:31 -06:00
PabstMirror
60a901bf10
Grenades - Add CTS 7290 9-bang flashbang (#6856)
* Add CTS 7290 9-bang flashbang grenade

* Add ui icon

* Add proper 9bang configuration

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Move banana and replace with text

* Rotate 20deg

* Fix stringtable

* Fix peen

* Remove rust

* Less rusty dirt

* Translation

* Add ShadowLod to thrown variant

* Update addons/grenades/CfgAmmo.hpp

Co-Authored-By: Oliver Blanthorn <oliver.blanthorn@manchester.ac.uk>

* Update texture (make sure to squash&merge)

* Ermordung der tab

* tabs2

* tabs3
2019-12-17 10:02:33 -06:00
PabstMirror
1fb989d332
Medical Engine - Increase lethality of aircraft explosions (#7304)
* Medical Engine - Increase lethality of aircraft explosions

* Update addons/medical_engine/XEH_postInit.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-12-17 10:01:17 -06:00
mharis001
b874a1f618 Medical Treatment - Fix bodyCleanupLoop typo (#7308) 2019-12-17 09:50:59 -06:00
PabstMirror
0ce8318e18
tabs3 2019-12-16 20:42:31 -06:00
PabstMirror
a348a5f5f5
tabs2 2019-12-16 20:41:51 -06:00
PabstMirror
e506827b04
Ermordung der tab 2019-12-16 20:40:38 -06:00
Brandon Danyluk
316fbfe7b9 Implement Metis SACLOS guidance (#6997)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Begin transfer of SACLOS into Missile Guidance

* Allow seeker and attack profiles to have their own "OnFired" functions

* Fix bugs with SACLOS

* Implement Metis wire guidance. Add "Beam" guidance

* add missing parenthesis

* Update how Wire/Beam guidance works. Add compatability for SACLOS planes. Move all base missile changes out of missileguidance and into their own files.

* try to cleanup merge

* minor stuff
2019-12-16 20:01:30 -06:00
Dystopian
392a0770b3 Add destroyed boat ejecting (#6330)
* Add destroyed boat ejecting

* Delete EH global cleanup

* Add check explosiveness

* Optimize EH

* Move EH to function, remove config values

* Move code to cookoff

* Use macro for explosiveness

* Fix include
2019-12-16 16:29:33 -06:00
LachlanSneddon
e8fcbcdf4b Medical AI - Improve Healing Logic (#7255)
* Improve AI healing logic

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Added event for CPR chance being 0

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update fnc_healingLogic.sqf

Co-Authored-By: commy2 <commy2@users.noreply.github.com>
2019-12-14 12:04:09 -06:00
dfr1238
d073bb5afe Update tchinese translate (#7303)
* Update TChinese Translate

* Update Tchinese Translate

add new 2 weather string
2019-12-14 10:26:38 -06:00
PabstMirror
20c7257ee1
Weather - Minor fix (#7302) 2019-12-13 13:02:37 -06:00
LorenLuke
846b65864f Weather - Add a 'check air temperature' action (#6154) 2019-12-12 22:31:51 +01:00
PabstMirror
9b8cfc27af
Medical Treatment - Reset canTreatCached on treatment (#7253)
* Medical Treatment - Reset canTreatCached on treatment

* Reset conditionCaches of nearby units

* CAManBase
2019-12-12 10:25:21 -06:00
mharis001
d25047c7c1 Clean up ace_main requiredAddons (#7301) 2019-12-12 10:24:51 -06:00
mharis001
2bad2fac68 Improve dragging getWeight function (#7261) 2019-12-11 11:53:34 -06:00
BaerMitUmlaut
01787312cc Nightvision - Enable setting NVG effects scale mid-mission (#6627)
* Enable setting NVG effects scale mid-mission

* Add fired EHs only when nvg is active
2019-12-11 10:38:43 -06:00
dfr1238
80879da241 Update TChinese Translate (#7296) 2019-12-08 10:35:30 -06:00
Brett
8b4e8a61ac Split interaction menu settings between interaction and self interaction (#6609)
* Split interaction menu settings between interaction and self interaction

* consistent spacing
not sure which way is wanted here, but I might as well be consistent in 
my own PR

* remove useless code, fix use of backgroundMenu

* clean up from Dystopian

* use existing stringtable

* remove redundent localize

* Use LLSTRING, split UseListMenu

* style fixes

* style fixes

* add movedToSQF to old settings

* condense ifs

* Don't use cursorKeepCentered as default
2019-12-07 19:44:04 -06:00
Wakbub
79e3de623f Use STRING macros (#6576) 2019-12-07 22:40:44 +01:00
Blutze
30b4f3edf0 Advanced Fatigue - Solid stamina bar option (#6911)
* Translation Entries (EN+DE)

* Add setting

* Obey setting in handler

* Add setting to movedToSQF list

* Replace elegant else-if with clunky SQF

* Revert adding solidStaminaBar to movedToSqf list

* Remove unnecessary fade applications

* Invert solid/fade setting for better translation

* Change translations to "fade"

* Invert fade/solid logic

* Dont unfade when disabled overall

* Dont unfade with AF disabled; fix old bug
2019-12-07 15:23:04 -06:00
Filip Maciejewski
f336b6ce62 Add goggle overlay support for Contact update Blindfolds (#7157) 2019-12-07 22:21:51 +01:00
PabstMirror
29a0732b0c
Common - Network safe claim (#7258)
* Common - Network safe claim

* Update fnc_claimSafeServer.sqf
2019-12-07 15:18:50 -06:00
Baráth Péter
fa60704cd0 Hungarian translations (#7234) 2019-12-07 22:13:51 +01:00
pterolatypus
b3c5a72dae Cargo - setSpace checks for existing cargo (#7133) 2019-12-07 22:10:03 +01:00
PabstMirror
bcbffcff26
Interact Menu - Don't show interactions for virtual units (#7271)
* Interact Menu - Don't show interactions for virtual units

* be consistant
2019-12-07 14:58:44 -06:00
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

Co-Authored-By: alganthe <alganthe@live.fr>

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
Dedmen Miller
3333b41dfb Remove unused VRTraining class from Arsenal config (#7276) 2019-12-04 14:12:42 -06:00
Josuan Albin
b8fcd92536 Fix default loadout public func not checking base items (#7280) 2019-12-04 14:12:00 -06:00
dfr1238
8b526906cd
Update tchinese translate 2019-12-04 23:13:13 +08:00
dfr1238
46cae20da5
Update tchinese translate 2019-12-04 23:11:53 +08:00
commy2
76f0d76b83
Merge pull request #7277 from acemod/maglite
Add handheld maglite ML300L flashlight, clean up flashlight addon
2019-12-03 19:13:00 +01:00
bux
584d311dde add blender animation file 2019-12-03 15:32:27 +01:00
Filip Maciejewski
9bbbdf71aa
Polish translation for Maglite ML300L 2019-12-03 12:56:38 +01:00
commy2
6febaf33df fix recoil, remove magic reticle 2019-12-03 06:51:02 +01:00
bux
123095697c adjust light strength 2019-12-02 14:21:01 +01:00
bux
8133a539ef vastly reduced complexity of shadow meshes, fix warning with shadow lod 2019-12-02 13:55:44 +01:00
commy2
8e411bb53b sway and info box fixes 2019-11-30 19:56:14 +01:00
commy2
77e9cee1f7 sway and info box fixes 2019-11-30 19:56:01 +01:00
commy2
0f10d7f299 weapon config 2019-11-30 18:36:31 +01:00
commy2
bd52ff1c50 Merge branch 'maglite' of https://github.com/acemod/ACE3 into maglite 2019-11-30 18:05:17 +01:00
commy2
8435497fe6 fix vehicle config, add gwh 2019-11-30 18:05:02 +01:00
bux
0c516628e1 add back LodNoShadow to resolution lods 1 and 2 2019-11-30 17:58:51 +01:00
commy2
f8135b132d fix formatting material file 2019-11-30 17:36:03 +01:00
commy2
ef34ac71e3 fix formatting model.cfg 2019-11-30 17:30:51 +01:00
commy2
776335b5a7 improve the German translation 2019-11-30 17:25:21 +01:00
commy2
871495699e Merge remote-tracking branch 'origin' into maglite 2019-11-30 13:53:55 +01:00
dfr1238
00118445c1
Update Stringtable.xml
make it change from crlf to lf
2019-11-30 16:45:04 +08:00
dfr1238
318e931974
add final missing string on tchinese translate 2019-11-29 23:16:53 +08:00
dfr1238
2db6aa4f9a
Update stringtable.xml 2019-11-29 17:26:24 +08:00
dfr1238
eb4f76392d
Update /spectator/stringtable.xml
add missing string on tchinese
2019-11-29 17:22:28 +08:00
dfr1238
aa83c28b52
Add\update\fix /chemlights/stringtable.xml
add missing string on tchinese
and fix some wrong number on other language
2019-11-29 17:20:54 +08:00
dfr1238
ab99435bac
Update /common/stringtable.xml
fix dup string
2019-11-29 17:01:20 +08:00
dfr1238
bb0b531487
Update /realisticnames/stringtable.xml 2019-11-29 16:58:32 +08:00
dfr1238
ba8bd11dab
Update /common/stringtable.xml
add missing string on tchinese
2019-11-29 16:54:57 +08:00
dfr1238
23d5734c18
Update /cookoff/stringtable.xml
add missing string on tchinese
2019-11-29 16:50:27 +08:00
dfr1238
5b1b70643a
Update /flashsuppressors/stringtable.xml
translate unit to tchinese
2019-11-29 03:03:08 +08:00
dfr1238
c92430dd36
Update /ballistics/stringtable.xml
Translate unit and full ammo name to tchinese
2019-11-29 02:59:43 +08:00
dfr1238
243aff4f85
fix duplicate chinese string 2019-11-29 02:18:23 +08:00
dfr1238
364dde2f5c
Update /vehicles/stringtable.xml
Add missing string on tchinese
2019-11-29 02:10:16 +08:00
dfr1238
61dca5f0b0
Update /repair/stringtable.xml
Add missing string on tchinese
2019-11-29 02:02:47 +08:00
dfr1238
a52f8592d6
Update /addons/csw/stringtable.xml
make some weapon name same with /addons/realisticnames/stringtable.xml
2019-11-29 01:57:33 +08:00
dfr1238
9ae6815d1c
Update /quickmount/stringtable.xml
Add missing string on tchinese
2019-11-29 01:52:02 +08:00
dfr1238
f77b25014f
Update /mk6mortar/stringtable.xml
translate unit on tchinese
2019-11-29 01:47:58 +08:00
dfr1238
4bb6cb8a4d
Update /microdagr/stringtable.xml
Add\Update tchinese translate
2019-11-29 01:45:27 +08:00
dfr1238
59bc8b6dcc
Update /medical_treatment/stringtable.xml
Translate a lot string to tchinese
2019-11-29 01:42:54 +08:00
dfr1238
cf51bbdb6d
Update again
well chinese have many d-mn meaning,in one english word
2019-11-29 01:09:41 +08:00
dfr1238
d9b5d3c646
Update tchinese string
some medical string update from tchinese wiki
2019-11-29 00:59:23 +08:00
dfr1238
b973414fe9
Update /medical_status/stringtable.xml
Add missing string on tchinese
2019-11-29 00:51:01 +08:00
dfr1238
df1f51a95c
Update /medical_gui/stringtable.xml
Add missing string on tchinese
2019-11-29 00:47:31 +08:00
dfr1238
4f6867393f
Update /medical_feedback/stringtable.xml
Add missing string on tchinese
2019-11-29 00:40:56 +08:00
dfr1238
b358f2fa29
Update /medical_damage/stringtable.xml
Add tchinese translate
2019-11-29 00:38:03 +08:00
dfr1238
22d063d707
Update /medical_blood/stringtable.xml
Add missing string on tchinese
2019-11-29 00:24:51 +08:00
dfr1238
aa0898154d
Update /medical_ai/stringtable.xml
Add missing string on tchinese
2019-11-29 00:21:30 +08:00
dfr1238
9f6f838765
Update /interaction/stringtable.xml
Add missing string on tchinese
2019-11-29 00:17:58 +08:00
dfr1238
fd2e5a060b
Update /fastroping/stringtable.xml
Add tchinese translate
2019-11-29 00:13:50 +08:00
dfr1238
aea7447055
Update /explosives/stringtable.xml
Add and update tchinese translate
2019-11-29 00:09:59 +08:00
dfr1238
a81c1fae04
Update /medical_statemachine/stringtable.xml
Add tchinese translate
2019-11-29 00:01:09 +08:00
dfr1238
170e2e3441 Add\Update Trad Chinese Translate (#7286)
* adding tchinese

* add tchinese translate

* add tchinese translate

* Update tchinese translate

* Update stringtable.xml

* Add tchinese translate

* Update tchinese translate

* Update Tchinese

* Add\Update Tchinese

* Add\Update Tchinese Translate

* fix string

* fix string
2019-11-27 10:54:32 -06:00
PabstMirror
edefaf8220
Trenches - Add item check to progressBar (#7283)
Fix #7282
2019-11-27 09:51:22 -06:00
PabstMirror
c13148a9c4 Flashsuppressors - Update muzzle configs 2019-11-26 17:19:07 -06:00
PabstMirror
70438133f2
fix repair strings (#7284) 2019-11-26 16:08:41 -06:00
classic
f3535e436c Update Japanese translation (#7262)
* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update stringtable.xml
2019-11-26 14:08:14 -06:00
bux
82254b5ef1 add HorribleGoat to authors 2019-11-24 21:21:14 +01:00
bux
ff5159f6c7 Add custom rtm for holding flashlight, move flashlight in p3d to better fit holding animation, add model.cfg required for binarizing rtm 2019-11-24 21:10:01 +01:00
commy2
829240a93a
Merge pull request #7279 from Whigital/kestrel_layer_fix
[kestrel_4500] Update hardcoded layer id
2019-11-24 00:40:05 +01:00
Whigital
772a0fcd6a Alt. syntax in favor of obsolete BIS func. 2019-11-22 21:47:51 +01:00
Whigital
8ad6d3ccff Update hardcoded layer id 2019-11-22 20:14:26 +01:00
bux
b615bc4614 correct paths in p3ds 2019-11-22 18:38:30 +01:00
bux
5e45e85af8 add maglite to config, add missing quotes 2019-11-21 18:30:39 +01:00
bux
c28b5af1a2 tab -> spaces 2019-11-21 18:26:31 +01:00
bux
516145210f Add Maglite ML300L 2019-11-21 18:20:05 +01:00
bux
89266d8c84 make mx_991 name uniform 2019-11-21 16:55:27 +01:00
bux
c6a31ebff4 make maglite_xl50 name uniform 2019-11-21 16:09:28 +01:00
bux
6de01d5c5d make ksf_1 name uniform 2019-11-21 16:05:36 +01:00
bux
f84949e7ae fix typo in maglite p3d name 2019-11-21 15:59:52 +01:00
mharis001
2b4d807acc Add stringtable validation tool (#7274)
* Add stringtable validation tool

* Add to CI
2019-11-18 12:48:40 -06:00
Dedmen Miller
a5ec4b6306
Update texture (make sure to squash&merge) 2019-11-18 16:41:28 +01:00
Brett
f99157604f Tagging - Group spray paint items in Arsenal (#7268)
* group spray paint in arsenal

* Title case

* Make Polish translation of Spray Paint items groupable
2019-11-16 13:15:28 -06:00
PabstMirror
00a91610ea
Only play repatitive sounds when game is focused (#7265) 2019-11-16 12:42:15 -06:00
zharf
5a4f76efb0 Spectator - Restore HUD when coming out of spectator (#7191)
Fixes #7186
2019-11-05 12:47:46 -06:00
Tomas Herceg
42233ee449 Add czech translation (#7260)
Add more czech translations
2019-11-05 12:37:21 -06:00
Cyruz143
5033a98353 Fixing playsound3d limits (#7024) 2019-11-05 12:14:33 -06:00
Cyruz143
5d07029db7 Cookoff - Allow enabling only on player crewed vehicles (#7147)
* Add setting for cookoff to only run for player crewed vehicles

* No point having per vehicle selection

* Merging mutliple settings in to one

* Fixing missing comma

* Using LSTRING for settings

* merging suggested fixes

* Moving enabled check to fnc

* Use existing strings for CBA options

* Reverting change to support legacy eden attribute settings

* Adding Pabsts fix for 3den attribute

* Update addons/cookoff/CfgEden.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-11-05 11:55:15 -06:00
PabstMirror
82c6c343b2
Map - Fix map shake (#7252) 2019-10-29 17:10:54 -05:00
PabstMirror
40a66f0bde
Add some editor previews (#7254) 2019-10-29 17:10:40 -05:00
PabstMirror
0e485ce5fc
Arsenal - Fix script error for weapons with 3+ muzzles (#7256) 2019-10-29 17:10:03 -05:00
PabstMirror
691e8d24c6
Repair - fix string (#7251) 2019-10-28 19:18:26 -05:00
mharis001
e78016d7f7
Repair - Add settings to control item requirements for different actions (#7243) 2019-10-24 22:52:04 -04:00
PabstMirror
f9d181c72e
Medical - Fix addDamageToUnit (#7247) 2019-10-20 16:48:26 -05:00
PabstMirror
c37783de0b
Medical - Change WoundReopening default setting (#7246) 2019-10-20 16:46:30 -05:00
PabstMirror
da5e9525b4
Medical - Make some constants variables (#7236)
* Medical - Make some constants variables

* Add comments about varNames, calc k/l at runtime
2019-10-20 11:14:31 -05:00
PabstMirror
37284bd0e8 Update docs 2019-10-17 13:17:37 -05:00
PabstMirror
bccf170573 Merge branch 'master' into cbaDisposable 2019-10-17 13:01:07 -05:00
Dedmen Miller
3946928cbe Refuel - Add events for start, stop and progress (#7023)
* Add refuelTick Event

* Add refuelStarted event

* Add refuelStopped event

* Add event documentation

* Rename events

Fix EOF

* Rename one more event
2019-10-13 13:08:35 -05:00
mharis001
2e5cdbd62c Explosives - Add ace_isEOD 3DEN attribute (#7080)
* Add ace_isEOD 3DEN attribute

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
2019-10-13 12:22:46 -05:00
PabstMirror
342e881fda
Debug to clipboard - Cleanup settings dump (#7240) 2019-10-13 12:21:55 -05:00
PabstMirror
9ac543aacc
Medical - Rename private version of setUnconscious (#7237) 2019-10-12 09:47:57 -05:00
BaerMitUmlaut
8c7f8d7d6a Medical Feedback - effects overhaul (#7215)
* Intensify pain effects

* Add chromatic abberation effect, add blur with very high pain

* Add option for limited pain effects with only high pain blur

* Fix playInjuredSound

* Add instant feedback effects update when getting hit

* Cleanup

* Overhaul playInjuredSound

* Fix voice detection, simplify nearby unit filter

* Apply suggestions from code review

* Add Chromatic Aberration translations

* Use while loop instead of configClasses

* detach say3d dummies before deleting
2019-10-11 15:00:53 -05:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224)
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
2019-10-11 15:00:25 -05:00
TWC-Rik
6ca4b2075d Nametags - Add Nation Ranks (#7094)
* Adds icon and postInit

Adds German, British, Spanish, French ranks. Also adds postInit code
that loops through all factions and checks if ranks have been set there
in there for easy, permanent customistability.

* Removed white space

* commy2's postInit rewrite

Changes faction config entry to array with macros and changes the
postInit code to commy2's improved version.

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Adjusted arrays to be multi line

Also removed white space.

* Update addons/nametags/XEH_postInit.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>

* Add getVar setting, don't overwrite if already set
2019-10-08 23:20:26 -05:00
PabstMirror
2f3d8db134
Medical - Report non-default settings to rpt (#7233)
* Medical - Report non-default settings to rpt

* Update reportSettings.sqf
2019-10-08 12:03:05 -05:00
PabstMirror
4eeac9f649
Medical - Death from sum of trauma (#7195)
* Medical - Death from sum of trauma

* fixes

* Update fnc_determineIfFatal.sqf
2019-10-08 10:45:09 -05:00
PabstMirror
a71879ccea
Medical - Increase severity of falling damage and Improve non-selectionSpecific wounds (#7214)
* Medical - Increase severity of falling damage

* Improve non-selectionSpecific wounds

* Use macros for hitpoint indexes
2019-10-08 10:44:49 -05:00
Daniel Lee
f4dbe5229e Medical - Option for treatment to require holstering/lowering weapon. (#7063)
* Option for medical treatment to require holstering/lowering weapon, with an option for examine category items to still be available.

* Vehicles cause holster settings to be ignored.

Unsure whether to expand this into it's own setting (disallow all medical in vehicles? only allow if both medic and patient are in the same vehicle? what about people in the back of transports healing those in the cab?), but just going to leave it as is for now.

* Replace !isEqualTo with != in for performance reasons.

Resolves line 33 PR review.

* Merge settings, short circuit

* move logic to new file
2019-10-08 10:44:36 -05:00
Broström.A | Evul
b514541bec Safemode - add public setWeaponSafety function (#7092)
* Create fn_safeWeapon.sqf

* Update XEH_PREP.hpp

* Adjustments to script to meet demands 

not tested

* adjustment according to review

* minor adjustments

* Update fn_safeWeapon.sqf

* Rename and adjustments

* Adjustments

* Fixed typo

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fixed missing param in exsample

* Test fixes

* Update addons/safemode/functions/fnc_setWeaponSafety.sqf

Co-Authored-By: Filip Maciejewski <veteran29@users.noreply.github.com>
2019-10-07 20:19:04 -05:00
pterolatypus
06a0f30a05 Removed a redundant conflict-check in fnc_lockSafety (#7189) 2019-10-07 20:07:14 -05:00
mharis001
13ffc07f27 Common - Optimize arithmeticGetResult function (#7232)
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-10-07 19:41:46 -05:00
Björn Dahlgren
c1f3e8256b Dragon - Remove Shadow Buffer (ShadowVolume 1000+) lods (#7219) 2019-10-06 19:13:12 +02:00
PabstMirror
99db6802bb
Inventory - Adjust for changes to medical (#7112)
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
2019-10-06 11:10:56 -05:00
Laid3acK
ce0ccb2d1e Realistic names - Contact DLC rifles added (#7155)
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_weapons_added

* contact_dlc_weapons_added
2019-10-06 11:09:38 -05:00
BaerMitUmlaut
5bdbb5c398 Speed up carry animation (#7216) 2019-10-05 22:32:38 +02:00
PabstMirror
b236cf9a65
Medical - Fix addDamageToUnit (#7228) 2019-10-05 15:31:40 -05:00
mharis001
de39ad4c21 Medical - Add descriptions for limping and fracture settings (#7199) 2019-10-05 22:27:45 +02:00
mharis001
9474250975 Change medical item masses to be same as old medical (#7200) 2019-10-05 22:25:38 +02:00
Josuan Albin
aec7a78a58 Remove Atropine (#7212)
* Change items to scope 1 to keep mission backwards compatibility
2019-10-05 22:25:29 +02:00
Dedmen Miller
07be4bd9da Don't force Camera position in Arsenal Loadouts list (#7209) 2019-10-04 19:57:06 -05:00
Dedmen Miller
d1b840fc2d Log checkPBO errors to server log (#7210) 2019-10-04 19:56:25 -05:00
Dedmen Miller
8cc27338a6 Add missing German translation for chemlights (#7211) 2019-10-04 19:50:39 -05:00
mharis001
4cbc83687c Fix undefined variable in reload checkAmmo function (#7223) 2019-10-04 19:13:14 -05:00
Björn Dahlgren
1128ff0f3f Remove duplicate class declaration from laserpointer (#7218)
Regression from #7217
2019-10-02 23:28:00 +02:00
Dedmen Miller
af88d2980d Laserpointer - Add vanilla Joint Rails 2019-10-02 10:54:24 +02:00
Björn Dahlgren
8dd9f36ff9 Wrong texture path for ace_csw_tripod_m122.p3d, csw -> apl (#7201) 2019-09-29 19:51:00 +02:00
Björn Dahlgren
6899d8a860 Invalid lod properties with trailing space in ace_cws_tripod_spg9.p3d (#7202) 2019-09-29 19:50:53 +02:00
PabstMirror
a53a2725e9
Remove unused medical DLLs (#7198)
* Remove unused medical dlls

* x
2019-09-28 17:09:20 -05:00
mharis001
8b8ec19828 Localize partial wound, fix injury list color flashing (#7196) 2019-09-28 16:25:39 -05:00
mharis001
35a4ffbad6 Expand advanced diagnose setting tooltip (#7197) 2019-09-28 16:25:29 -05:00
PabstMirror
d6507cf119
Medical - epiBoostsSpontaneousWakeUp (#7076)
* Medical - epiBoostsSpontaneousWakeUp

* Update initSettings.sqf

* Move setting, add strings

* Update initSettings.sqf

* Update addons/medical/stringtable.xml

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-09-28 16:11:32 -05:00
PabstMirror
c426103f23 Extension changes for Medical Rewrite and Linux compilation (#6909)
* Fix Medical HandleDamageWounds memory leak (#6809)

* Use strncpy and disable MSVC unsafe warnings (#7171)
* Set 64-bit correctly from generator string, Disable SSE2 flag on 64-bit (non-existent)

* Tweaks for Linux extensions (#5762)
* Tweak CMakeLists for Linux compilation
* Conform SQF extensions check for Linux server extensions support
* Add *.so to tools
* Split extension check into Windows and Linux
* Disable Medical extension loading for now
* Add client/server separation to extension loading
* Add Arma config documentation on extension creation
2019-09-28 23:03:55 +02:00
PabstMirror
b8c45c0a57
Medical Statemachine - Fix locality EH breaking current state (#7136)
* Medical Statemachine - Fix locality EH breaking current state

* Handle Injured state

* Update fnc_localityChangedEH.sqf
2019-09-28 15:52:49 -05:00
mharis001
ec9e6c088b Medical - Only stitch wounds on not bleeding body parts (#7044)
* Only stitch wounds on not bleeding body parts
2019-09-28 21:48:19 +01:00
Matsuo Yutani
edc05b8056
Fixed Mistype 2019-09-19 21:44:46 -03:00
Matsuo Yutani
31f5eab2db
Removed weird dot from the first line 2019-09-19 21:42:28 -03:00
Matsuo Yutani
ec0533fd08
Removed weird dot from the firts line 2019-09-19 21:41:41 -03:00
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
PabstMirror
03576b86b9
MedicalSM - Tweak isPlayer checks style (#7178) 2019-09-12 21:50:50 -05:00
jonpas
2d0c61a874
Use CBA Versioning System properly (#7173)
* Use CBA Versioning System properly

* Update CBA include to CBA v3.12.2 + excessive concatenation cleanup
2019-09-10 17:49:07 +02:00
mharis001
5dbaef4e07 Improve medical statemachine settings (#7154)
* Improve medical statemachine settings

* Multi-line condition and update fatal injury description

* Check isPlayer in DeathAI transition

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-09-09 23:30:56 -05:00
LachlanSneddon
b4c1d0cb57 Minor logic fixes (#7174) 2019-09-07 12:18:12 -05:00
PabstMirror
0880ea25a3
Medical Treatment - Add logging for splints (#7170)
* Medical Treatment - Add logging for splints

* addToTriageCard
2019-09-06 21:47:20 -05:00
jonpas
dd9692792d
Remove outdated CBA Shared Version Display (#7172)
Replaced by Arma 3's main menu
2019-09-06 21:57:54 +02:00
PabstMirror
daa4581fe9
Maptools - Make GPS display a real 3d object (#7086)
* Maptools - Make GPS display a real 3d object

* Fix header

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
2019-09-05 15:58:05 -05:00
PabstMirror
edd5c44853
Medical - Improve loading/unloading of unconc patients (#7109)
* Medical - Improve loading/unloading of unconc patients

* Update fnc_loadPersonLocal.sqf

* Multi-line

* Formating

* Update fnc_loadUnit.sqf
2019-09-05 15:56:53 -05:00
PabstMirror
d6c39e661f
Medical StateMachine - Tweak dead state handling (#7061)
* Medical StateMachine - Tweak dead state handling

- Don't call setDammage inside HandleDamage EH
- Add death reason on entering death state

* add a getVar disable in case this causes problems

* Cleanup

* cleanup

* Update addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>
2019-09-05 15:56:14 -05:00
PabstMirror
9d0e474cf5
Fix statBarStatement still using AI values for firemodes (#7163) 2019-09-05 15:48:49 -05:00
PabstMirror
54125e3697
CSW - Add drag after deploy setting, fix container storage (#7164) 2019-09-05 15:48:26 -05:00
LorenLuke
2487d6c8ff
Removes tabs in CfgAmmo 2019-09-04 18:22:43 -07:00
Laid3acK
2e4e59f6e0 Ballistics - Contact DLC rifles added (#7156)
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added
2019-09-03 19:09:12 -05:00
Josuan Albin
1caf6fb08f Rearm - Add distance setting (#7137)
* Add rearm distance setting

* Set rearm distance slider maximum at 50m

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Fix rearm action check

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/rearm/initSettings.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/rearm/functions/fnc_rearm.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-09-03 19:06:50 -05:00
PabstMirror
0fa8330833
Common - Handle changes to UAVControl command (multi seat) (#7161) 2019-09-03 19:05:45 -05:00
Josuan Albin
2950a48447 Fix statBarStatement still using AI values for firemodes 2019-09-03 15:32:27 +02:00
LorenLuke
6f96ca1a64 Added missing magazine and ammunition definitions. 2019-08-31 15:13:38 -07:00
barman75
3cb10e0aa4 Translations - Russian (medical) (#7093)
* Missing RUS translation (medical)

* Minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* authors
2019-08-28 10:28:56 -05:00
commy2
4204205908
Merge pull request #7140 from Bosenator/master
Movement - Display Inventory Weight in Stream Friendly UI Mode
2019-08-25 19:27:17 +02:00
commy2
be09fd10a3
Merge pull request #7135 from acemod/slideshow-improv
Fix slide order in slideshow
2019-08-21 23:07:15 +02:00
commy2
100ac0ff72
Merge pull request #7138 from Elgin675/ace_medical_french_translation
Addition / modification of the French translation
2019-08-21 23:06:14 +02:00
jonpas
f1b1ec0d55
Fix undefined variable in View Distance 2019-08-14 17:42:01 +02:00
Elgin675
d7bf026a00 Corections mineures 2019-08-14 14:56:26 +02:00
Bosenator
15fe3c0a18 display inventory weight in stream friendly UI mode 2019-08-14 09:47:24 +01:00
bux
6abe054e95 enable cache 2019-08-13 08:42:58 +02:00
bux
5e1411bee2 Remove Cover Image Stuff, Reverse Arrays 2019-08-13 08:41:30 +02:00
Elgin675
5754d6c506 Fixed an error on the last commit (merge incorrectly). 2019-08-13 02:38:54 +02:00
Elgin675
7f71980c85 Modifications demandées effectuées 2019-08-13 01:32:16 +02:00
Elgin675
927e051ea7 Addition / modification of the French translation 2019-08-12 22:47:16 +02:00
Josuan Albin
df8814e344 Add self stitching setting (#7134) 2019-08-12 20:05:59 +01:00
bux
2f0a5e0c84 Make slideshow add slides in proper order by going through the array backwards, add cover image filed for slideshows, fix wonky german translation 2019-08-12 13:23:32 +02:00
PabstMirror
9ffca544a6
Advanced Throwing - Call muzzle EH and fix RHS inheritance (Compat with RHS 0.4.9) (#6879)
* Advanced Throwing - Call muzzle EH and fix RHS inheritance

* UBC for rhs
2019-08-11 17:59:05 -05:00
PabstMirror
ebb1ef628f
Merge pull request #7042 from acemod/cswSuperBranch
Crew Served Weapons - Final Integration
2019-08-11 17:57:27 -05:00
LorenLuke
15c65c5779 Adds HEI magazine.
Configs default "1000Rnd_Gatling_30mm_Plane_CAS_01_F" magazine as CM5:1.
Keeps "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51" for legacy reasons.
2019-08-08 12:17:00 -07:00
LorenLuke
7d9c7d5483 Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1 2019-08-08 12:08:22 -07:00
PabstMirror
82e7b70f6e
Cargo - fix tankf (#7124) 2019-08-07 22:38:40 -05:00
PabstMirror
f5782fd1ff
Medical - Various debugging and fix cpr anim speed (#7122)
* Medical - Various debugging and fix cpr anim speed

* Update fnc_setCardiacArrest.sqf
2019-08-06 08:10:33 -05:00
PabstMirror
75a8ba2b34
Cargo - No cargo on Contact UGV (#7123) 2019-08-06 08:10:05 -05:00
Dedmen Miller
15e6ad4523
Update addons/grenades/CfgAmmo.hpp
Co-Authored-By: Oliver Blanthorn <oliver.blanthorn@manchester.ac.uk>
2019-08-06 11:35:58 +02:00
LorenLuke
e6b843f2d2
Fixes double deflecting definition 2019-08-05 12:56:19 -07:00
LorenLuke
92e0d55ef0
Add caliber and deflecting values for AP rounds 2019-08-05 11:10:15 -07:00
LorenLuke
344662e76c
Adds stringtable magazine values 2019-08-04 20:45:05 -07:00
LorenLuke
6b67c5e365
Adds stringtable entries 2019-08-04 20:38:13 -07:00
LorenLuke
e2c6dee3d9
Fixes deafness issue 2019-08-04 12:35:37 -07:00
LorenLuke
cc1dff28f2 Merge branch 'master' of github.com:acemod/ACE3 into patch-1 2019-08-04 11:45:21 -07:00
LorenLuke
8e46e0d131 Fixes accidental late-night reversion 2019-08-04 04:00:26 -07:00
LorenLuke
06fded2ed8 Removes Tabs 2019-08-04 03:49:23 -07:00
LorenLuke
5183d11160 Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1 2019-08-04 03:41:51 -07:00
LorenLuke
113eb70c55 Progress commit 2019-08-04 03:36:40 -07:00
commy2
0fd442451f Interaction Menu - fix a crash when loading savegames (#7115)
* fix a crash when loading savegames

* fix a variable name

* optimize

* Put CAManBase actions into seperate bucket

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fast exit for All

* CaManBase

* can't skip mans
2019-08-01 20:52:20 -05:00
LorenLuke
135643d604
Adds Combat Mix Magazine to cannon Magazines 2019-08-01 16:24:47 -07:00
LorenLuke
0eee72e393
Removes Whitespace from CfgAmmo 2019-08-01 14:47:45 -07:00
LorenLuke
d5146a9b3b
Removes Whitespace from CfgWeapons 2019-08-01 14:46:35 -07:00
LorenLuke
a41640d411
Added missing semicolon 2019-08-01 02:27:12 -07:00
LorenLuke
539c4a7a10
Adds Combat Mix Magazine 2019-08-01 02:21:28 -07:00
LorenLuke
09b66294c2
Adjusts 30mm cannon projectiles
Adjust 30mm cannon projectile damage.
Adds AP projectile.
Adds Combat Mix Projectile Capability.
2019-08-01 02:19:11 -07:00
LorenLuke
b485078e53
Adds Missing Close Brace
Adds Missing Close Brace
2019-08-01 01:28:33 -07:00
LorenLuke
41c89aa1a6
Fixes A-10 Cannon Dispersion
Changes A-10 Cannon Dispersion to realistic levels.
2019-08-01 01:25:39 -07:00
Vdauphin
66f62bb1a2 Zeus - FIX ace_zeus_fnc_moduleSetMedicalVehicle setting wrong variable (#7107)
* FIX set medical vehicle zeus module

Since https://github.com/acemod/ACE3/pull/6933 `isMedicalVehicle` should be use instead of `medicClass`

* isMedicalVehicle is a boolean

44050df98b/addons/medical_treatment/functions/fnc_isMedicalVehicle.sqf (L20)
2019-07-31 11:20:27 -05:00
PabstMirror
3e97d99893 Merge branch 'master' into cswSuperBranch
Conflicts:
	optionals/compat_rhs_usf3/CfgMagazines.hpp
	optionals/compat_rhs_usf3/config.cpp
2019-07-25 15:19:17 -05:00
jonpas
06996d30e1 Update Load Order for 1.94 Contact DLC (#7101)
* Update loadorder for 1.94 Contact DLC

* Require Arma 3 v1.94
2019-07-25 13:43:04 -05:00
classic
a7723b793b Update Japanese translation (#7111)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2019-07-22 09:49:54 -05:00
Vdauphin
8611bbb0bc
FIX French STR_ACE_Common_Anywhere 2019-07-16 22:54:38 +02:00
PabstMirror
ded81418e6
Medical Engine - Report any fatal head damage (#7103) 2019-07-16 13:00:28 -05:00
Whigital
c7d07f7bd7 Update class with correct inheritance (#7100) 2019-07-12 10:04:33 -05:00
PabstMirror
0c47d45d31
Medical - Fix hitpoints on VR units (#7098) 2019-07-12 10:03:22 -05:00
PabstMirror
03dcae9074 Medical Feedback - Fix short blackout on any pain 2019-07-10 13:53:17 -05:00
PabstMirror
70ba6b66f7 small config fix 2019-07-09 19:20:08 -05:00
PabstMirror
8763184b6a
CSW/Dragon cleanup and rearm compat (#7068)
* Dragon work

cleanup
remove unused p3ds
add pos_gunner_dir/pos_gunner to static
add [csw] prefix to arsenal version
add sight interaction icons

* Update fnc_staticWeaponInit_unloadExtraMags.sqf

* ace_rearm compat

allows pulling carry mags out of rearm trucks

* Update fnc_ai_handleFired.sqf

* Re-add 3den attributes

* cleanup and move A2 staticweapon strings to ace_csw
2019-07-05 17:57:22 -05:00
PabstMirror
e1c650d56e
Medical - add dummy cfgVehicle entries for old modules (#7091)
* Medical - add dummy cfgVehicle entries for old modules

* add medical_menu

* Update addons/medical/CfgVehicles.hpp

Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-07-05 15:32:19 -05:00
PabstMirror
1534f8cd8d
Quickmount - Improve interactu menu getIn for static weapon (#7090)
For small static weapons getInNearest would sometimes not detect the vehicle as the `getCameraViewDirection` may be pointing at the interaction node and not the vehicle
2019-07-05 15:22:07 -05:00
Brandon Danyluk
7b13a75305 RHS CSW compatability (#7082)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat

* RHS compatability

* Modified all tripod p3ds to have [0,0,0] at the mount. Ported AGS-30, Kord, M220, and SPG-9 tripods to APL And added them to CSW. Changed RHS compats to use new ported tripods. Changed strings to reflect real names.

* Change from M224 Mortar Bag -> Mk6 Mortar bag

* Add named propert (Autocenter) to make P3D [0,0,0] the center of the object instead of engine calculated

* oh no tabs

* remove some more evil tabs

* fix changes lost in merge

* fix bad merge pt2

* Fix UBC
2019-07-04 17:56:49 -05:00
PabstMirror
fa910a7fd8
Small med stuff (#7084)
* Small med stuff

* update adv fatigue comment

* disable medical debug by default

* Fix tourniquet call to addToTriageCard
2019-07-03 10:40:42 -05:00
PabstMirror
05e4f74e73
Medical AI - Adjust healing logic for rewrite (#6902)
* Medical AI - Adjust healing logic for rewrite

- move state machine from config to sqf
- move all healing logic to seperate func
- attempt to handle healing for new system

* prioritize unitReady medics

* move setting to subcategory under medical

* Use faster GET_WOUND_BLEEDING

* Update fnc_healingLogic.sqf

* Update for wound array changes

* Update treatment events changes

* Fractures/splint

* formating / use GET_OPEN_WOUNDS

* Use non-localized medical category
2019-07-03 09:59:28 -05:00
PabstMirror
aa41fffdb7
Cargo - Add array to disable paradrop effects (#7016) 2019-07-03 09:58:46 -05:00
commy2
8a867cc997 shorten transition 'run lowered rifle' -> 'jump with rifle' (#7078)
* shorten transition 'run lowered rifle' -> 'jump with rifle'

* jump instead of vault while spriting with weapon lowered

* format the configs
2019-06-28 12:11:00 -05:00
PabstMirror
6586cb0144
Update fnc_handleStateUnconscious.sqf (#7079) 2019-06-28 12:01:03 -05:00
mharis001
b2f4b8ea20 Medical - Cleanup settings (#7057)
* Cleanup medical settings

* Fix extra [

* Allow giving IV/blood to self by default

* Medical Blood - Settings improvements and cleanup (#7069)

* Add more blood settings and cleanup

* Fix include before header

* Update addons/medical_blood/functions/fnc_init.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Disable debug

* Cleanup moved settings

* Fix remaining setting descriptions
2019-06-28 11:50:11 -05:00
PabstMirror
de13ab0f47
Medical - Rework CPR and Bleeding in cardiac arrest (#7060)
* Medical - Rework CPR and Bleeding in cardiac arrest

* remove cprCreatesPulse, add cprSuccessChance

* hide cpr for basic diagnose

* Update addons/medical_statemachine/functions/fnc_enteredStateCardiacArrest.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-27 19:01:20 -05:00
SilentSpike
56cb638aff Stop AI firing at unconscious units (#7074)
This just reimplemented the behaviour from #5864

I believe we though using `setUnconscious` command would make this
unnecessary, but testing seems to show that's not the case
2019-06-27 17:11:51 -05:00
PabstMirror
80e203c371
Maptools - Don't convert vanilla straight lines (#7072) 2019-06-27 12:57:30 -05:00
PabstMirror
f04b26b93e
Medical - Finish splint/fracture (#7045)
* Medical - Finish splint/fracture

- Add replacement items

* Add splint models

* Add fracture sound effects

* Add treatment interaction icon
2019-06-22 16:47:35 -05:00
Katalam
d26fcb6f1a Changed animation for cpr (#6918) 2019-06-22 15:55:42 -05:00
mharis001
08a7d2706e Add wounds var macros (#7058) 2019-06-22 13:36:27 -05:00
PabstMirror
445e082cc4
Common - Let isEOD handle non bools (#7067) 2019-06-21 11:21:33 -05:00
jonpas
66fba546cf Medical Engine without parentheses 2019-06-18 16:03:21 +02:00
PabstMirror
d52fedf39f
Medical Treatment - Scale bandage time based on amount of wound treated (#7049)
* Medical Treatment - Scale bandage time based on amount of wound treated

* ignore basic bandage?

* add debug trace
2019-06-16 11:04:51 -05:00
PabstMirror
f99980d55f
Cleanup german stringtables (#7050) 2019-06-12 10:42:36 -05:00
mharis001
1998bf3eb6 Medical Treatment - Add medical facility classes config (#7047)
* Add medical facility classes config

* Convert to configCase and filter non-existant buildings
2019-06-11 20:02:40 -05:00
PabstMirror
2fc11d38e0
Medical - Fix unconsicous problems with minWaitingTime and fullHealLocal (#7030)
* Medical - Fix setUnconsicous minWaitingTime

* Fix fullHeallocal restoring unconscious with unstable vitals
2019-06-11 19:25:05 -05:00
SilentSpike
8483a4bcdc Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010)
* Fix severity of wound bleeding

I'm simplifying the nastiness calculations so that the wound config
specifies the worst wound and we scale it between 25% to 100% based
on the wound damage and number of wounds recieved.

Similarly I've updated the wound configs to more reasonable maximum
bleeding values based on the fact that they're percentages of cardiac
output being bled.

* Limit variance of pain modifier

This is to avoid unexpectedly high pain for small wounds or unexpectedly
small pain for large wounds

* Make more wounds increase chance for nastiness

Rather than guarantee

* Adjust worst damage scaling

This handles torso wounds better as they're typically around 0.3-0.6 for
6.5mm shots which makes them roughly medium sized.

* Fix cardiac output calculation

Previously the calculation didn't make sense as it wasn't outputting
a value in l/s. This method of calculation makes more logical sense and
provides a point of reference for what the bleeding values actually
represent (percentage of the blood being pumped that is lost - which now
has an actual volumetric value).

* Fix blood pressure after change to cardiac output

* Fix heartrate skyrocketing between 5l and 4l blood

Pretty sure someone accidnentally got these conditions the wrong way
around. This way blood pressure will first drop and then heart rate will
later go up to compensate.

* Fix comment typo

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-06-10 11:23:21 -05:00
SilentSpike
aff2cea0fb Unblacklist vanilla medical items from arsenal (#7017)
- The replacement setting may be disabled so we shouldn't prevent their
addition
- If it isn't, they will be replaced with suitable items which is fine
(and someone may want to design a mission that works either way)
2019-06-09 08:16:55 -04:00
PabstMirror
1023f39718
Medical Menu - Hide categories if they don't have any actions (#6988) 2019-06-08 17:23:09 -05:00
mharis001
9315dbebd9 Fix medication and ivBagLocal typos (#7048) 2019-06-08 16:54:54 -05:00
C0kkie
f6b35a63ab Translations - German (#6920)
* Add all missing german translations for the ace medical system

* RHS Compat - Add 2 round hellfire to pylon options (#6893)

* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon

* Fastroping - Add user setting to confirm cutting ropes (#6876)

* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml

* compatibility with CBA scripted 2d optics framework

* compatibility with CBA scripted 2d optics framework

* Bewusstlosstatus -> Bewusstlosigkeit

* Verblutungseffekt -> Blutungs effekt

* Aktivitere ACE Sanitäter Aktionen -> Aktiviere Sanitäter Aktionen

* Sanitätermenüs -> Sanitätsmenü

* kritsche -> kritische

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for advanced fatigue, ai, arsenal & ballistics

* Update addons/ai/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/medical_gui/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: C0kkie <20169938+C0kkie@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Add missing german translations for ace cargo

* Add missing german translation for vehicles

* Add missing german translation for weaponselect

* Add missing german translations für ace repair

* Add missing german translations for ace quickmount

* Add missing german translations for ace explosives

* Add missing german translations for ace common

* Ace flashlight missing german translation

* Add missing german translations for ace scopes

* add missing translations for ace respawn

* Add missing german translations for ace overpressure

* ACE Nametags german translation

* .

* ace magazinerepack german translation

* ace interaktion german translations

* add missing german translation for ace interaction menu

* ACE Hearing german translations

* Update stringtable.xml

* Update stringtable.xml

* Missing german translation in ace dogtags

* Missing german translations ace hot

* ace pylons missing german translations

* ACE Cook off German Translations

* zeus german translations

* Fast roping german translations

* gforces german translations

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Map - Don't enable map light for parachutes (#6961)

* Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)

* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Common - Don't add UAV AI to localUnits array (#6951)

* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)

* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions

* Update stringtable.xml

* Nightvision german translations

* Update stringtable.xml

* remove non-stringtable stuff ???
2019-06-08 10:35:42 -05:00
PabstMirror
9b2c8c84e8 Medical - fix canTreat (#7041)
* Update fnc_canTreat.sqf

* Update fnc_canTreat.sqf
2019-06-08 06:17:00 -04:00
Brandon Danyluk
abe2ce2f6f Implement M47 Dragon (#6773)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Ports over NouberNou's dragon guidance

* Add Dragon model

* Make the Dragon CSW capable

* Fix bugs regarding argument order

* Add Dragon Attack Profile. Change how missileGuidance guidance_pfh works in order to allow for different types of missiles besides continious thrust

* Fix bug regarding missile direction. Add official US Army training manual for the dragon for reference purposes

* Adjust model to reflect real-life one

* Add attackProfile and guidanceProfile onFired functions

* Change Dragon "onFired" to reflect missileGuidance changes

* Only implementing the Super-Dragon. Remove Tabs. Add new lines to all files. Add string-table. Tweak missile flight dynamics

* Add sight description

* Fix inheritance issues. Missile damage values tweaked. Fix String Table. Add backblast area.

* Add feature wiki page.

* Fix picture issues

* Remove Dragon manual

* add missing semi-colon

* Tweak damage values. Fix formatting. Add lazy evaluation where applicable

* Disable the ability to switch to the unusable launcher. Convert rvmat numbers to equivalent but more readable numbers. Multiple code fixes. ace_csw required. Formatting fixes. TGA -> PAA. Remove unused comments in missile guidance code

* Dragon flight dynamics tweaked. Now assuming there is a booster angle creating wobble. Add a slight delay when the wire breaks to fire all of the service charges

* hpp newline fixes. Case sensitivity for model and rvmat references

* Update Wiki dependencies

* Revert "Update Wiki dependencies"

This reverts commit efc298c481.

* fix dependency component

* Changed inheritance structure to be more rigid. Remove un-needed config values. Fix script issues regarding positioning and the launchers aliveness

* get rid of the optic for the base dragon. fucking bi configs not making sense

* Lock non-useable dragon on initialization

* Add model.cfg for animations

* Fix formatting. Fix M47 Dragon Optic zoom

* Change LOD selection names

* Revert indentation, keep parenthesis. "Start, stop, start stop! Jesus! I'm starting to think Mattis is just a big cock tease"

* Re-update indentation of model.cfg

* Path fix. Whitespace fix

* Sight attach/detach on same vehicle

* If the sight gets detached, make sure the dragon goes dumb. Remove resetting of resting position when gunner gets out - looks stupid, but when the dragon is fired weird stuff happens

* disable debug

* Add EOF

* Maybe finally fix EOF problem
2019-06-07 23:48:37 -05:00
Brandon Danyluk
b1d5bbe450 Adds Crew Served Static Weapons (#5652)
* Initial Commit

* Got rid of unneeded translation values

* Updated Strings

* "Fixed" issue where when you deploy the tripid and weapon on slope it freaked out.

* Fixed locality issues. Added timers to relavent functions.

* Added weights to all magazines/tripod. Weights to weapons coming soon when I transfer them to the launcher slot

* Fixed bug regarding localized strings. Created new tripod model

* Added timers for deploying/picking up the tripod. Changed ammo-box model from custom to one already in ARMA. Changed gun-bag model for a more generic one. Created a texture for the tripod and gunbag

* Removed ability to disassemble weapons via the addAction. Added  ACE Action to get in due to a memory point issue. Changed from a static deploy/dismount time to one based in the weapon configs

* Created forward-compatability. Made it so I can define a base plate for any weapon if I ever want to expand from the generic M3 Tripod.

* Fixed bug where tripod wouldn't deploy with the correct times. Fixed bug where if you moved the tripod into the ground it would go flying.

* Added mortar compatability. Will probably shift whole mortar ammo loading to CSW one day

* Added icons to each relavent item

* Added README, possibly fixed bug where if you are in a weapon others cant load/unload ammo. Changed distance you can interact with weapons

* Added checks for when deploying the gun as well as unloading ammo to prevent duplication/deletion of items.

* Added documentation

* Added order to doc

* Explained why things are the way they are

* Remove temp files

* Removed redundant files

* Converted tabs->spaces. Added newlines at end of all files. Changed broken line in fnc_tripodDeploy.sqf.

* 100% newlines at end of file

* Added newlines to files that didnt get the change. Fixed README. Changed from GVAR(cswOptions) to GVAR(options). Changed from tabs to spaces in wiki

* Fixed issue with UAV assembling with enableWeaponDisassembling. Fixed bug where game would crash if you disassembled static weapon with more than 1 magazine

* Tabs->Spaces

* Added CSW options to base StaticWeapon class to allow for easier additions. Switched default mortar away from CSW system due to incompatabilities

* Lazy Evaluations and macros to describe how things work.

* Added newlines to script_component. Fix no-texture issue on tripod. "Fix" 20mm HE saying 40mm HE. Add custom icons to all weapons. Move "Check Ammo" to CSW menu

* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Revert changes to fortify.md

* Updated UI Icon to Crew Served Ammo branch UI

* Added Pabst's CrewServedAmmo to handle ammo loading/unloading instead of my solution

* Fixed bug where currentWeaponTurret returned a blank string when a player hasent entered hte weapon to select the current weapon

* Re-added ammo loading time

* Tabs->Spaces

* Newline at end of files

* Removed replaced functions

* Remove redundant strings. Move ammo handling to appropiate section

* Tabs->Spaces

* Update wiki

* Updated to fix crash with default weapons and disable CSW ability on default static weapons

* Added editor attributes to enable/disable CSW at edit time

* Change how ammo is removed from the CSW. Uses math instead of iteration

* Fix bug where assembled weapon did not get rid of default actions

* Added support for multiple types of ammo in one CSW

* Add tracer magazines for .50 cal

* Fix bug where you could load ammo even if the gun couldnt take any more

* Disable debug and enable compile cache

* Changed weapon deploy/pickup time. Removed custom Titan missiles. Using ACE Dragging now. Added progress bar check for pickupTripod. Updated documentation

* Removed check if CSW is full to unload ammo

* Fix bug where items would spawn underneath other items on wepaon dismount

* Change some things

* Configure base statics, improve returnAmmo

* Add mortar baseplate

* Remove explicit inheritance

* Fix bug where unloading ammo would duplicate it if you had room in your person.

* Tab->Space

* Player couldnt pickup tripod due to legacy code

* Fix GMG_01_base_F inheritce

* Port of ACE 2 tripod + ACE 2 CSW Bag

* Move ACE 2 Data to APL folder

* Adjust weights to make them more accurate to how ARMA uses it and the real life equivalents

* Fix bug where error was thrown on esc from picking up tripod. Tripod rotated 180

* Fix bug where if you called ace_common_claim the weapon could be set to be disassembled even though it may not be wanted via CSW

* Added ability to toggle ammo handling when weaponAssembly is disabled.

* Add Proxy Weapons for all Vanilla static weapons. These serve as a way to allow for realistic ammo reload times without having to modify base classes if you want feautres turned off. Adjusted reload and mount times to be more "realistic"

* Fix Shadow RPT Spam

* Update wiki

* Change order of setDir and setPos

* Change all setDir/setPos orientations. Remove redundant check. Ensure that weapon locked state reflects it with the "getIn" command. Add a way to pass in a specific classname for the weapon assemble type. Add a callback function onDisassemble if user wants to set the state of the new tripod using the old weapon as a reference

* Actually check for the carryWeaponClassname in the deployWeapon check

* Ai Compatiblity

* Add stringtable entries

* Formatting fixes

* Stringtables for settings, fix setMagazineTurretAmmo

* inherit ammo for mags, reorder stringtable

displays correct ammo and descriptionShort

* don't require ace_javelin

* Tweaks, cleanup, localzation, ace_reload changes

change weapon tag to [CSW]
tweak localization strings
minor cleanup
simplify some ace_reload funcs

* delete moved dev func

* Hopefully fix issue where to-be deleted tripod intersects with newly created weapon and vice versa. Remove PBOPREFIX newline

* cleanup/proxyWeapon/mk6 compat
2019-06-07 23:47:39 -05:00
BaerMitUmlaut
9c55c36d27 Use checkVisibility to test LOS for missile seekers (#7014) 2019-06-04 20:20:07 -05:00
Dedmen Miller
26fe041342 Move gunbag type from inheritance to config property (#7022)
* Move gunbag type from inheritance to config property

* Add gunbag framework wiki

* Remove _generalMacro from doc

* Apply documentation suggestions

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-06-04 20:00:55 -05:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933)
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-03 10:31:46 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
PabstMirror
7a62e96945
Grenades - Don't flashbang spectators (#7029) 2019-06-03 09:44:17 -05:00
Laid3acK
4ea068535b Ballistics - BI P90 and RHS MP7 updated (#7025)
* rhs_mp7_ammo_46x30_airFriction

* rhs_mp7_mag_46x30_initSpeed

* rhs_mp7_weapon_46x30_BaseAngle

* rhs_mp7_ammo_46x30_airFriction

* bi_p90_ammo_570x28_airFriction

* bi_p90_weapon_570x28_initSpeed
2019-05-30 13:34:18 -05:00
Vdauphin
4fa131573f Fractures is misspelled (#7026)
@Drofseh
2019-05-30 13:33:51 -05:00
commy2
4e04100ea9 Spotting scope - New reticle using CBA scripted optics (#6964)
* new reticle for spotting scope

* reticle b

* illuminated reticle for night

* use orig spotting scope reticle, bigger occular

* fix spotting scope attenuation
2019-05-27 10:46:21 -05:00
commy2
33602df517 Vector - New reticle using CBA scripted optics (#6981)
* vector IV updates

* vector IV updates

* compat cba optics and vector scripts

* hide periphery

* reticle texture for 7x magnification

* vector display config

* idc macros, fix illum mode

* add radblur effect when using optic

* hide zeroing control

* delete a broken config entry

* fix horizontal and vertical distance mode

* set REQUIRED_CBA_VERSION to 3.11.2
2019-05-27 10:46:07 -05:00
BaerMitUmlaut
452cba7ff7
Add vanilla magwells for 40mm grenades (#7004) 2019-05-22 01:31:37 +02:00
PabstMirror
50afcda918 Medical - Exit turret gunner view when going unconscious (#7003) 2019-05-20 21:12:18 +01:00
PabstMirror
c6609cbdb9
Common - Fix script error with uniqueItems in scheduled (#6998) 2019-05-13 17:20:01 -05:00
SilentSpike
82083323f2 Fix volume level of Soundinjured_Max files 2019-05-12 07:53:49 +01:00
Oliver Blanthorn
c012941af0 Add support for N-bangs (#6848)
* Add support for multi-bang flashbangs

It also adds some randomness to 1-bangs as a side effect,
but I don't think that's a big deal.

Also adds flashbang documentation to wiki.

* Increase rate at which flashbang attenuates

Apologies for the magic numbers. I just tested a few out
until I was happy with the result. The radius could probably
afford to be reduced a little further.

* use max deviation in config, fix wiki file name
2019-05-11 23:43:32 -05:00
classic
7b44138282 Update Japanese translation (#6980)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
2019-05-11 23:33:49 -05:00
mharis001
7877ce3116 Spectator - Add setting for follow camera max distance (#6989)
* Add setting for follow camera max distance

* Convert spectator settings to CBA function
2019-05-11 23:32:13 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
commy2
746d384a04
Merge pull request #6976 from acemod/taking-wheels-from-invincible-vehicles
Repair - Fix taking wheels from invincible vehicles
2019-05-11 23:09:59 +02:00
commy2
588ffba0a3
Merge pull request #6987 from acemod/fix-magwells-rearm
Fix rearming for vehicles using magazine wells
2019-05-11 08:38:33 +02:00
BaerMitUmlaut
229199ba16 Fix rearming for vehicles using magazine wells 2019-05-11 01:23:33 +02:00
PabstMirror
366f49295f
Medical Blood - Small optimizations (#6984) 2019-05-08 12:50:00 -05:00
Brandon Danyluk
709548c1ef Cookoff - Fix shell detonation (#6979)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* ShotShell requires velocity to simulate itself, so always spawn it with velocity
2019-05-06 10:23:07 -05:00
PabstMirror
e05c90767d Merge branch 'master' into cbaDisposable 2019-05-06 10:07:58 -05:00
PabstMirror
5eead2fc6e Merge branch 'master' into cbaDisposable 2019-05-06 10:05:35 -05:00
PabstMirror
5da1308151
Disposable - Add warning for addons using ace_disposable (#6963)
* Disposable - Add warning for addons using ace_disposable

* update arsenal code and cba version
2019-05-06 10:05:04 -05:00
BaerMitUmlaut
3cfdae899c Add berlin wall compatibility (#6982) 2019-05-05 19:03:57 -05:00
PabstMirror
e4c9440c34
Update addons/aircraft/XEH_preInit.sqf
Co-Authored-By: commy2 <commy-2@gmx.de>
2019-05-03 19:13:54 +02:00
commy2
585e919b35 grey out scripted eject action if eject actions are hidden 2019-05-03 17:47:40 +02:00
commy2
58ece34149 manual merge 2019-05-03 17:18:32 +02:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
commy2
050cd0a1f9 remove weather dependancy from winddeflection (#6975) 2019-05-03 16:56:56 +02:00
commy2
fba39bebd0 += for magwells 2019-05-03 13:07:04 +02:00
commy2
2cffe92848 don't disable remove mag if disposable replacement is disabled 2019-04-28 10:04:42 +02:00
commy2
9b57ef2111 adjustments for disposable enabled setting 2019-04-28 09:56:42 +02:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
PabstMirror
2cfe7ebd0c
FCS - Skip adding firedEH until needed (#6965) 2019-04-27 14:04:47 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966)
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
PabstMirror
5265e8bd84 Merge branch 'cbaDisposable' of https://github.com/acemod/ACE3 into cbaDisposable 2019-04-26 16:41:45 -05:00
PabstMirror
6250cd6505 Arsenal - Don't unload disposables 2019-04-26 16:41:42 -05:00
commy2
534abdede1 nlaw disposable realistic weight 2019-04-26 23:31:56 +02:00
commy2
6af3628e6f fix baseWeapon 2019-04-26 19:19:34 +02:00
commy2
20853d2b20 let cba replace mags 2019-04-26 09:48:31 +02:00
Filip Maciejewski
cc22e95012 Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932)
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions
2019-04-25 13:31:36 -05:00
PabstMirror
83cd316b2e
Common - Don't add UAV AI to localUnits array (#6951)
* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:30:43 -05:00
PabstMirror
15401468b9
Refuel - Drop nozzle at unit's feet if no valid pos found (#6957)
* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-25 13:28:11 -05:00
PabstMirror
1f1d950588
Map - Don't enable map light for parachutes (#6961) 2019-04-25 13:27:53 -05:00
commy2
cfe40ccd3f fix launchers in cargo 2019-04-25 18:30:35 +02:00
commy2
d3f9280e5d fix some copy paste leftovers 2019-04-21 19:03:42 +02:00
commy2
74229224d6 switch NLAW to CBA disposable system 2019-04-21 18:58:20 +02:00
Josuan Albin
28ac653635
Merge pull request #6953 from acemod/cba-disposable-compat
compatibility with CBA disposable framework
2019-04-19 14:36:08 +02:00
commy2
07ee2c1d3d compatibility with CBA disposable framework 2019-04-19 14:33:57 +02:00
Dedmen Miller
48480c97f5
Add ShadowLod to thrown variant 2019-04-19 00:19:06 +02:00
Dedmen Miller
f1e3a91308
Translation 2019-04-19 00:17:43 +02:00
Dedmen Miller
5ccf44293f
Merge branch 'master' into cts-7290 2019-04-19 00:14:03 +02:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func (#6937) 2019-04-16 16:47:13 -05:00
Josuan Albin
17f4af37fa
Merge pull request #6936 from alganthe/fixArsenalNVGBlacklist
[ACE Arsenal] Fix NVGs not being subject to blacklisting in loadouts
2019-04-12 17:29:34 +02:00
Josuan Albin
8fe02a455f Fix #6935 2019-04-12 14:39:28 +02:00
PabstMirror
69dc73ee45 Medical Feedback - fix heart rate effect (#6927)
* Medical Fedback - fix heart rate effect

and limit setVar for acre/tfar

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update XEH_postInit.sqf

* use "task_force_radio"
2019-04-09 10:51:59 -07:00
PabstMirror
0926d8508c Ballistics - Remove ace mags from incompatible weapons (#6930)
Close #6924

Co-Authored-By: drofseh <drofseh@users.noreply.github.com>
2019-04-09 10:44:20 -07:00
Rutger "RedBery" Meijering
c392236843 Medical activity to non local units is not logged (#6925)
* Fixes medical events not appearing in MP (when unit is non local)
Adds name to AUTHORS.txt (forgot to do this in other PRs)

* Fixes missing oef line

* Update addons/medical_treatment/XEH_postInit.sqf

Co-Authored-By: redbery <rutger@meijering.me>

* delete rogue character
2019-04-07 17:41:28 -05:00
PabstMirror
641dee39bd Fix trivial bugs (#6922) 2019-04-07 14:22:25 +02:00
commy2
c63310be95 compatibility with CBA scripted 2d optics framework 2019-04-03 20:41:15 +02:00
commy2
039ca9a053 compatibility with CBA scripted 2d optics framework 2019-04-03 20:39:11 +02:00
PabstMirror
6d50667359
Fastroping - Add user setting to confirm cutting ropes (#6876)
* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml
2019-04-03 12:18:55 -05:00
PabstMirror
ece1031c4d
RHS Compat - Add 2 round hellfire to pylon options (#6893)
* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon
2019-04-03 11:40:14 -05:00
PabstMirror
9588b13942 Zeus/Medical - Fix modules for rewrite (#6914)
* Zeus/Medical - Fix modules for rewrite

* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
Katalam
55a7d53437 Medical - Add condition for surgicial kit (#6916)
* Added condition canStitch

* Update XEH_PREP.hpp

* Update addons/medical_treatment/functions/fnc_canStitch.sqf

Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com>

* Added example, removed arguments information and changed > to isEqualTo

* Added example in canBandage too
2019-04-03 04:36:37 -07:00
Magnetar
24a533b968 Prevent opening the medical menu if the player is unconscious (#6915) 2019-04-02 08:57:28 -05:00
PabstMirror
b907c9d547
Medical - Add self interaction when needed (#6912)
* Medical - Add self interaction when needed

* Update addons/medical_gui/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/medical_gui/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-01 09:40:02 -05:00
brainslush
978049eab1 Add keep engine of vehicles running after getting out (#6885)
Adds a feature which leaves the vehicle engine running after getting out. So, it requires the driver to switch off the engine of the vehicle.
2019-04-01 11:17:18 +02:00
PabstMirror
3769679237
Add tool to verify stringtable entries exist (#6889)
* Add tool to verify stringtable entries exist

* Update circle.yml

* test

* Allow running from root directory as well as from inside the tools directory
2019-03-31 15:27:51 -05:00
PabstMirror
c7e6549eb2
Cookoff - Reword settings and move to cba (#6892)
* Cookoff - Reword settings and move to cba

* Update stringtable.xml
2019-03-30 21:54:12 -05:00
PabstMirror
0052dd3af2
Interaction - Pass Magazine fixes (#6894)
Use CBA_fnc_compatibleMagazines
Fix nil return if no mags
Ensure target canAdd
2019-03-30 20:49:59 -05:00
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907)
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
SilentSpike
ac1651c6db Prevent bandaging when not bleeding (#6532) 2019-03-30 15:44:58 -05:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
Medical rewrite
2019-03-30 15:20:15 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -05:00
PabstMirror
7f2ac32180 Fix event for items conversion 2019-03-30 09:56:21 -05:00
Rutger "RedBery" Meijering
f0fb267501 Include medical_feedback settings.sqf file (#6903) 2019-03-30 14:19:41 +00:00
Laid3acK
37daf3429d Fix .300NM Berger Hybrid airFriction (#6901) 2019-03-29 21:40:38 +01:00
PabstMirror
047583ce1d rectify localUnits func #4836 2019-03-25 22:49:53 -05:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings (#6890)
* Handle old public funcs, fix strings

* Update addons/medical/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
mharis001
8d2bba4b35
Rewrite Medical GUI (#6831)
* Add a macro for the bloodloss scaling factor

* Adjust bloodloss threshold for red icon

* Remove bloodloss color scaling factor

The issue is actually the other way round, the factor of 20 would
instantly make bodyparts red on taking a wound.

* Implemet 10 color steps provided by ShackTac

This replaces the old method of colouring the interaction menu icons
and body image selections with a new method that has 10 distinct color
steps (matching across the icons and the body image).

* Use macros for constants

* Implement blue damage colouring

This re-adds visualisation for colouring based on damage. The case where
a limb has a tourniquet will hopefully be handled by an overlayed icon.

* Tidy up file structure

* Move patient information display to medical_ui

* Make common colour conversion code into functions

* Add tourniquet icon overlay to body image

* Fix mispelling I forgot to commit

* Update icon paths to new white cross icon

* Clean mess after rebase

* Add new medical menu gui

* Add updating injury list and body image

* Add updating treatment category buttons

* Update onMenuClose function

* Delete unused functions

* Add action buttons and triage card to menu

* Move medical menu PFH to separate function

* Move setTriageStatus to treatment

* Add triage select dropdown

* Add toggle button action

* Fix mouse moving randomly when opening

* Add logs list update and remove unused functions

* Hide tourniquet icons by default

* Remove CfgInGameUI (already in feedback)

* Update patient info display

* Update triage card display

* Add settings to control interact menu actions

* Cleanup files/paths

* Move triage status update to common function

* Add icons for interact menu actions

* Modify icon color for interact menu actions

* Update canOpenMenu for new setting

* Hide pain information for unconscious

* Stringtable cleanup

* Use switch for pain text

* Change minor triage status to minimal

* Fix injury list to use new stringtable entry names

* Fix medical actions check when disabled

* Skip distance check in same vehicle

* More cleanup

* Fix CI error

* Requested changes

* Fix INJURIES string

* Fix include after comment block

* Fix missing ;

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-03-24 18:17:48 -04:00
commy2
b4d2eaae6e
Use needsRestart flag 2019-03-24 10:15:56 +01:00
commy2
5277bc083b fix a macro 2019-03-24 09:41:36 +01:00
commy2
6cff8deba8 cleanup dragging 2019-03-24 09:28:58 +01:00
commy2
6ac2906aba setMass method to disable collisions 2019-03-24 09:26:00 +01:00
PabstMirror
f23927d84a Fix some strings 2019-03-24 00:50:36 -05:00
PabstMirror
2d0090422c move settings to sqf 2019-03-24 00:37:39 -05:00
PabstMirror
c492f184b4 move dev funcs to folder 2019-03-23 19:55:04 -05:00
commy2
cea1599112 manual merge 2019-03-23 23:46:30 +01:00
PabstMirror
2ea029c219
Quickmount - optimize subActions (#6883) 2019-03-21 21:29:51 -05:00
Unknown
a8d28ebedc Merge remote-tracking branch 'upstream/master' into medical-rewrite 2019-03-21 17:51:19 -04:00
Rutger "RedBery" Meijering
15036d7fd8 Fixes to unconsciousness and damageTypes systems (#6589)
* Fixes BleedingCoef having impact on bloodloss KO
Fixes incorrect var in setUnconscious

* Changes method for checking if typeOfDamage is valid
Adds check for if typeOfDamage is valid to extension version of woundsHandler

* Changes collision wound location select to a weighted system to make it more lethal at faster collisions
Adds collision and drowning damage types to config (drowning has no related wounds to prevent wounds being added while drowning).

* Fixes unneeded space

* Fixes minor mistake (body damage chance should go from 1 to 0 without ever becoming negative)
2019-03-21 19:33:51 +01:00
PabstMirror
e8970ab8ad ACE_settings captiliaztion 2019-03-21 09:46:23 -05:00
PabstMirror
711e9073a8
Explosives - Allow setting custom timer limits (#6882) 2019-03-21 09:01:50 -05:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Dystopian
d804d3afe6 Cleanup some functions headers and macro using (#6866)
* Cleanup frisking

* Cleanup header format

* Cleanup FUNC macro using
2019-03-20 15:18:43 -05:00
Magnetar
89927a8b94 Missing privates. Lazy evaluation. 2019-03-17 21:26:15 +01:00
Magnetar
934339d1df Fix missing INJURY string 2019-03-17 18:38:31 +01:00
Magnetar
99f5d2ea0a
Rewrite rectify convert option (#6825)
* Rewrite Rectify - Adding option to convert vanilla medical gear

* Oops
2019-03-17 17:59:49 +01:00
Magnetar
54208a1a78
Rewrite rectify - Skip distance check if in same vehicle (#6823) 2019-03-17 17:58:43 +01:00
Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious (#6822)
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious

* Fix copy paste
2019-03-17 17:54:50 +01:00
Magnetar
82131b3643 Fix include in wrong location 2019-03-17 17:48:44 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
Dedmen Miller
79786bb9d6 Less rusty dirt 2019-03-16 13:16:54 +01:00
Dedmen Miller
2bc37b71bc Remove rust 2019-03-16 13:06:22 +01:00
Dedmen Miller
36393ef4ee Fix peen 2019-03-16 12:58:47 +01:00
Dedmen Miller
d795029f3c Fix stringtable 2019-03-16 12:51:49 +01:00
Dedmen Miller
b2f20cb2d5 Rotate 20deg 2019-03-16 12:51:44 +01:00
Dedmen Miller
72427b2ece Move banana and replace with text 2019-03-16 12:51:40 +01:00
Dedmen Miller
08dab417d0 Merge branch 'master' into cts-7290 2019-03-16 12:07:31 +01:00
commy2
df8b23b9ba version check handle minor versions below 10 2019-03-16 11:05:01 +01:00
commy2
f248e81c65 version check handle minor versions below 10 2019-03-16 11:00:20 +01:00
commy2
e4391a8060
Merge pull request #6869 from veteran29/hideEjectSetting-polishTranslation
hideEjectAction - Polish translation
2019-03-15 08:23:59 +01:00
Filip Maciejewski
69b9f1e338 hideEjectAction - Polish translation 2019-03-15 00:58:12 +01:00
commy2
aef3073ee8 hide by default 2019-03-15 00:56:09 +01:00
commy2
2dbc4993d8 add setting to hide Eject action from action menu 2019-03-15 00:37:04 +01:00
PabstMirror
fb4f05e276 Prep 3.12.6 Build 43 2019-03-14 09:22:08 -05:00
PabstMirror
732368584a Merge branch 'master' into release-3.12.6 2019-03-14 09:21:14 -05:00
PabstMirror
57db905f7c
Zeus Actions - Fix config code breaking during build (#6864)
* Zeus Actions - Fix config code breaking during build

* Update addons/rearm/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, add note
2019-03-14 09:17:34 -05:00
markooff
b4639ed758 tlumaczenie_12_03_2019 (#6865)
Translations - Polish
2019-03-13 00:18:33 -05:00
PabstMirror
373f11338d Prep 3.12.6 Build 42 2019-03-12 13:35:51 -05:00
PabstMirror
88d4e32f48 Merge branch 'master' into release-3.12.6 2019-03-12 13:34:41 -05:00
mharis001
695416dfe7 Arsenal - Improvements to 3DEN attribute (#6849)
* Improvements to arsenal 3DEN attribute

* Better alignment of button

* Remove magazineGroups copy
2019-03-12 11:26:40 -05:00
Dystopian
2ff614c3a2 Safe Mode - Fix disabled laser on safety switch (#6639)
* Fix disabled laser on safety switch

* Add workaround for switching to primary weapon

* Add UGL check
2019-03-12 11:26:20 -05:00
Matsuo Yutani
842f9e5d3b Update stringtable.xml (#6860)
Updated <Portuguese> values for the Saline quantity.
2019-03-11 10:12:14 -05:00
Dedmen Miller
564fc8aa99 Trivial code fixes (#6858) 2019-03-10 21:42:08 -05:00
Dystopian
24d2aa647e Repair - Fix Typhoon rear wheel change (#6207) 2019-03-10 21:41:06 -05:00
Dystopian
56f9d76d0f UI - Fix selective UI in cargo (#6585)
* UI - Fix selective UI in cargo

* Add FFV not in cargo check
2019-03-10 21:40:28 -05:00
Oliver Blanthorn
262272cfba
Add proper 9bang configuration
Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-03-10 10:03:19 +01:00
Dedmen Miller
51dfc081ac Fix M84 lods (#6854) 2019-03-09 20:19:58 -06:00
Dedmen Miller
82f8095b5e Add ui icon 2019-03-09 19:42:23 +01:00
Dedmen Miller
7ac58737f4 Add CTS 7290 9-bang flashbang grenade 2019-03-09 19:36:54 +01:00
PabstMirror
28620d86d1
fix to weaponMuzzleVelocity (#6850)
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Add Pabst' fix to weaponMuzzleVelocity
2019-03-08 09:12:07 -06:00
Dedmen Miller
5ad8b3c6bc Arsenal - Fix incorrect muzzle velocity stat displayed on magazine (#6844)
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-03-05 10:42:04 -06:00
C0kkie
ca71375259 Captives - Use the doApplyHandcuffs function for keybind (#6843)
* Use the doApplyHandcuffs function that cabletie

* Update XEH_postInit.sqf
2019-03-05 09:40:10 -06:00
classic
c37b7644af Update Japanese translation (#6838)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
2019-02-28 13:36:34 -06:00
jonpas
6a5811a9b2 Increase required Arma 3 version to 1.88 (#6836)
No Uniform Restrictions got updated for 1.88
2019-02-27 17:44:39 -06:00
PabstMirror
4f1ce4a36f Prep 3.12.6 Build 41 2019-02-27 12:59:01 -06:00
Dedmen Miller
7f04d00b7f Add localUnits array and use that inside medical statemachines (#4836)
* Added localUnits EH

Code by @Commy2

* Init localUnits Variable

* use localUnits for medical_blood statemachine

* use localUnits for medical_ai statemachine

* Remove bracket hell

* Add Deleted EH

* Run at preInit, move to seperate file

* Handle Respawns, Filter Dead

* Add detection for Fake deleted EH

* Use a getter function

* delete all objNull at deletedEH

* Cleanup header/comments

* Move isBleeding check to inside statemachine

* opps

* debug off
2019-02-26 23:28:16 -06:00
Josuan Albin
4792e74b2b Explosives - Change SLAM magnetic to detonate upon defusal (#6827)
* Change SLAM magnetic to detonate upon defusal

* Disable explodeOnDefuseChance on SLAM timer mode
2019-02-24 14:18:01 -06:00
PabstMirror
c423e2167c
Zeus - fix script error (#6833) 2019-02-24 14:03:54 -06:00
Dedmen Miller
48f45ae27a Move SelfActions from postInit to config (#6791)
* Move zeus SelfActions to config

* Port CBA PR #1048

* Move Land_Camping_Light_off_F TurnOn action to config

* Move createModule function to script func

* Update addons/zeus/functions/fnc_canCreateModule.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Teaching it a lesson about spacing

* Update CBA: script_macros_common.hpp

* Just change admin in cba macro
2019-02-24 13:36:50 -06:00
PiZZAD0X
9e609b3394 Arsenal - Add Ability to Transfer a Loadout from Saved to Default (#6793)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Added ability to export loadout to defaultloadouts

Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand.

* Update fnc_buttonLoadoutsSave.sqf

* Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Add usage info to tooltip
2019-02-23 19:35:13 -06:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload (#6821) 2019-02-22 18:54:55 -06:00
PabstMirror
860fa0fcfa
Repair - Add condition check to progressBar (#6830) 2019-02-22 18:54:25 -06:00
PabstMirror
3ee3c5de5a
Interact Menu - Cache config actions for CAManBase (#6818)
* Interact Menu - Cache config actions for CaManBase

* Update addons/interact_menu/functions/fnc_compileMenu.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/interact_menu/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-02-22 18:54:07 -06:00
PabstMirror
191c4fb694
Disable debug on ace_common_fnc_readSettingsFromParamsArray (#6820) 2019-02-17 12:58:07 -06:00
Dedmen Miller
0c8c924487 Minedetector - Cache detectableClasses (#6805)
* Cache minedetector detectableClasses

* use compileFinal
2019-02-17 12:31:34 -06:00
Dedmen Miller
21fd4e5d16 Inventory - Cache inventory postInit config lookups (#6803)
* Cache inventory postInit config lookups

* Safety

* fix

* More better

* ugh

* add parenthesii (not trolling)

these are actually needed
```
Error in expression <_inventory_Grenades_ItemList", []];
if (!ace_inventory_Grenades_ItemList isEqual>
  Error position: <!ace_inventory_Grenades_ItemList isEqual>
  Error !: Type Array, expected Bool
```

* Add space
2019-02-17 11:41:48 -06:00
Dedmen Miller
7cce148513 Tagging - Cache tagging static models (#6804)
* Cache tagging static models

* Fix bugs, use compileFinal

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Use toLower
2019-02-17 11:41:25 -06:00
Dedmen Miller
af1cf2c7f6 Cargo - Cache cargo vehicle classes (#6806)
* Cache cargo vehicle classes to init

* fix

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix initEH being added twice for static weapons
2019-02-17 11:41:05 -06:00
Dedmen Miller
25d847ef12 Refuel - Cache refuel classes (#6807)
* Cache refuel classes

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix script errors from inner _x
2019-02-16 17:05:24 -06:00
commy2
deb7177171
Merge pull request #6815 from acemod/callCompileCleanup
Cleanup spacing on call COMPILE_FILE
2019-02-14 21:22:29 +01:00
Dedmen Miller
598738c22f Common - Use CBA addons instead of activatedAddons (#6802)
* Use CBA addons instead of activatedAddons

* Better checks

* Betterest checks

* Delay call to toLower until needed

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-02-14 12:49:56 -06:00