Commit Graph

11457 Commits

Author SHA1 Message Date
Saborknight
68143cba41
Explosives - Remove "Activate mine" action menu item (#7622)
* Fixed - "Activate mine" action menu item still showing

The "Activate mine" action menu item was still showing, but only after an explosive was set, then diffused.

* Update addons/explosives/config.cpp

Co-authored-by: commy2 <commy-2@gmx.de>
2020-04-04 14:58:10 +02:00
BaerMitUmlaut
54086bb2ef
Fix being stuck dragging when in combat pace (#7617) 2020-04-03 18:28:14 -05:00
Rutger "RedBery" Meijering
1f20047410
Rearm - Fix vehicles failing rearm due to case differences (#7609) 2020-03-20 17:54:30 +01:00
TWC-Rik
be3d69ff25
Reload Launchers - Improve External Launcher Reload (#7605)
Launchers reloaded by an external player will be instantly loaded since
the external player already has to go through a loading bar.
2020-03-15 21:41:55 +01:00
PabstMirror
82116bd98b
CSW - Check carry mag exists (#7587)
Fix #7579
2020-03-11 18:42:21 -05:00
PabstMirror
e89c172d34
Arsenal - Fix main menu mission (#7594)
* Arsenal - Fix main menu mission

* fix double space

* Add note
2020-03-11 21:09:36 +01:00
Laid3acK
3db9a24007
Ballistics - 300WM Berger Hybrid OTM airFriction updated (#7570)
* ballistics_300WM

* ballistics_300WM

* ballistics_300WM

* ballistics_300WM
2020-03-09 11:43:11 -05:00
classic
85f67ac883
Update Japanese translation (#7568) 2020-03-09 11:26:20 -05:00
jonpas
4607f39249 Prepare release 3.13.1 2020-02-29 23:15:33 +01:00
jonpas
c42a004ab3
General - Fix preprocessor issues (#7563)
* Fix preprocessor issues

* Fix more preprocessor issues
2020-02-29 16:09:31 -06:00
commy2
15b4b98e5b
Medical Status - Fix double execution of killed event (#7561)
* fix double execution of killed event

* revert the execNextFrame change

* make second execution run with null

* make second execution run with null
2020-02-29 16:09:00 -06:00
commy2
9b86446b26
fix some magwells (#7562) 2020-02-28 18:33:11 +01:00
pterolatypus
c949a07c83
Medical Engine - Apply damage to the correct hitpoint (#7415)
* HandleDamage uses armour values to determine which hitpoint was damaged

* Tidied up comments

* Newlines

* Tabs? In MY code?!

* Added uniform caching and option to force disable caching

* Review suggestions

* Review suggestions/code style

* Spelling and select

* Removed unnecessary validity check

* Apply suggestions from code review

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

* Tweaks and optimisations, removed _noCache

Also fixed cache nil vs empty

* Different approach with fewer loops
Lookup is now done per-hitpoint and default values cached
fnc_getItemArmor made a helper function as it's now only a few lines

* Tabs & newlines

* Moved uniform logic inside helper function

* Optimisations

* Tweaks & optimisations, improved formatting

* Ignore explosionShielding

* Moved getArmor back to separate func, add per-unit caching

* Formatting

* Review suggestions

Co-authored-by: commy2 <commy-2@gmx.de>
2020-02-28 17:54:53 +01:00
Laid3acK
1d9361c503
fix_brace 2020-02-28 11:08:40 +01:00
Laid3acK
4a6d32774e
space_atragmx_initgunlist 2020-02-28 10:13:59 +01:00
Laid3acK
09332d333f
polish_atragmx_initgunlist 2020-02-28 10:11:07 +01:00
Laid3acK
3a3e0c53a0
dispersion_removed 2020-02-28 10:09:06 +01:00
Laid3acK
02b7b6d2c3
dispersion_removed 2020-02-28 10:02:51 +01:00
Laid3acK
06f2c8e1d5
Pistol_Base_F_cleanup 2020-02-28 09:42:31 +01:00
Laid3acK
a1adf73d4b
Rifle_Short_Base_F_cleanup 2020-02-28 09:12:26 +01:00
Laid3acK
85a5e5ab8c
rifle_base_cleanup 2020-02-28 08:21:30 +01:00
Laid3acK
b64d988aa8
Rifle_Base_MX variants 2020-02-27 19:11:50 +01:00
Laid3acK
0a5f87df8c
Rifle_Long_Base_Sniper_Marksman 2020-02-27 17:30:04 +01:00
Laid3acK
8be0a8b1ca
dispersion_removed 2020-02-25 15:02:39 +01:00
PabstMirror
60155f2ab8
NightVision - Fix border missing while in FFV (#7554)
Fix #6769
2020-02-24 12:13:24 -06:00
Elgin675
92a987059c
French translation (#7550)
* French translation: Fracture chance

* French translation: AdvancedBandages_EnabledCanReopen key

* French translation: BloodVolumeEffectType keys
2020-02-23 09:26:51 -06:00
commy2
2715ef954a
Merge pull request #7549 from acemod/clamp-TreatmentAnimationSpeedModifiers
Medical Treatment - Prevent extremely slow or fast animations
2020-02-23 16:10:56 +01:00
commy2
ae7feae433
Merge pull request #7548 from acemod/fix-AimDownSightsBlur
NightVision - Don't apply AimDownSightsBlur on optics with integrated night vision
2020-02-23 16:10:19 +01:00
commy2
754a9e09af values, simplify 2020-02-23 14:25:11 +01:00
commy2
27ecfc6a5b prevent extremely slow or fast animations 2020-02-23 14:14:11 +01:00
commy2
42f710cdd0 reset effect on magnifaction transition 2020-02-23 13:52:32 +01:00
commy2
f9f1d634ae remove a debug line 2020-02-23 13:32:50 +01:00
commy2
a375e068f7 don't apply AimDownSightsBlur on optics with integrated night vision 2020-02-23 13:29:38 +01:00
commy2
a6373e936d fix MenuClosed event may not fire on menu type replacement 2020-02-23 11:59:14 +01:00
jonpas
3145a31d00
Remove requirements for usable items to be in backpack (#7545) 2020-02-23 02:11:20 +01:00
commy2
f7a880e81b
Merge pull request #7544 from acemod/fix-unconscious-interact
Common - Add isNotUnconscious canInteractWith condition
2020-02-22 23:12:08 +01:00
mharis001
58a0cd860b Common - Add isNotUnconscious canInteractWith condition 2020-02-22 17:07:32 -05:00
jonpas
f6af95b4a1
Arsenal - Optimize non-scope 2 mags filtering (#7543) 2020-02-22 22:26:55 +01:00
Elgin675
d63c7685b4
Update French Translations (#7440) 2020-02-22 22:15:28 +01:00
PabstMirror
1ee2e6adb2
Arsenal - Filter non-scope 2 mags from being auto-added (#7445) 2020-02-22 22:15:09 +01:00
jonpas
f6dda745c2
Medical - Combine advancedBandages and woundReopening settings (#7392)
* Medical - Combine advancedBandages and woundReopening settings

* Improve German translation

Co-Authored-By: Jo David <github@jonathandavid.de>

* restore strings lost in merge

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-22 22:09:56 +01:00
Sycholic
d5f8f93a9a
Mine Detector - Updated mine detector audio from -20db to -2db (#7460) 2020-02-22 22:09:10 +01:00
mharis001
d7f12eb49a
Medical - Use percentage sliders for chance settings (#7542) 2020-02-22 21:57:04 +01:00
padddyyy
056560e798
Update German Translations (#7469) 2020-02-22 21:53:35 +01:00
Filip Maciejewski
46e4f7c6ec
Medical Damage - Improve description of "DamageThreshold" (#7436) 2020-02-22 21:48:40 +01:00
10Dozen
b30f023c04
Adds Icon option for Low blood volume at Medical Feedback (#7507)
* Adds Icon option for Low blood volume at Medical Feedback

- Adds setting to switch Low blood volume effect with 3 options: Color fading, Icon, Color fading + Icon
- Adds icon to UI on low blood
- Adds icon PAA files

* Review fixes

- Added ACE tags to added controls
- Added defines for GUI position/size
- Added missing newline at EOF
- Updated fnc_effectBloodVolumeIcon (removed usage of uiNamespace and minor changes)
- CBA_fnc_addSetting is now used to init settings
- Icon path macro updated to return formatted path

* Review fixes vol.2

- Removed `disableSerialization` and added default value for indicator control and not null checks to effectBVI function
- Removed defines from RscInGameUI and used a3 defines instead
- Changed formatting of macroses

* Review fixes vol.3

- Fixed exec code of BV setting
- Removed ctrlCommit from eBVI function
- Changed initEffects function to be able to update pain and BV effects only
- Changed control name from `BloodVolumeInfoIndicator` to `bloodVolumeIndicator`
- Various formatting tweaks (spaces/lines/uppercase/periods)

* Review fixed vol.4

- Remove extra checks from eBVI func
- Restores contol's onLoad script using ARR_2(QQGVAR())
2020-02-22 14:42:59 -06:00
diwako
bd040ca19d
Medical - Fix being stuck in unconscious animation after ragdoll (#7499) 2020-02-22 21:39:14 +01:00
BaerMitUmlaut
3bc727f960
Grenades - Make flashbang reaction more authentic (#6034) 2020-02-22 21:36:25 +01:00
commy2
af777a40db
Merge pull request #7497 from Whigital/csw_mags_zeus
CSW - Minor fixes for CSW + RHS Compats
2020-02-22 21:33:00 +01:00
mharis001
a7bd05ddd3
Medical - Add fracture chance setting (#7396) 2020-02-22 21:31:14 +01:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit (#7529) 2020-02-22 21:24:47 +01:00
Laid3acK
e1f6db8a69
Ballistics - B_93x64_Ball updated (#7474)
* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk
2020-02-22 14:15:39 -06:00
Brandon Danyluk
5172e7717c
fix static weapon ammo check (#7541)
For some reason ARMA never returns any muzzle for crewed/non crewed static weapons. Work around this by always returning whatever weapon the static weapon has no matter what
2020-02-22 14:09:15 -06:00
Rutger "RedBery" Meijering
d6753250d1
Fixes typo in splint comparison (#7518) 2020-02-22 14:09:04 -06:00
NMAUS2019
93bd7f2e00
Use macros
Use the defined macros
2020-02-21 16:28:20 +11:00
mharis001
e2725e52ec
Add check for empty _ropeClass
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2020-02-20 00:48:03 -05:00
mharis001
2dcbf2ba26 Fastroping - Fix deployAI not unwinding ropes 2020-02-20 00:28:57 -05:00
commy2
c73f64617f
Merge pull request #7523 from Whigital/isnil_conformity
Various - Conform isNil checks across the codebase
2020-02-19 18:09:05 +01:00
PabstMirror
c44360bd19
Medical - Unlock air controls when going uncon (#7533)
* Medical - Unlock air controlls when going uncon

* remove unneeded parentheses

* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-02-19 10:05:05 -06:00
commy2
5a4487f1ea
Medical - fix the Enoch pilot uniform not taking damage, fix hitpoints test (#7527)
* fix the medical hitpoints test

* fix the Enoch pilot

* readd optional test for all units

* Run test at preStart

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-16 18:34:46 -06:00
commy2
85709d51b3
Merge pull request #7443 from acemod/hitreactions_throwWeapon
add function to throw current weapon
2020-02-14 00:28:57 +01:00
commy2
d6c26eb89d
macro for throw angle 2020-02-14 00:27:01 +01:00
commy2
2d071f459f
macro for lateral offset 2020-02-13 23:47:59 +01:00
commy2
0572ead9ca
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-02-13 23:15:41 +01:00
commy2
0fc3cb0201
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-02-13 23:15:28 +01:00
Whigital
78d79f2761 More excessive brackets 2020-02-13 17:16:35 +01:00
Whigital
6244975316
Remove extraneous whitespaces
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-02-13 10:33:31 +01:00
Whigital
ab7bb11091 Remove excessive brackets 2020-02-12 22:07:57 +01:00
Whigital
8c2f53ac14 Revert quotation on string args 2020-02-12 22:07:19 +01:00
shukari
7c296c96ac
Map - Allow enabling BFT setting after mission start (#7519)
* Update initSettings.sqf

* Bracjet

* Update XEH_postInitClient.sqf

* Update addons/map/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-02-12 13:27:58 -06:00
Whigital
56ef0c6d65 conform isnil checking: zeus 2020-02-12 17:29:28 +01:00
Whigital
69480998ae conform isnil checking: tagging 2020-02-12 17:29:24 +01:00
Whigital
275b5edd95 conform isnil checking: spectator 2020-02-12 17:29:21 +01:00
Whigital
a24c3d52ad conform isnil checking: scopes 2020-02-12 17:29:17 +01:00
Whigital
6a8c9f0ea8 conform isnil checking: respawn 2020-02-12 17:29:13 +01:00
Whigital
1872b06235 conform isnil checking: repair 2020-02-12 17:29:08 +01:00
Whigital
22c44629f7 conform isnil checking: rearm 2020-02-12 17:29:04 +01:00
Whigital
84649c8c8d conform isnil checking: overpressure 2020-02-12 17:29:00 +01:00
Whigital
b5a0908824 conform isnil checking: modules 2020-02-12 17:28:56 +01:00
Whigital
0439cd8738 conform isnil checking: medical_treatment 2020-02-12 17:28:49 +01:00
Whigital
dbd6f39794 conform isnil checking: medical_feedback 2020-02-12 17:28:46 +01:00
Whigital
7fe5401f6a conform isnil checking: laser 2020-02-12 17:28:41 +01:00
Whigital
1def9cbcb7 conform isnil checking: interact_menu 2020-02-12 17:28:33 +01:00
Whigital
b8329e8937 conform isnil checking: gunbag 2020-02-12 17:28:28 +01:00
Whigital
c33112333e conform isnil checking: fastroping 2020-02-12 17:28:23 +01:00
Whigital
80352519e1 conform isnil checking: common 2020-02-12 17:28:18 +01:00
Whigital
2688cdd95f conform isnil checking: cargo 2020-02-12 17:28:10 +01:00
Whigital
57b411b8a4 conform isnil checking: arsenal 2020-02-12 17:27:39 +01:00
PabstMirror
dd7ae389f9 Common - Fix canDig returning non-bool (#7516) 2020-02-08 19:43:42 -06:00
Björn Dahlgren
f460eca428 Cook Off - Adjust players only settings check (#7419) 2020-02-07 21:33:09 -06:00
diwako
65e1601114
Backblast - Fix damage disabled units receiving damage from backblast (#7505)
* Fix damage disabled units receiving damage from backblast

* Add variable check
2020-02-07 13:27:40 -06:00
Tim Beswick
10fa22ff24
Use object itself as centre for nearEntities in getProximityPlayers (#7512) 2020-02-07 13:24:41 -06:00
SilentSpike
d1c03cec1a
Only force enable input when player is killed (#7510) 2020-02-05 23:09:58 +00:00
Whigital
cdf02f629e
Only set unconscious upon entering CA (#7503)
Hopefully fix players being able to self interact when transitioning from cardiac arrest -> unconscious
2020-02-04 11:17:25 +00:00
Whigital
3be84e946b
[medical_status] Enable user input between death and respawn (#7502)
Fix being unable to use any menus created while dead
2020-02-04 11:15:45 +00:00
Whigital
7e91ffc7a2 Update CSW author fields and remove inherited properties on ace_csw_staticAACarry 2020-01-31 18:31:48 +01:00
Whigital
62a7db5c43 Remove CSW mag defs 2020-01-30 23:21:30 +01:00
Whigital
93173d43b2 Add magazines to carryable statics 2020-01-30 23:17:15 +01:00
PabstMirror
2feeec0d7f
Medical AI - Block healing when handcuffed (#7493) 2020-01-28 19:12:38 -06:00
PabstMirror
270a5a930f
Frag - Fix spallTrack (#7492) 2020-01-28 19:12:11 -06:00
dfr1238
2e7fee5256 Update tchinese (#7490)
Update missing string
Fix string about STR_ACE_Medical_Treatment_VehiclesAndFacilities
2020-01-28 09:28:31 -06:00
commy2
798df92f2d
Merge pull request #7473 from diwako/allow_blood_for_none_medics
Medical - Add setting for medic level to transfuse IVs
2020-01-19 17:32:30 +01:00
commy2
a1c5b68c8e
Merge pull request #7475 from acemod/medical-cardiactimeout
Medical - Increase Cardiact Arrest Time to 5 min
2020-01-19 11:26:03 +01:00
Panisher
d9054e1c52 Overheating - Fix jamming sound (#7463)
* This sound was heard all over the map

* secondaryWeapon changed to handgunWeapon

* add jamming sound

* add yourself to AUTHORS.txt
2020-01-18 11:40:41 -06:00
M3ales
71da4360b8 Changed version to versionStr as fix for #7478 (#7479)
Ensures return value of string is preserved.
2020-01-18 11:15:49 -06:00
commy2
8a16c9da1b ACE_weaponThrown event 2020-01-18 18:12:01 +01:00
diwako
37bea2eb81 French translation by Elgin675 2020-01-17 17:45:06 +01:00
jonpas
5c1ea16fb0
Medical - Increase Cardiact Arrest Time to 5 min 2020-01-17 14:05:17 +01:00
PabstMirror
4cd087cf39 Merge branch 'master' into combine-bandage-settings 2020-01-16 21:30:40 -06:00
Taha
d8f18c685b Turkish Language Update (#7446)
* Fatal

* Fatal

* Fatal

Turkish Language Update

* Fatal

* Update AUTHORS.txt

* Fatal

Fix

* Update AUTHORS.txt

* Update

* Delete stringtable.xml

* Update stringtable.xml

* Delete stringtable.xml

* Revert "Delete stringtable.xml"

This reverts commit 704c1e838c.

* Update stringtable.xml

* Fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-16 21:14:23 -06:00
diwako
c6147da1b8 Fix spelling
Move setting above allowSelfIV
2020-01-16 19:24:39 +01:00
Filip Maciejewski
b442f60e89
Add polish translations 2020-01-16 14:10:36 +01:00
diwako
db2900eeb9 Add setting for blood transfusion medic level 2020-01-16 00:28:02 +01:00
dfr1238
aee506db99 Update tchinese (#7461) 2020-01-13 23:32:46 -06:00
Elgin675
273d4ac161 fix translations: removes Blood_IV "keep cold" (#7457)
* fix translations: removes the words "keep cold" from `Blood_IV` keys

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
2020-01-13 23:32:24 -06:00
SimichRE
3ba441509d Russian translation (#7442)
* Translation: Russian

Added missing translation to Russian

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml
2020-01-13 23:31:33 -06:00
Filip Maciejewski
ad579bf5e4 Fix missing earplug actions (#7464)
Fix bug introduced in #7400
2020-01-13 18:34:42 +01:00
commy2
c740ffe009 Merge branch 'hitreactions_throwWeapon' of https://github.com/acemod/ACE3 into hitreactions_throwWeapon 2020-01-11 19:29:49 +01:00
commy2
353feb6400 don't drop if inside a vehicle 2020-01-11 19:29:33 +01:00
Jo David
245a60fbbc Changed: Spanish translations updated (#7432)
* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish translation updated

* Merge patch-12

* Laser - Spanish translation updated

* Logistics_uavbattery - Spanish translation updated

* Apply suggestions from code review

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>

Co-authored-by: ArgA-Maxtor <martincardozo@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Ferran Obon <ferran@idi-systems.com>
2020-01-11 10:08:35 -06:00
AgentPiTi
4bfa882eb7 Polish Translations (#7449)
* PL Translations

Done some of new Polish translations

* Fix doubles

* Apply suggestions from code review

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

* Polish Translations

Missing polish translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-11 09:49:30 -06:00
commy2
08a83840dc
Merge pull request #7416 from Dahlgren/feature/cook-off-event
Cook Off - Change Cook Off events to global and add to events docs
2020-01-11 11:02:03 +01:00
commy2
382a60ced7
Merge pull request #7444 from acemod/fixBrrrrt
Aircraft - Fix ACE_Gatling_30mm_Sub class
2020-01-11 09:42:43 +01:00
PabstMirror
12cb0993cf Aircraft - Fix ACE_Gatling_30mm_Sub class 2020-01-10 23:14:55 -06:00
commy2
518006e864
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-01-11 03:01:33 +01:00
commy2
bd2dc7367b
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-01-11 02:58:51 +01:00
commy2
c97bd2fb01
Update addons/hitreactions/functions/fnc_throwWeapon.sqf
Co-Authored-By: jonpas <jonpas33@gmail.com>
2020-01-11 02:58:40 +01:00
commy2
b736928259 add function to throw current weapon 2020-01-10 22:12:59 +01:00
commy2
ea3f400fc1 add function to throw current weapon 2020-01-10 22:12:34 +01:00
SimichRE
d5e2eb3a17
Translation: Russian
Added missing translation to Russian
2020-01-10 18:54:30 +03:00
Patryk Zachnik
edb53084b3 Polish Translation (#7397)
* Polish Translation

Updated Polish Translation

* remove dupes

* Update stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-09 23:14:45 -06:00
AgentPiTi
9d525f8b42 Polish Translations (#7410)
* PL Translations

Done some of new Polish translations

* Fix doubles

* Apply suggestions from code review

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-09 22:56:13 -06:00
Elgin675
daa8a05ab8 Translations: fix medical_treatment order introduce on #7430 (#7435)
Moves `AllowSelfPAK_Description` below the display name.
2020-01-09 22:29:26 -06:00
PabstMirror
57932ce04f restore strings lost in merge 2020-01-09 14:51:07 -06:00
PabstMirror
a999a5e997 Merge branch 'master' into combine-bandage-settings 2020-01-09 14:48:36 -06:00
jonpas
3daf78441b Medical - Fix epinephrine wake-up chance boost string (#7407)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-09 14:44:55 -06:00
Broström.A | Evul
028a0cb3f0 Changed: Scripted calls to putInEarPlugs/joinTeam won't show hint (#7400)
* Added ability to suppress hint message

* Adjustments based on request
2020-01-09 14:40:34 -06:00
Elgin675
36a6c9c2b3 Translations: French (#7414)
* Add french translation of 'ClearTraumaAfterBandage_Description' key

* Add french translation of 'GatlingDescriptions' keys

* Add french translation of 'AllowSelfPAK' keys

* Update french translation on medical_treatment module
- AdvancedDiagnose_Description
- AdvancedMedication_Description
- LitterCleanupDelay_Description

* Fix french translation on medical_treatment module

- 'AllowLitterCreation_Description' key
- 'LitterCleanupDelay_Description' key

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-09 12:36:51 -06:00
dfr1238
9833bfd37d Update tchinese string (#7433)
Update tchinese on aircraft,medical_treatment
2020-01-09 09:38:11 -06:00
jonpas
34c24dbc76
Medical Treatment - Fix Checking Pulse progress bar text (#7406) 2020-01-09 07:40:53 +01:00
Jo David
016d0d6d20
Use Head and Torso wording instead of Head and Body (#7399)
* Use Head and Torso wording instead of Head and Body

title

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: classic <skyburunave@gmail.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: classic <skyburunave@gmail.com>

* fix indentation

* change italian translation

Co-authored-by: classic <skyburunave@gmail.com>
2020-01-09 07:39:11 +01:00
Jo David
91c40e4407
Changed: German translation for Medical Rewrite (#7430)
* Changes to be committed:
Updated german stringtables for new med_rewrite

* Changes to be committed:
Updated german stringtables for new med_rewrite

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_feedback/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update stringtable.xml

Stell ein

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_blood/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update addons/medical_treatment/stringtable.xml

Co-Authored-By: Jo David <github@jonathandavid.de>

* Update stringtable.xml

added a missing string

* Update stringtable.xml

* Update stringtable.xml

* remove and merge duplicate keys

Co-authored-by: padddyyy <50599448+padddyyy@users.noreply.github.com>
2020-01-09 07:35:57 +01:00
Italiandrache
05e99c5154 Changed: Updated italian translation (#7405)
* Updated italian translation

* Minor corrections

* Some corrections

* Other corrections

* Minor translation
2020-01-09 06:02:41 +01:00
commy2
a31000bc82
Merge pull request #7417 from diwako/fix_pain_suppression_basic_medication
Fix suppression for basic medication
2020-01-08 19:52:25 +01:00
Björn Dahlgren
941d46b334 Cook Off - Change Cook Off events to global and add to events docs 2020-01-08 00:25:52 +01:00
Keewayz
e908345eae Additions to Polish Translation (#7374)
* Addition to Polish translation

*added missing polish translation up to adv_ballistic, adv_fatigue, ballistics, common, cookoff, explosives, grenades, medical_statemachine, medical_treatment, rearm, spectator, switchunits, weather

* Next Addition to Polish translation

#some missing stuff

* Apply Code Review Suggestions

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-07 13:53:02 -06:00
diwako
35d99ddc7e Fix suppression for basic medication 2020-01-07 20:35:22 +01:00
Taha
ddbc0221f6 Turkish Traslations (#7390) 2020-01-05 18:37:48 +01:00
mharis001
770860fe1a
Improve German translation
Co-Authored-By: Jo David <github@jonathandavid.de>
2020-01-05 03:29:57 -05:00
mharis001
2d1f166f5a Medical - Combine advancedBandages and woundReopening settings 2020-01-04 15:43:51 -05:00
mharis001
62fccd6ff0 Medical Treatment - Add self PAK setting (#7382) 2020-01-04 12:42:51 +00:00
mharis001
e00cb53911 Fix incorrect reopening chance for QuikClot on large abrasions (#7383) 2020-01-04 12:33:49 +00:00
PabstMirror
97d8be94ce
Goggles - Skip rain effects on snow maps (#7373)
* Goggles - Skip rain effects on snow maps

* Update XEH_postInit.sqf
2020-01-03 11:24:05 -06:00
classic
1aec991f54 Update Japanese translation (#7371)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2020-01-03 10:07:52 -06:00
commy2
b7a69eeaaf
Merge pull request #7118 from LorenLuke/patch-1
Changes A-10/A-164 Cannon Values
2020-01-03 10:22:35 +01:00
Toni Vicente
77ce88e1ac Update spanish translation (#7366)
* Update spanish translation

Added spanish translation entries

* Update spanish translation

Added spanish translation entries

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:56:02 -06:00
D3L7A01
14b1ca5b83 Italian Translations (#7346)
* Add some translation eng to ita

* Translation eng-ita completed

Translation completed from English to Italian finally completed, I hope there is no problem but I would like to communicate that during the translation I carelessly "translated" and placed two names in objects, I leave you the id
1. STR_ACE_Medical_Blood_EnabledFor_Description
2. STR_ACE_Tracers_100Rnd_580x42_Drum_yellow
I hope I haven't done any damage :)
PS: Thanks again for this wonderful mod
Good luck with all upcoming updates

* Some erros(?)

Some erros(?) Rows 3 to 5 are highlighted red I hope there is no problem XD

* fix tabs first

* re-add moved

* fix merge

* Update stringtable.xml

* fix STR_ACE_Medical_Blood_EnabledFor_Description

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:52:40 -06:00
LorenLuke
a3ab0a0b17 Fix typo 2020-01-02 16:37:24 -08:00
LorenLuke
602341b535 Added missing magazine and ammunition definitions. 2020-01-02 16:20:31 -08:00
LorenLuke
153805a138
Fixes Typo
Review Ready.
2020-01-02 16:15:47 -08:00
IllidanS4
1716006f4d Czech medical typos and grammar (#7359) 2020-01-02 16:26:25 +01:00
mharis001
f1cd3551f8 Medical Treatment - Settings cleanup (#7345) 2020-01-02 11:14:39 +00:00
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