Commit Graph

12157 Commits

Author SHA1 Message Date
RcINS
e677021e5a
Translation - Improve ace_rangecard translation (#9012)
* Complete Simplified Chinese translation

* Slight tweak translation

* Fix rangecard Chinese translation
2022-08-28 18:10:21 -05:00
Filip Maciejewski
ecb7721c77
Medical - Disable blood spurts for fire, burn and drown damage types (#9001) 2022-08-25 12:05:50 -05:00
BrettMayson
438a90b63d
Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
2022-08-25 11:56:54 -05:00
JonBons
8e06f2ec6b
Cookoff - Tweaked effects cleanup to add Deleted EH globally and trigger a local cleanup event (#9000) 2022-08-20 16:38:06 -05:00
JonBons
f846b9ab82
Cookoff - Randomized the delay from start of cookoff and ammunition detonation (#9002)
* Cookoff - Added a random delay between a vehicle being killed and when the ammo starts to cookoff

* Cookoff - Tweaked min ammo start delay to 1 second

* minor syntax and macro cleanup
2022-08-20 16:36:37 -05:00
Tim Beswick
2a4355dfb9
Cargo - Add setting for carry after cargo unload (#8997)
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-08-20 16:28:16 -05:00
Filip Maciejewski
a421a63eea
Trenches - Add "placed" and "finished" events (#8998)
* Add trench placed and finished global events

* Docs
2022-08-20 15:43:50 -05:00
Ozan Eğitmen
f3c66e83b4
Refuel - Add Progress Bar Duration Setting (#8971)
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-17 13:25:37 +02:00
Samuel Deutsch
7a64ccb7a5
Refuel - Improved fuel hose texture (#8983)
* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
2022-08-17 13:00:54 +02:00
Whigital
286537cd54
Fortify - Fix funds being lost when canceling deploy (#8992) 2022-08-17 12:59:07 +02:00
Kam
131b0b9472
Captives - Load into back seats first (#8973)
Reverses the list of seats for loading captives
2022-08-16 15:33:15 +01:00
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995)
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
2022-08-14 17:09:01 +01:00
Cyruz
b47b8014e7
Fix incorrect mempoint for sound src (#8989) 2022-08-09 09:38:06 -05:00
Whigital
fc17697ef7
Overpressure - Fix backblast originating at projectile (#8985)
* Overpressure - Fix backblast originating at the projectile

* RHSUSF - Improve backblast for shoulder launchers

* RHSAFRF - Improve backblast for shoulder launchers

* RHSGREF - Improve backblast for shoulder launchers

* RHSSAF - Improve backblast for shoulder launchers

* Overpressure - Simplify projectile offset and cache lookups

* Overpressure - Remove parentheses and use array as hash key

* Overpressure - Rename caching function and move lookup
2022-08-01 18:32:02 +01:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984)
* Complete Simplified Chinese translation

* Slight tweak translation
2022-07-30 18:08:44 -05:00
SzwedzikPL
743add1aa4 Remove null projectiles from iron dome nonTrackingProjectiles 2022-07-25 06:46:54 +02:00
ZluskeN
df3a9de7cd
Advanced Vehicle Damage disabled by default. (#8925)
Maintainers [...] want Advanced Vehicle Damage disabled by default.
https://github.com/acemod/ACE3/pull/8734#discussion_r787918244
2022-07-23 19:59:21 +02:00
diwako
83f9c8331d
Interaction Menu - Fix black screen option not removing background properly (#8969) 2022-07-23 10:37:18 -05:00
Psycool
44ccc7b185
Korean Typo Fix (#8968)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix
2022-07-19 17:09:08 -05:00
JonBons
36442d34cd
Cookoff - Fix smoke effects not getting cleaned up (#8933)
* Cookoff: Added handling for cleaning up smoke effects when vehicle is deleted mid-cookoff

* Cookoff - Prevent effects cleanup Deleted EH from getting duplicated

* Cookoff - Added locality safety check to effects cleanup

* Cookoff -  Global effects cleanup is now triggered by the server to handle locality transfer
2022-07-15 15:59:49 +01:00
Cyruz
1a95070b80
Trenches - Add camouflage action using surfaceTexture (#8935)
* Port 7833 to use surfaceTexture
* Add camo action
* Remove unused args from statement call
* Rogue missing space
* Add animation + delay for camo action
* Add authors
2022-07-15 15:42:00 +01:00
JonBons
15deea56cb
Cookoff - Removed references to unused ignoreTurret parameter 2022-07-14 21:27:07 +01:00
Dystopian
9569a16efc
Fix rearm of dead vehicles (#8962) 2022-07-10 09:47:47 +01:00
formtapez
1b7755225a
new fences for the wirecutter (#8945) 2022-07-08 20:15:29 -05:00
Psycool
088e5ebb6d
Added Korean Translation for new stuff (#8960)
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation
2022-07-08 20:15:04 -05:00
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
Bailey Danyluk
bcd753f0d5 Change name 2022-06-02 20:36:46 -06:00
Bailey Danyluk
5a55d2d257 Add ability to disable iron dome (disabled by default) 2022-06-02 20:11:35 -06:00
Bailey Danyluk
0b7c89af50 better debug info 2022-06-02 19:30:28 -06:00
Bailey Danyluk
e46cd2c97b add better error messaging 2022-06-02 19:26:00 -06:00
Bailey Danyluk
f4152ec057 cut spike 2022-06-02 19:21:02 -06: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
2041c88cee Merge branch 'master' into pr/8215 2022-05-24 12:00:12 -05:00
PabstMirror
190cefea69 Prep 3.15.0 Build 67 2022-05-24 09:03:42 -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
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
Bailey Danyluk
d944f09a85 Merge branch 'missileDynamics' of github.com:TheCandianVendingMachine/ACE3 into missileDynamics 2022-05-14 14:11:04 -06:00
Bailey Danyluk
67fe609897 tweak javelin to make minimum ranges more realistic 2022-05-14 14:10:57 -06: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
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
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
Wakbub
d2038ab287
Spottingscope - Fix destruction of Spotting Scope (#8893)
Fix `Error setposasl: Type Object, expected Array` when destroying Spotting Scope.
2022-05-02 18:03:51 -05:00
PabstMirror
ad5c275532
arsenal - fix hash getvar default type (#8892) 2022-04-25 19:35:52 -05:00
Dedmen Miller
8192108e19
Pylons - Show ammo description in pylon loadout tooltips (#8881)
* Show ammo description in pylon loadout tooltips

* Update addons/pylons/functions/fnc_showDialog.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-04-23 10:24:50 +01:00
jonpas
3442a47942
General - Remove deprecated functions (#8878) 2022-04-17 08:27:19 +01:00
PabstMirror
76bb679acf Merge branch 'master' into pr/8215 2022-04-15 22:25:18 -05:00
Jo David
a20110874c
replace urls (#8875) 2022-04-14 09:22:23 +02:00
diwako
51b703a746
Common - Fix undefined variable (#8872)
Moved ace_common_isModLoadedCache from postinit to preinit. The hash object can be used before post init which then produces errors.
2022-04-10 15:27:10 -05:00
Wakbub
dd07b0fa30
Fix Error Type String, expected Array (#8871)
Pass an array instead of a string to insert.
2022-04-09 13:50:47 -05:00
Nilia119
3b79693717
Added Missing German Translation (#8870)
- Added Missing Translation in CSW
- Added Missing Translation in field_radio
- Added Missing Translation in finger
- Added Missing Translation in noradio
- Added Missing Translation in overpressure
2022-04-09 13:49:26 -05:00
PabstMirror
fa7dbce104
Field Rations - Add sunflower seeds (#8833) 2022-04-08 20:44:15 -05:00
zharf
72774c909a
Laser - Fix seeker owner return value (#8862)
* Fix laser seeker return value

Back to consistent with the documentation

* Pick the owner with most hits instead of the last one in the hashmap
2022-04-06 17:02:39 -05:00
b-mayr-1984
020cf2ddd8
maptools - Improve behaviour upon first open (show under mouse position instead of bottom-left corner) (#8848)
* open map tools in center of screen upon first open

Don't show the map tools at the bottom-left corner of the map when you first open it, but right where your mouse is.

* always move to mouse position when opened (not just once)

incorporated feedback from co-authors

Co-Authored-By: Drofseh <Drofseh@users.noreply.github.com>
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* replace tabs by 4x whitespaces in order for checks to complete successfully

* move code to fnc_updateMapToolMarkers so it always runs

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-04-06 16:49:27 -05:00
Bailey Danyluk
f79dde58a4 remove debug sets 2022-04-04 18:49:01 -06:00
Bailey Danyluk
71e01a2ee4 Update all Line guidance missiles 2022-04-04 18:46:40 -06:00
Brett
d135371319
Vehicles - Add cruise control (#8792)
* add cruise control

* Update fnc_speedLimiter.sqf
2022-03-17 13:06:32 -05:00
PabstMirror
70f3f55367
Vehicles - Mousewheel will set speed limiter value to even multiples (#8840)
* Vehicles - Mousewheel will set speed limiter value to multiples of 5

* Limit setting to whole numbers only
2022-03-17 13:03:28 -05:00
GhostIsSpooky
f85ed213c5
Grenades - Add fire source to incendiary grenades (#8756)
* add fire source to incendiary grenade

* improvide fire source condition

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-08 21:52:07 -06:00
GhostIsSpooky
8d83982d86
Advanced Fatigue - Improve misc. code (#8800)
* add improvements from #8763

* review changes

* writing is hard

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

* missing ;

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2022-03-08 21:41:56 -06:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795)
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

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

* optimize condition

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

* capitalization

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

* use object in getVehicleIcon

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

* add return comment

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

* remove extra brackets

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

* add missing brackets

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

* add return comment pt2

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

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
PabstMirror
ed228c54ac
Common - Block radio status effect without blocking direct voice (ACRE) (#8659)
* Common - Block radio status effect won't block PTT voice (ACRE)

* Update addons/common/XEH_postInit.sqf
2022-03-08 16:40:48 -06:00
GhostIsSpooky
b800bc4ae1
Fix fire not causing burn damage (#8750) 2022-03-08 16:36:26 -06:00
Drofseh
70da38cec5
Finger - Add scaling settings (#8676)
* Add scaling settings

- sizeCoef will scale the size directly from the setting value, default 1x is the same as the current size.
- proximityScaling will scale the size based on the distance between the observer and the pointer, 2x as large at maxRange, 0.25x at 0m distance.

* fix slider decimal value

* bug fix
2022-03-07 12:35:49 -06:00
JonBons
8b60fae23a
Magazine Repack - Add idle animation when a player starts repacking magazines (#8825)
* Added Gear gesture animation when a player starts repacking magazines

(previously you'd just sit there doing nothing for X seconds)

* Added Repack Animation ACE Setting for allow for disabling of idle animation during repacking

* Corrected Polish translation for setting name

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

* Corrected German translation for setting name

* Removed French translation until someone can provide one

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-03-07 12:35:26 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776)
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

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

* fix TRACE

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 12:29:19 -06:00
GhostIsSpooky
5a72b61a50
Interact Menu - Add blocking while editing CT_EDIT (#8796)
* Interact Menu - Add blocking while editing CT_EDIT

* use findIf

* Use A3 defines
2022-03-07 12:29:02 -06:00
GhostIsSpooky
9209fedcf7
Medical Statemachine - Improve edge case death handling (#8788)
* fix #8772

* add WARNING for dead/null units

* fix macro

* improve warnings

* handle scripted death without warnings

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 12:28:51 -06:00
johnb432
90ebe08012
Arsenal tweak (#8786)
Previously:
- When a new weapon was selected, only magazines defined in the "magazines" attribute of the old weapon's class were deleted.
- When a new weapon was selected, it would consume a magazine from the loadout.

Now:
- When a new weapon is selected, it will only remove the magazines from the previous weapon that are not compatible with the current weapon.
- When a new weapon is selected, it does not consume a magazine from the loadout.
2022-03-07 12:26:56 -06:00
Vdauphin
282dd33d59
Nametags - Fix ACE nametag drawIcon3D parameter error when player controlled unit dies (#8764)
* FIX: `_icon` can be `nil`

* Migrate from `if` to `switch`

* Missing ()
2022-03-07 12:26:22 -06:00
Brett
6c0bc67b37
Medical GUI - Add setting to show blood loss (#8450)
* add setting to show bloodloss

* Update initSettings.sqf

* Update stringtable.xml

* Update initSettings.sqf

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
2022-03-07 12:23:53 -06:00