Commit Graph

14592 Commits

Author SHA1 Message Date
PabstMirror
4400d860ac
Kestrel4500 - Cleanup unused onUnload handler (2.10 compatiblity) (#8961) 2022-07-08 22:49:11 +01:00
JonBons
654e4c1b7d
Cookoff - Add ability to disable fire jet effect in configs (#8953)
* Cookoff: Add ability to disable fire jet effect for vehicles it doesn't make sense on

* Cookoff: Fixed pressure jet sound playing when both jet and ring effects are disabled
2022-07-01 17:20:31 +01:00
Psycool
57893f311d
KoreanTranslation (#8937)
Someone has returned all the translations in Korean to English. there is no need to return them.
2022-06-21 13:35:06 -05:00
Filip Maciejewski
d8af7b34b7
Cookoff - Fix ammo not being removed from turrets with additional FFV (#8928) 2022-06-06 13:50:53 +02:00
ZluskeN
3f7530d89e
Cookoff - Add setting to destroy vehicle after cooking off (#8734)
* Add setting to destroy vehicle after cooking off

* Update stringtable.xml

* Update stringtable.xml

* Update addons/cookoff/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update initSettings.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-05-31 15:50:55 +02:00
Krzyciu
cce1700f9c
Translations - Add Missing Polish (#8921)
* Translations - Add Missing Polish

When merged this pull request will:

- Add missing Polish Translations

* Missing space

* Typo

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

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-28 12:30:28 -05:00
Apricot
74e49d1f5a
Translations - Add and Improve Missing Japanese (#8924)
* Japanese Translation Update

Fill missing Japanese translation and Weird translation fixes made long ago.

* Remove Corner Bracket and change it to apostrophe

* Update STR_ACE_Common_unloadWeapon

* Update SunflowerSeeds Description
2022-05-27 14:06:51 -05:00
PabstMirror
190cefea69 Prep 3.15.0 Build 67 2022-05-24 09:03:42 -05:00
PabstMirror
aae0155c06 Merge branch 'master' into release-3.14.2 2022-05-24 08:58:44 -05:00
jonpas
cbc766dec0
Documentation - Use title instead of name (#8920) 2022-05-23 11:09:05 +02:00
jonpas
4d783af827
replace chat urls (#8918)
Co-authored-by: Brett <brett@mayson.io>
2022-05-22 22:51:49 +02:00
jonpas
df13db5958
Documentation - Fix Viewports versions (#8919) 2022-05-22 22:51:36 +02:00
PabstMirror
89b8ed4b56
Tools - Fix string check false positive on tagging macro (#8917) 2022-05-18 14:36:05 -05:00
PabstMirror
d497e390ab Merge branch 'master' into release-3.14.2 2022-05-18 13:08:29 -05:00
Drofseh
86f08af250
Common - Add keybind and function to unload unit's weapon/muzzle (#8735)
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-18 13:07:47 -05:00
PabstMirror
99e3715922 Prep 3.14.2 Build 66 2022-05-17 17:33:32 -05:00
LorenLuke
da1c5d3b21
Cookoff - Adds heating effect to cookoff (#8685)
* Adds heating effect to cookoff 

Makes tanks that cook-off actually heat up on IR.

* Adds cbaEvent 'setTIPars'

* Adds CBAEvent call in cookOff.sqf

* Spaces out line. Adds proper event heading.

* Moves TI event to cookOffEffect.sqf;

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Changes global event for TI pars to local command

* Reverts file to before previous commits in PR.

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

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

* Update addons/cookoff/XEH_postInit.sqf

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

* ti params and add comments to formula

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-05-17 12:09:10 -05:00
ace3mod
459e732c6d [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-05-17 18:55:52 +02:00
PabstMirror
a4258f3587
Viewports (#8480)
* Viewports

* Support mem-points

* Update CfgVehicles.hpp

* Add some docs

* Cleanup Debugging

* Update addons/viewports/dev/debugPoints.sqf

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

* Update addons/viewports/dev/debugPoints.sqf

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

* Update addons/viewports/functions/fnc_eachFrame.sqf

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

* configProperties / 3den macro

* Update viewports-framework.md

* Update viewports-framework.md

* Add compats for rhs btrs

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
2022-05-17 11:55:09 -05:00
pterolatypus
699e286db7
Tagging - Add more tags (#8908)
* Added more tags and reorganised interaction

* Removed empty lines from stringtable

* Fix macros, use item picture as interaction icon

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

* Use texture as icon, remove colour from names

* Tagging - Compile actions when added

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-17 11:54:47 -05:00
pterolatypus
bf8aa1ab7f
Medical Damage - Improve falling and collision damage (#8861)
* Adjust wound params for falling

* Tweaked thresholds for collision

* Tweaked collision and added custom handling

* medical_damage - cleanup woundHandler naming (#8824)

* medical_damage - cleanup woundHandler naming

* woundsHandlerBase

(cherry picked from commit bdeb347ea9)

* Tweaked thresholds a bit more

* Removed collision handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-17 11:54:05 -05:00
PabstMirror
fa45e8b7cb
Cargo - Limit text length (#8915) 2022-05-17 02:37:26 -05:00
PabstMirror
0df5320879
FieldRations - fix string (#8916) 2022-05-17 00:57:24 -05:00
Dystopian
3a7f034e25
Vehicles - Add cruise control/speed limiter to boats (#8905)
* Add cruise control to boats

* fix other use of `Controll`

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-16 22:59:12 -05:00
Filip Maciejewski
c66304daf9
Explosives - SOG Compat - Fix Spiked ammo box placing wrong ammo type (#8914)
* Explosives - SOG Compat - Fix Spiked ammo box placing wrong ammo type

* Add vn_pavn_ammo pDrive dummy file
2022-05-15 18:48:39 -05:00
Filip Maciejewski
ef651091fe
Explosives - SOG Compat - Fix punji traps handler not working (#8913) 2022-05-15 15:00:47 -05:00
PabstMirror
38b4de9382
Cookoff - fix locality of fire_removeFireSource event (#8907) 2022-05-13 19:54:09 -05:00
mharis001
56df203477
Interaction - Fix handle animation name for carrier doors (#8909) 2022-05-13 00:24:41 -04:00
Drofseh
53c0348a15
Overheating - Add barrel mass config value (#8906) 2022-05-11 18:21:05 -05:00
Björn Dahlgren
e0a3bd65ab
Cleanup FRIES macro and fix UBC issues in RHS Compats (#8842) 2022-05-09 20:54:42 -05:00
ace3mod
3df0640d08 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-05-10 03:29:08 +02:00
ace3mod
cedbbe4847 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-05-10 03:28:51 +02:00
Psycool
61f74831a1
Korean Translation 100% done (#8899)
* Korean Translation 100% done

fixed typos, changing the Korean transliteration of proper nouns, and changing the meaning of the original to a more understandable interpretation without compromising the transmission of the original

* Something Edited

edit incorrect translation and add typo correction
2022-05-09 20:28:28 -05:00
Brett
6851183e1f
Add Marker Flags (#8696)
* add marker flags

* minor cleanup

* use pictures for actions

* check canDig

* review changes

* Update fnc_placeFlag.sqf

* fix hiddenSelectionsTextures

* Update addons/marker_flags/functions/fnc_pickUpFlag.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Cache flag list at pre-start

* Add model for flag pole

* Pass item name to pickUpFlag via action

* Update addons/marker_flags/stringtable.xml

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

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-05-09 20:28:10 -05:00
Tim Beswick
27c5464654
Common - Add separate blockSpeaking status for acre direct (#8904)
* Add separate blockSPeaking status for acre direct

* Move TFAR code to new blockSpeaking handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-08 13:20:15 -05:00
ace3mod
b20aa76444 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-05-08 05:46:28 +02:00
ace3mod
fa728f195c [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-05-08 05:46:09 +02:00
GhostIsSpooky
9e133aa0a5
Cargo - Make player carry/drag item on unload (#8797)
* carry item on unload

* debug off

* fix function header

* ugly nested if blocks instead of superior switch statement

Co-authored-by: jonpas <jonpas33@gmail.com>

* Add delay for server event to finish

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-07 22:45:57 -05:00
Cyruz
3ddec6cb15
Casings - Add infantry bullet casings (#8857)
* 1st pass on casings

* Readability tweaks

* Pretty sure these are needed...

* Jonpas never lies

* Whitespace fix

* Add brother Diwako and allow client override

* Use index, avoid count

* Both settings a client-side

* Add Commy fixings

* Proper case for diwako + config

* Formatting and AGLtoASL

* Perf warning

* if not required

* Axing parentheses

* Remove pointless GVAR update in settings

* Update addons/casings/functions/fnc_createCasing.sqf

Removed unused param

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Default to off due to performance concerns on low-end hardware

* Add LIS check to avoid floating

* Cleanup header

* Further playtesting shows ROADWAY & FIRE have better results

* Re-enable by default

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* Update addons/casings/functions/fnc_createCasing.sqf

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

* offset setPosWorld with small z-bump

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-07 22:45:24 -05:00
YetheSamartaka
e994906169
Medical - Add AI Unconsciousness exception (when using zeus module) (#8903)
* Add DF-15 GForceCoef Value

This adds missing ACE_GForceCoef value for DF-15 uniforms.

* DF-15 PR - cfgWeapons formating

DF-15 PR - cfgWeapons formating

* DF-15 PR - cfgWeapons formating II

Forgot to save it with braces and spaces around =

* Update CfgWeapons.hpp

* sync

* Add AI Unconsciousness exception option

- Adds AI Unconsciousness exception option. If enabled, it allows you to put AI into unconsciousness via Zeus Module even though the AI unconsciousness is disabled. This "feature" was possible before the medical rewrite and allowed to put selected AI units into unconsciousness  even though the overall AI unconsciousness was disabled. This was very handy and many groups missing this option including myself.
- Special thanks to Pterolatypus for consultation.

* tabs to spaces

tabs to spaces

* last tab to space :copium:

last tab to space :copium:

* stringtable tabs to spaces

stringtable tabs to spaces

* Addon option removed, adjusted variable name

- Addon option removed
- adjusted variable name

* utilized QEGVAR

- utilized QEGVAR in getVariable

* removed fnc and put the code inside the condition

- I've managed to properly implement the getVariable inside the condition thus allowing me to remove the function. Also kymckay had a good point on swapping the order for faster eval.

* Update XEH_PREP.hpp

* setVariable optimalization

- setVariable optimalization

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Update addons/medical_statemachine/Statemachine.hpp

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
2022-05-07 22:44:33 -05:00
PabstMirror
ada486448c
Aircraft - Drone Tools (#8276)
* Aircraft - Drone Tools

* Update addons/aircraft/functions/fnc_droneAddActions.sqf

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

* Update addons/aircraft/functions/fnc_droneAddMapHandler.sqf

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

* Update fnc_droneAddActions.sqf

* Move map drawing to laser and make it work on any source

Co-authored-by: Dystopian <sddex@ya.ru>
2022-05-05 11:07:54 -05:00
Dystopian
89badcc71f
CSW - Fix missing magazine on assembling (#8880)
* Fix missing magazine on assembling

* Fix adding mag when csw is empty

* Fix missing magazine when player has launcher
2022-05-04 17:28:58 -05:00
jonpas
e2a822c828
User Interface - Add ability to hide Default Action Icon (#8883) 2022-05-04 17:28:32 -05:00
pterolatypus
67842a2656
Medical Vitals - Add event to vitals loop (#8891)
* Added event to vitals loop

* Pass deltaT to event

* Added event to documentation
2022-05-03 18:04:58 -05:00
Drofseh
36ae99b9f3
MapTools - Allow mod maps and compasses to use map tools (#8858)
* allow mod maps and compasses to use map tools

* single quotes

* Update addons/maptools/CfgVehicles.hpp

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

* Update addons/maptools/CfgVehicles.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-02 20:40:59 -05:00
Wakbub
f3258cae98
Cargo - Remove the ability to load cooked-off items (#8876) 2022-05-02 18:57:19 -05:00
Wakbub
6a213bcf60
Cargo / Dragging - Fix Invisible Target Soldier being loadable and draggable/carriable (#8873) 2022-05-02 18:54:30 -05:00
Dystopian
54c13c5f42
Move carry mag getting code to function (#8888) 2022-05-02 18:54:04 -05:00
Wakbub
70641c39a1
Laser/Laserpointer - Fix localization of laser (#8885)
Add
- `laser`: Add Hungarian translation of laser.

Fix
- `laser`: Fix capitalization of laser.
- `laserpointer`: Fix Japanese translation of laser.
2022-05-02 18:53:18 -05:00
PabstMirror
b70353f009
Vector - Disable tilting the reticule when zoomed (#8882) 2022-05-02 18:52:59 -05:00