Commit Graph

14036 Commits

Author SHA1 Message Date
Elgin675
da552bb1fd
Translations - Update / Fix French Translations (gunbag and map_gestures modules) (#7775)
* Translation - Add / Fix french gunbag keys

* Translation - Add French Map_Gestures_onlyShowFriendlys keys
2020-06-29 10:44:02 -05:00
shukari
b77324ec58
Arsenal - add custom right panel misc items buttons (#7596)
* added medical, food and roleplay categories to arsenal

* decreased wound stitch time

* added custom rightPanelButtons

* stuff that doesnt belong here

* fix

* commys wishes

* commys wishes part2

* Update addons/arsenal/defines.hpp

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

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

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

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

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

* infinitely better SPEED

* changes

* delete unused stuff

* my own 3 white dots

* fixed fillRightPanel IDC_MISC

* commy fixes

* background first

Co-authored-by: Schwaggot <tom.ryan@posteo.de>
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2020-06-29 10:43:33 -05:00
mharis001
d38dd1d67f
Add support for ED-1D and ED-1E drones (#7778) 2020-06-29 10:43:05 -05:00
Gold John King
4fedf5ecf5
Add: Simplified Chinese Translation for medical items and GUI (#7772)
* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Update SC Translation for triage card

Update SC Translation for triage card
2020-06-23 09:12:06 -05:00
Hubert Stefanski
fe8d2e900b
Translations - fix Polish punctuation (#7776)
* fix punctuation

* minor change to lower-case
2020-06-23 09:11:22 -05:00
PabstMirror
5b559152e2
Update stringtable_validator.py (#7774) 2020-06-22 15:26:18 -05:00
PabstMirror
c18ba87c60 Prep 3.13.3 Build 51 2020-06-22 14:04:03 -05:00
PabstMirror
cb2809f1b0 Merge branch 'master' into release-3.13.3 2020-06-22 14:03:47 -05:00
Smith
03fb4222d5
Added Russian translations to stringtables (#7770)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-22 13:51:52 -05:00
Hubert Stefanski
1fbcd2fb71
Add missing Polish translations (#7773) 2020-06-22 13:46:17 -05:00
PabstMirror
8ec20c5133 Prep 3.13.3 Build 50 2020-06-20 16:45:08 -05:00
teemo0803
05f56a6607
Update stringtable.xml (#7767) 2020-06-20 16:35:08 -05:00
mharis001
66f39eb5c2
Pylons - Fix disconnect handling (#7766) 2020-06-20 10:19:20 -05:00
Vdauphin
e9c1f5e18f
Medical - Improve injured sound by exiting the function earlier if no player is around (#7521)
* Exit earlier the playInjuredSound if no player is around

* Check if _targets array has at least one player

* Remove useless parenthesis

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

* Handle player inside a vehicle

If any player is inside the area then the _targets will not be empty. This also handle the case where player is inside a vehicle or _unit is a player.

* Handle z axis

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

Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 19:42:23 -05:00
Dedmen Miller
c1b906c29d
Tagging - Add support for mission Tags (#7710)
* [Tagging] Added ability to specify custom model

* Update Tagging Framework doc

* [Tagging] Added parsing tags from missionConfig

* Update Tagging Framework doc

* Apply suggestions from code review

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

* Forgot passing a variable to WAE

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:36:47 -05:00
mharis001
553bba8ece
Common - Fix disableUserInput blocking already open Zeus display (#7757) 2020-06-19 10:36:24 -05:00
Joko
00fa94e636
Map Gestures - Rewrite and Add Zeus, and Spectator support (#7653)
* Initial Rewrite

* improve getProximityPlayers

* add Zeus Implementation

* fix missing simicolon

* add Spectator Support

* improve local responsiveness

* add Vanilla Spectator Support

* Fix Both Spectators are now working correctly

* exit mouse moving event early when disabled

* Move Diary Event registration to XEH DisplayLoaded

Port Settings to SQF
Add Setting for only showing Friendly Units pointing

* Fix Merge Issue in Stringtable

Redo Settings

* fix a copy past script error

* Update addons/map_gestures/functions/fnc_getProximityPlayers.sqf

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

* Lazy evals and defines

* Small changes

* Simplify initDisplayDiary and fix loading saves

* Cache getProximityPlayers

Improve Vanilla Spectator Support and how Followed unit Nearby data

* Minor header update

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:35:57 -05:00
mjc4wilton
7d4a2b07bb
Gunbag - Add weapon swapping (#7713)
* Gunbag Update

adds capability to swap a currently held primary weapon and the weapon current stored in the gunbag. Has a 1.5x time to complete compared to just adding or removing a weapon from the gunbag.

* Update stringtable.xml

* Update addons/gunbag/functions/fnc_swapWeapon.sqf

Update authors field to add credit to the original author of much of the changed code

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf

Update the virtual load in a more efficient way.

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf

Properly attribute author of majority of original code

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update stringtable.xml

* Update French translation

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Remove non-English translations

Leave translations open to translators

* Add CBA setting to enable weapon switching (Default false)

* Fixed variables and updated names for consistancy

* Convert from ACE Settings to CBA Settings

* Fix stringtable.xml indentation

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbag.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

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

* Update initSettings.sqf

Change default value to true

* Update CfgVehicles.hpp

Co-authored-by: Joko <hoffman.jonas95@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:35:19 -05:00
Smith
6525ae17b7
Translations - Update / Fix Russian (#7764)
* Translations - Update / Fix Russian

* Delete trailing char from Spanish translation
2020-06-18 10:41:23 -05:00
Elgin675
515d5aa97f
Translations - Update / Fix French Translations (#7763)
* Translation - Add French Dragging_CarryKeybind key

* Translation - Add / Fix French GForces keys

* Translation - Add French Medical_GUI_IGUI_PatientInfo key
2020-06-15 14:37:37 -05:00
Joko
eef7610f3e
downscale bodybagitem (#7755) 2020-06-15 13:56:47 -05:00
ace3mod
fddc38a139 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2020-06-15 17:12:32 +02:00
PabstMirror
f9eaabe287
Update deploy.py (#7762) 2020-06-15 10:11:45 -05:00
Rutger "RedBery" Meijering
7de6196c52
Fixes typo in medication adjustment check (#7759) 2020-06-15 09:53:25 -05:00
Rutger "RedBery" Meijering
7da977a4e3
Fixes some magazines not being found leading to duplication (#7760) 2020-06-15 09:52:14 -05:00
mharis001
3d6a558268
Fastroping - Fix FRIES removal (#7756) 2020-06-14 14:30:28 -05:00
PabstMirror
c35f4f6fe2
pDrive dumbies for make.py (#7758) 2020-06-14 14:30:10 -05:00
Dystopian
09cc8173a1
Fix change seat while vehicle is moving (#7692) 2020-06-13 16:32:07 -05:00
PabstMirror
92941c11de
Aircraft - Restore missing laser designator on Commanche (#7752)
* Aircraft - Restore missing laser designator on Commanche

This now matches vanilla
Close #7712

* Update addons/aircraft/Heli_Attack_01_base_F.hpp

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

* Update addons/aircraft/Heli_Attack_01_base_F.hpp

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-06-13 16:03:28 -05:00
Laid3acK
d8a3eab499
Ballistics - Fix DMR_03 (SIG556) initSpeed (#7567)
* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix
2020-06-13 15:58:42 -05:00
Whigital
0de67b69b2
Compat_rhs_usf3 - Improve RHS:USAF explosives compatibility (#7736)
* cleanup

* tripwire mines
2020-06-13 15:58:20 -05:00
Whigital
da7a7107ea
Compat_rhs_gref3 - Add RHS:GREF explosives compatibility (#7735)
* initial

* more mines

* mines mines mines

* last mine batch

* tnt
2020-06-13 15:58:00 -05:00
Whigital
8882434200
Compat_rhs_afrf3 - Add RHS:AFRF explosives compatibility (#7734)
* initial + tm62m

* more mines and explosives

* more mines

* add defuse positions

* additional dependency

Two of the mines (rhs_mag_mine_pfm1 & rhs_mag_mine_ptm1) are defined in rhs_c_airweapons

* remove redundant attributes
2020-06-13 15:57:28 -05:00
Serg Vergun
56b397ffa7
Fix medical_feedback override hearing settings (#7744) 2020-06-13 15:55:59 -05:00
Lazejun
a5ba5abb42
RHS Compat ADD Missing (undefined) Weapons (#7702)
* Added Missing Values

* M240G Added

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes"

This reverts commit d14bcb64e4, reversing
changes made to dbaea26161.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into RHS-Compat-CFG-Weapon-fixes""

This reverts commit 65709b70f8.

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* minor config style change

* minor config style

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:55:05 -05:00
Dystopian
2eedf7a4e7
Reload - Fix display ammo count in vehicle (#7730)
* Fix display ammo count in vehicle

* Revert CSW changes
2020-06-13 15:54:06 -05:00
Filip Maciejewski
79ca6f5141
Medical - Add Patient Info to Layout Editor (#7745)
* Move GVAR(RscPatientInfo) contents into ControlsGroup

* Add CfgUIGrids for Medical PatientInfo

* Move Medical PatientInfo to Layout Editor position

* Uniform macro names

* Apply suggestions from code review

* Add IGUI category translation

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Update addons/medical_gui/CfgUIGrids.hpp

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

* Remove redundant translations

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:53:50 -05:00
Daniel Gibson
185c15de0e
Medical - Add Global Wound Reopen Chance Modifer (#7747)
* Added Bandage Reopening Chance Modifier

* Added Wound Reopen Chance Addon Setting

* Fixed dumb error in localization setup

* Credit!

* Resolved issue with Addon Settings definition & removed testing values.

* PR Feedback #1

- Removed unnecessary whitespace on LN 46
- Call global var directly at LN 87
- Updated Wound Reopen Chance localized name & description

* PR Feedback #2

- Increased reopen coefficient upper limit from 2 to 5.

* Changed author credit to reflect GitHub email.
2020-06-13 15:52:30 -05:00
LachlanSneddon
c39992199a
Dragging - Add Keybind for Carry (#7746)
* add carry keybind

* Corrected canCarry Check

* Removed 'False' in key up parameter

* removed newline
2020-06-13 15:51:47 -05:00
Joko
3a13dd416a
Improve Performance from updateTrajectoryPFH in Winddeflection (#7700) 2020-06-13 15:45:27 -05:00
Joko
6a59bf2a6c
Advanced Ballistics - Improve Performance in handleFirePFH (#7699)
* Improve Performance from handleFirePFH in Advanced Ballistics

* PabstMirror Suggestion

* Dont remove and readd the PFH but have one persitently running

* Update addons/advanced_ballistics/XEH_postInit.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:45:09 -05:00
Filip Maciejewski
7c93ee9ed3
GForces - Add forces strength coefficient setting (#7750)
* Move GForce settings to CBA Settings

* Add GForce coefficient setting

* Fix typo

* Restore ACE Settings class and mark as moved to SQF

* Apply translation suggestions from code review

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-06-12 19:06:03 -05:00
Whigital
e7256dad3d
Explosives - Fix place explosives cache not being cleared on respawn (#7637) (#7739)
* respawn handler

* Revert "respawn handler"

This reverts commit abdf9599bf.

* unit switched eh

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-10 16:24:15 -05:00
PabstMirror
5de7b6b6a3
MicroDagr - Don't show markers on compass "map" control (#7751)
Close #7738
2020-06-08 23:05:57 +02:00
mharis001
99df791c43
Arsenal - Add grenade fuse time stat (#7694)
* Arsenal - Add grenade fuse time stat

* Add German translation

Co-authored-by: Jo David <github@jonathandavid.de>

* Add French translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Improve IR grenades handling

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

* Get ammo config once

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-07 19:58:55 -05:00
McDiod
e25b02263a
switchUnits - Fix switching units not working (#6188) (#7676) 2020-06-07 18:25:11 -05:00
dependabot[bot]
c99e122d84
Bump websocket-extensions from 0.1.3 to 0.1.4 in /docs/src (#7749)
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-06 09:24:28 -05:00
mharis001
7746dbcc75
Spectator - Add display loaded and unloaded events (#7720) 2020-06-05 20:13:10 -05:00
Fyuran
eaa23cc84f
-fix to RHS USAF ACE Compatibility Mod Error - no entry 'bin\config.bin/CfgVehicles/RHS_CH47F/UserActions/OpenCargoDoor.displayName'. #7708 (#7711) 2020-06-05 20:01:59 -05:00
PabstMirror
1b94b25ff6
Trenches - Fix mission placed trench interactions (#7672)
Assume progress is 1 if undefined
define placeData if undefined
2020-06-05 18:35:32 +02:00