Commit Graph

12073 Commits

Author SHA1 Message Date
PabstMirror
77fe9ab434
UI - Fix changing UI settings (#8541) 2021-10-17 00:48:12 -05:00
Brandon Danyluk
d8ebc35359 improve lin navigation 2021-10-16 22:45:39 -06:00
PabstMirror
e1141cdd27
Medical Feedback - Fix pain effects when set to Only high pain effect (#8534)
Close #8533
2021-10-16 21:13:40 -05:00
Vdauphin
5fc9856b61
FIX: _target not define (#8536) 2021-10-16 17:17:20 -05:00
Brandon Danyluk
290ce934f4
reduce default incendiary value (#8529) 2021-10-16 17:16:35 -05:00
PabstMirror
a0e9f6015b
Common - Fix calling getVar on null object in canInteractWith (#8532)
* Common - Fix calling getVar on null object in `canInteractWith`

* why was this added dedman?
2021-10-16 17:15:37 -05:00
Brandon Danyluk
2dfbaa90b0
Fix hashmap bug in laser seeker (#8531)
* fix bug in laser

* use `hashValue`
2021-10-16 13:29:57 -05:00
Brandon Danyluk
34c7b57532 add dev function to get ammo which has MG class data 2021-10-15 22:34:45 -06:00
Brandon Danyluk
10c2019818 change back 2021-10-15 22:02:39 -06:00
Brandon Danyluk
9a2d6313b0 make pronav use the correct units 2021-10-15 22:02:26 -06:00
Brandon Danyluk
17e211ed59 Merge branch 'laserRevert' into missileDynamics 2021-10-15 21:49:45 -06:00
classic
e9912a4c33
Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
Brandon Danyluk
0123216803 fix bug in laser 2021-10-15 21:47:15 -06:00
Brandon Danyluk
120d16cd0d small changes 2021-10-15 21:35:25 -06:00
Brandon Danyluk
959564023e Merge remote-tracking branch 'ACERemote/master' into missileDynamics
# Conflicts:
#	addons/maverick/CfgAmmo.hpp
#	addons/maverick/CfgMagazines.hpp
#	addons/maverick/CfgWeapons.hpp
2021-10-15 20:59:28 -06:00
PabstMirror
d46d59695f
Various - Fix setting var name (#8528)
* Scopes - Fix var name

* fix 2.5 more settings
2021-10-15 19:08:42 -05:00
PabstMirror
93b7722716
General - Cleanup CfgPatches unit/weapon arrays (#8524)
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
2021-10-15 13:48:33 -05:00
PabstMirror
916346ae59
General - Format config class defines to coding guidelines (+tool) (#8520)
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

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

* Update tools/config_style_checker.py

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

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-15 13:47:05 -05:00
PabstMirror
9395068424
General - Empty units/weapons arryas in acex cfgPatches, Add acex_main (#8518) 2021-10-15 12:54:12 -05:00
PabstMirror
72b63f4394
Various - use compile_script macro for new addons (#8516) 2021-10-15 12:53:44 -05:00
PabstMirror
c9aa690a4d
various - cleanup maintainers in readmes (#8517) 2021-10-15 12:25:42 -05:00
PabstMirror
500fc9a199 Prep 3.14.0 Build 61 2021-10-14 14:27:32 -05:00
PabstMirror
26d8b8d10a
Vehicle Damage - Cleanup strings (#8515)
* vd cleanup strings

* Update addons/vehicle_damage/initSettings.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-14 12:05:16 -05:00
Brandon Danyluk
c4156a6888
Add Vehicle Damage (ACE2 port) & Enhance Cook-Off (#7565)
* Initital port of ACE2 Vehicle Damage

* Add fire damage and burning people

* Migrate vehicle damge stuff from cookoff. Change cookoff function to enhance effect.

* Minor tweaks

* Add incendiary values to all applicable ammunition. Add engine fire/smoke if hit enough

* Handle car damage more elegantly.

* Added ability to create fire sources arbitrarily

* tweaks

* Add chance to detonate after cookoff

* disable compile cache

* Move blown-off turret config to vehicle damage. Add settings inititalized EH for initializing off settings

* tabs->spaces

* Various code improvements

* Change to count loop for deleting effects

* update addon requirements

* remove vanilla config requirements

* Add RHS compatability

* RHS compat. Various QOL fixes/changes

* Various tweaks to compats and code.

* High-Explosive damage tweak

* Change how penetration is calculated for parts

* Fix RHS compat

* Create setting for flare effect

* increase burning scream sounds

* swap out file name for snake_case

* move incendiary values out of vehicle damage. remove medical dependency

* vehicle_dammage - update all refs to snake

* sqf fixes

* fix fire string package caps

* fix pboprefix

* Default setting to on

* Add variables to enable/disable ring fire to avoid goofy looking vehicles. Enhance how particles are cleaned up. Remove advanced penetration simulation. Change how fire intensity is calculated. Add setting to "disable" vehicle after cookoff

* Fix bug where event handler wasn't giving the damage last.

* change to snake

* fix build errors

* Fix UBC

* Fix Order of Operations

* avoid O^2 events

* Make sure that no damage processing happens on dead units

* Change some if statements

* Keep track of player's death to stop various things

* add quotes to right middle wheen

* Add VD documentation

* fire docs

* Code quality fixes

* Clarify documentation

* define IDD

* switch global -> server

* Add newline between header and first code statement

* stop the dead from suffering

Its hard to tell when a unit is dead or in spectator, so check the config of the unit to determine it.

* Add settings to disable cook-off effects

* Delete effects if vehicle is deleted before cookoff occurs. Don't cookoff player ammo. Throw weapon better

* Move fire into own PR

* fix tabs and macro

* Shuffle crew indices so that a random person is first on the list to be injured each time

* fix effects not clearing

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:49:27 -05:00
Brandon Danyluk
caca92f71d
Add Fire component (#8245)
* merge fire

* Change required addons. Change getPos to getPosASL. Remove include

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>

* Update addons/fire/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com>
2021-10-14 10:49:10 -05:00
nomisum
7009404d39
Add Global Mobilization Compatibility (#7835)
* GM Compat

add GM Compat addon - it's #7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes

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

* add ACE CSW dep (see script_component.hpp)

* warn about missiong compat_gm if GM is loaded

* move medic tents to EGVAR(medical,facilities) array thing

* add pDumbs

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Fusselwurm <fusselwurm@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:48:54 -05:00
Drofseh
f83c605958
Overheating - Add cook off and rate of fire features and additional customization settings (#8064)
* Add jamming coef to change or disable jamming.

* change max to 5

* add setting for overheating effects distance, unjaming on barrel swap, increase rate of fire with heat

- add setting for overheating effects distance
- add unjaming on barrel swap, with setting
- add increase rate of fire with heat, with setting
- fix some formatting

* little tweaks

* add overheating cookoff feature

- add overheating cookoff feature
- add documentation
- bugfixes/improvements

* Update ace3-config-entries.md

* Update overheating-framework.md

* Update addons/overheating/XEH_postInit.sqf

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

* Update addons/overheating/XEH_postInit.sqf

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

* Update addons/overheating/functions/fnc_firedEH.sqf

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

* Update addons/overheating/stringtable.xml

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

* Update docs/wiki/feature/overheating.md

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

* Update addons/overheating/stringtable.xml

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

* Update addons/overheating/functions/fnc_jamWeapon.sqf

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

* Update addons/overheating/functions/fnc_jamWeapon.sqf

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

* remove extra underwater cooling, make cookoffCoef enable cookoff

- add coef setting for heat generation per shot
- merge cookoff setting into cookoff coef setting
- remove check for water that increased cooling
- change max rof increase from heat to 10%
- change ammo heating to a less linear formula
- change cookoffCoef to effect inginition tempurature instead of heat amount
- delay cookoff shot until any firing animation is done
- update strings based on feedback

* Update stringtable.xml

* add cookoff notification

* improvements from play testing

- move ammo heat loop into seperate function with a tighter loop
- factor rain into cooling calculation
- handle cooling while swimming
- merge cookoff take event handler into fnc_handleTakeEH
- fix case where cookoff could potentially come from underbarrel weapon muzzle
- only add TakeEH if required by enabled settings
- improve cookoff muzzle/mode handling

* fix missing semi that I swear I already fixed before pushing

* Update overheating-framework.md

* Update fnc_updateAmmoTemperature.sqf

* include wind speed in cooling calculation

* cool with X

- add ace interactions to allow cooling with water sources when Ace X is loaded
- add documentation for cooling
- move getting barrel mass to a function

* documentation formatting

* Add config array for weapon jam types, as not all weapon can get all types IRL.

* remove variable that's not required

* add some compat entries for RHS

* fix merge conflict

* fix a happy little accident

* move to CBA settings, minor styling.

* Update error message in fnc_jamWeapon.sqf

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

* Apply suggestions from code review

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
2021-10-14 10:47:52 -05:00
jonpas
6ca9d59443
Merge ACEX (#8415)
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed

* Resolve issues

* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

* Remove unnecessary backwards compat

* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine

* Apply suggestions from code review

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

* Remove maintainers from merged ACEX components

* Cleanup unused module and faction classes

* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255

* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259

* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251

* Add ACEX authors and sort authors file

* acex - final tweaks (#8513)

* acex - handle old funcs

* replace thirst/hunger setvars to acex naming

fix macro

Revert "fix macro"

This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.

Revert "replace thirst/hunger setvars to acex naming"

This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.

x

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:46:43 -05:00
mharis001
0fe54b895a
Medical - Clean up namespaces used by (de-)serializing functions (#8514) 2021-10-14 02:10:20 -04:00
Broström.A | Evul
0c85f5f339
Vehicles - Utilize setCruiseControl for speed limiter (#8273)
* Change speed limiter to utalize setCruiseControl
Kept setVelocity with a +2 to speed check to make vehicle slow down downhill and to slow it down when enabled.

* Update addons/vehicles/functions/fnc_speedLimiter.sqf

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

* Update addons/vehicles/functions/fnc_speedLimiter.sqf

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

* Update addons/vehicles/functions/fnc_speedLimiter.sqf

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

* Update addons/vehicles/functions/fnc_speedLimiter.sqf

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-13 16:58:09 -05:00
GhostIsSpooky
471cc59320
Repair - Use callback functions directly (#8508) 2021-10-13 16:09:46 +02:00
Serg Vergun
24c1861a92
Change hemorrhage text colors (#8354)
From red to yellow-red grade.
2021-10-12 22:50:53 -05:00
GhostIsSpooky
095fe2b874
Repair - Add support for RHS optic hitpoints (#8347)
* Potential fix for #8304

Update fnc_addRepairActions to include hitpoints that influence turret view

* Support for the RHS Stryker hitpoints

This whole function is a nightmare but there's no better way to do this. Side effects may include unnecessary hitpoints being shown.

* Style pass

* whoops
2021-10-12 22:20:36 -05:00
GhostIsSpooky
07184dc763
FN Minimi SPW reload fix (#8353) 2021-10-12 17:46:39 -05:00
Jasper
257d9536cc
Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

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

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
GhostIsSpooky
005b2aef14
Arsenal - Stop deleting unique belt items (#8483)
* prevent belt items from being deleted

* fix wrong index

* fix gps not being selected

* & fix UAV terminals not being selected

* add comments, delete extra line

* use getUnitLoadout for assignedItems
2021-10-12 17:10:18 -05:00
PabstMirror
fa99cfaa09
General - Fix missing strings (#8506)
* fix missing strings

* Add API String

Co-Authored-By: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* fix copy

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
2021-10-12 16:10:07 -05:00
GhostIsSpooky
82f705b5a1
speed up fnc_getClaimObjects (#8459) 2021-10-12 16:09:56 -05:00
Drofseh
40ec4e9137
Update fnc_getNeedRearmMagazines.sqf (#8456) 2021-10-12 16:08:06 -05:00
GhostIsSpooky
e4be783f80
Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02:00
Dystopian
0c58d8b20b
Interaction - Add interaction with terrain objects (#8103)
* Add interaction with terrain objects

* Optimize with new commands

* Handle z-position under ground

* Add warning for setting

* Add parentheses to condition

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

* Add comments

* Add parentheses to condition

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

* Add parentheses to condition

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

* Add replacement configs to dragging

This reverts commit afc5abe6cd.

* Fix validator error and optimize condition

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 14:36:33 -05:00
GhostIsSpooky
63d7419066
Ballistics - Cleanup & add missing magazine variants (#8410)
* change 7.62x67 to .300 WM

* initial commit

* stringtables, add LM suffix to .338 magazines, strings for 12.7x99 10Rnd mags

* use correct strings for .50 BMG 10rnd mags

* Remove 6.5C mags from inappropriate side boxes

* remove duplicate stringtable entrys

* add MX 6.5C color variants, add MSBS 6.5C mags, move 6.5C to marksman rifles only, add new mags to boxes, switch DMR_03 to sr25 magwell

* Fix UBC

* fix stupid

* add space before 'mm' in strings

* add missing 762x51 10Rnd mags

* Revert "add space before 'mm' in strings"

This reverts commit fca5fa9f14.

* redo add space before mm in strings
2021-10-12 13:08:13 -05:00
GhostIsSpooky
bbe4b488e0
Magazine Repack - Add setting & hint for repacking loaded magazines (#8475)
* add setting to repack equipped magazines

* derp

* derpderp

* always show hint, remove setting
2021-10-12 12:54:50 -05:00
Seb
88e774c30d
Interaction - Rename group self-interact (#8346)
* Group renaming self interact

* UI base

* Custom UI solution (looks terrible)

* Improve GUI, optimise functions

* Add exitWith return value to fnc_renameGroup

* tabs to spaces

* Small tweaks

* newlines

pre-empting newline gestapo

* input prompt caps

* Implement suggestions

* Remove already inherited value

* Per-side group name handling

* Add same group case sensitive changes.

* Suggestions

- Use ace_common_fnc_displayTextStructured
- Formatting
- Phrasing of strings

* replace spawn with CBA_fnc_execNextFrame

* Update addons/interaction/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 12:53:35 -05:00
10Dozen
3d9315529d
Medical Feedback - Add indication of Fractures and applied CATs/Splints (#8321)
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-12 14:16:30 +02:00
Brandon Danyluk
ca7fbe742c
Add Vehicle Towing (#8380)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 11:33:05 +02:00
Dystopian
65b9cf3754
Map - Use getLightingAt (more light sources illuminate map) (#8343)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 10:31:46 +02:00
Serg Vergun
f7b07c362d
Medical GUI - Add ability to customize Medical GUI colors (#8350)
* Add ability to customize colors of injuries

Added CBA settings entries.
Updated default values.
Added English and Russian locales.

* copypaste cleanup

* move comments and make code more maintainable

* Apply suggestions from code review

Newline at end of files

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>

Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-12 10:11:55 +02:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345)
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
2021-10-12 10:08:10 +02:00
Walthzer
fad7f84625
Explosives - Add exclusion from dynamic defuse action (#8171)
* Add GVAR(noDefusalAction)

* add changes

* Prep functions

* Update addons/explosives/functions/fnc_excludeMine.sqf

Uhm, strange. Its clearly allMines, yet Allmines didn't only build it also worked properly. Undocumented variable?

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

* Update addons/explosives/functions/fnc_stopExcludingMine.sqf

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

* Header Fixes

Fix information in the function headers

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

* Remove Individual Functions

* Compacter Functions

* Event

* remove tab (facepalm)

* Jonpass' Review Fixes

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

* Fix exitWith mistake

* Refractor of allowDefuse

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

* Update addons/explosives/functions/fnc_allowDefuse.sqf

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

* Update Documentation

* Rephrase documentation

* Another rephrase

* Relabel Locality

* Update addons/explosives/functions/fnc_allowDefuse.sqf

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:49:27 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
Vdauphin
ec12ee2137
Disarming - Add quantity to ace_disarming_dropItems event (#8232)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-11 22:08:02 +02:00
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
Serg Vergun
af66a9881c
Interaction Menu - Add triage colors to icons at passengers list (#8366) 2021-10-11 11:51:05 +02:00
Steve Zhao
0b2b4d7397
Medical - Improve keybind to open med menu for vehicle occupant under cursor (#8160)
* add lineIntersectsSurfaces to med menu key

* fix _target = nil if no intersections

* only look through player and player vehicle

* Update addons/medical_gui/XEH_postInit.sqf

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
2021-10-11 10:29:09 +02:00
GhostIsSpooky
1c921674a9
Fixed jerry can madness (#8348)
Fixed refueling vehicles with high input rates when using fuel sources with low fuel capacity.
2021-10-11 00:47:54 -05:00
Serg Vergun
128ddf2591
Nametags - Add setting to disable effect of ambient brightness on view distance (#8325)
* Add setting to disable effect of ambient brightness on view dist

* Add periods and Title Case for English localization

* Apply suggested code. Make it more readable

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

* fix spelling

* fix mistype

* one more mistype

* Implement suggestions

Settings parameter as slider.
English and Russian localization.

* Update addons/nametags/functions/fnc_getCachedFlags.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-11 00:35:21 -05:00
GhostIsSpooky
0d34ac2838
add string for black P99 (#8501) 2021-10-10 18:03:41 -05:00
GhostIsSpooky
e92ea53385
Medical - Return tourniquets after PAK (#8419) 2021-10-11 00:34:28 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
GhostIsSpooky
baff363915
Realistic Weights - Add Apex / Contact / Anti-Tank Weapons (#8357)
* Add Apex / Contact / Tanks Weapons

* Inheritance fix

* Fix UBCs

* Weight for the RPK
2021-10-10 12:54:12 -05:00
GhostIsSpooky
e3986f4528
Small Arms - Fix FNX-45 magazine round count (#8352)
* Change FNX-45 magazine round count

* Style pass
2021-10-10 12:02:26 -05:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
GhostIsSpooky
9479c29b42
Repair - Fix claimed object abuse (#8460) 2021-10-10 18:50:10 +02:00
GhostIsSpooky
1b318433a2
Common - Add settings for additional progress bar information (#8428)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 18:49:41 +02:00
BaerMitUmlaut
6128b8ef06
Common - Only switch side if necessary on person loading (#6334)
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 16:26:36 +02:00
GhostIsSpooky
0a203fdde4
Medical Feedback - Stop effects on featureCamera (#8373)
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
2021-10-10 16:24:10 +02:00
GhostIsSpooky
755c5ea50d
Hit Reactions - Add check for disabled damage (#8474) 2021-10-10 16:04:54 +02:00
Dedmen Miller
7bf9f3112e
Attach - Follow bone rotation for attached items (#8477) 2021-10-10 16:03:50 +02:00
PabstMirror
94c62d8ed3
Extensions - Replace ace_parse_imagepath with SQF regexFind (#8243) 2021-10-10 15:41:47 +02:00
Ozan Eğitmen
64decdd189
Cargo - Add Option to Reopen Menu After Unload (#8487)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 15:37:16 +02:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
Ozan Eğitmen
fb2b1ceadb
Explosives - Fix Dial Tone Sound Position (#8488)
* explosives - fix dial tone sound position

* Use right hand pos instead of hardcoded pos
2021-10-08 11:35:47 -05:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
GhostIsSpooky
a95e71fec8
Arsenal - Handle Weapon Items not in Box Virtual Items as Unique (#8375)
* Handle unique items that are also weapon attachments

* only flatten once
2021-10-07 12:39:55 -05:00
GhostIsSpooky
ce705310e3
Realistic Names - Add Contact DLC & PIP optics (#8413)
* Add Contact DLC optics

* add DMS variants

* fix bracket, add pip optics

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-07 12:39:18 -05:00
10Dozen
f232f84c6c
Add workaround for ballistics shields (#8418) 2021-10-07 10:46:56 -05:00
GhostIsSpooky
78f9fc964a
Common - Take container into account when replacing items (#8379)
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
2021-10-07 00:10:19 -05:00
mharis001
d6559f22e0
Arsenal - Fix sort running twice (#8479) 2021-10-06 22:16:42 -05:00
Dedmen Miller
d836cbfe6e
Fix vanilla NV Marker lifetime (#8473)
* Fix vanilla NV Marker lifetime

* Empty lines

* Fix whitespace
2021-10-06 22:16:13 -05:00
mharis001
09d1284ad9
Arsenal - Fix sortPanel clearing custom item names (#8478) 2021-10-05 15:37:27 -04:00
Dedmen Miller
7347d563b1
Add event property to detect temporary detach/reattach (#8476) 2021-10-05 12:32:38 -05:00
BaerMitUmlaut
8d804cf76d
Common - Add epilepsy friendly mode (#8452)
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
2021-10-05 12:29:22 -05:00
GhostIsSpooky
5fbbb34d2d
Make unrelated things not explode when repairing (#8351)
_useEffects was probably inverted. Makes ERA/SLAT not explode when repairing unrelated hitpoints. See #7452.
2021-10-05 12:27:55 -05:00
PabstMirror
cb07e2ceba
Tools - Update /includes for 2.06 and cba (#8484)
* Tools - Update /includes for 2.06 and cba

* Update required ArmA/CBA
2021-10-05 12:05:42 -05:00
Filip Maciejewski
d0fd45e220
UI - Infantry speed indictator (#8384)
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-05 18:47:24 +02:00
BaerMitUmlaut
54c9cf6c61
S.O.G. Prairie Fire Compatibility (#8284)
* Added initial compat

* Added G-Forces compatibility

* Added Reload compatibility

* Add fuel capacities to planes and helicopters

* Add fuel capacities to wheeled and tracked vehicles, added fuel cargo config

* Add fuel capacities to OH-6

* Removed custom fuel capacities from Mi-2 with external tanks

* Fix config errors

* Add CSW compatibility for static guns

* Add ACE arsenal to EMM main menu

* Add CBA versioning check for SOG:PF

* Add vn_emm to requiredAddons

required for main menu patching

* Fix arsenal not being added to main menu

* Fix styling of ACE Arsenal button

* Add CSW compat for mortars

* Disable dragging of large statics

* Disable frag for molotov

* Set damage type of melee ammo

* Add custom damage handling for punji traps

* Add ACE Explosives compat to M18 Claymores

* Improve digDistance of Claymore x3

* Add ACE Explosives compat to M14 and M16 mines

* Add Explosives compat for M16 Trip Wire mines

* Add Explosives compat for F1 Trip Wire mines

* Add Explosives compat for Arty Shell Trip wire mine

* Improve interaction points for explosives

* Add Explosives compat for Satchel charge and AT mine

* Add Explosives compat for Punji traps, improve comments

* Add Explosives compat to M112 Breaching charge

* Rename mines.hpp to explosives.hpp

* Allow digging spiderholes with entrenching tool

* Fix minor config errors

* Add CSW pictures, models and stringtable entries

* Add missing stringtable entries

* Add CSW weapon pictures and stringtable entries

* Handle punji trap damage with disabled medical

* Disable cookoff for bicycles

* Remove custom digging tools (needs deeper changes)

* Improve spiderhole digging translation

* Fill CfgPatches units and weapons arrays for Zeus

* Add witty comment

* Use lowercase for external component names

* Fix indentation

* Fix missing base class

* Remove accidentally added files

* pboProject fixes for S.O.G. Prairie Fire Compatibility (#8311)

* Change macros to work with pboproject

* Add placeholders for VN p3d files

* Add ending newlines

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

* Fix UBC

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-05 13:28:43 +02:00
mharis001
66ce0ba5ff
Arsenal - Restore curator camera state when exiting (#8464) 2021-10-02 06:52:50 -04:00
mharis001
310da98c5e
Arsenal - Fix updateUniqueItemsList incorrectly identifying backpacks (#8463) 2021-10-02 06:52:33 -04:00
mharis001
64db683e53
Arsenal - Fix items in custom panels having mass of zero (#8462) 2021-10-02 06:52:20 -04:00
Filip Maciejewski
9eb615ee66
Various polish translation updates (#8465) 2021-10-01 21:55:17 -05:00
Filip Maciejewski
3b90b5eb7f
Grenades - Polish translations updates (#8466)
* Grenades - Polish translations updates

* Remove rogue tab
2021-10-01 21:55:03 -05:00
Filip Maciejewski
26d0a85650
Medical - Polish translations updates (#8467) 2021-10-01 21:51:19 -05:00
PabstMirror
d8fa8220c4
Realisticnames - Fix ubc (#8421) 2021-09-25 15:03:09 -05:00
Salluci
48912be73c
Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388)
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-25 11:16:15 -05:00
Salluci
f9d064e5f4
Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
Vdauphin
e31d931078
Cargo - Fix can't load Slingload_01_Base_F (#8437)
* fix can't load Slingload_01_Base_F

20ft containers (`Land_Cargo20_military_green_F`) can be loaded but all children from `Slingload_01_Base_F` which share the same real size of a 20ft container can't be loaded (ex: `B_Slingload_01_Ammo_F`)

* add a comment next to the changed line 

add a comment next to the changed line indicating why it has to be like that (the point of this PR) for future source reference
2021-09-25 10:55:47 -05:00
Salluci
d5328781db
DAGR / Kestrel - Fix deviceKey condition (#8368)
* Fix DAGR keybind

* Fix Kestrel keybind

* Consistency with other deviceKey conditions
2021-09-25 10:43:09 -05:00
Salluci
a4f24cbe3d
CSW - Fix AI reloading from GroundWeaponHolder (#8399)
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
2021-09-25 10:39:03 -05:00
Salluci
82a8350fb4
Add weapon data for the Contact M14 (#8412) 2021-09-25 10:35:45 -05:00
Dystopian
7687429b82
Fix keyhandler removing when drop (#8443) 2021-09-18 11:06:01 -05:00
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05:00
Elgin675
565aa8cf0e
Add French Translation (#8427) 2021-09-07 13:35:16 -05:00
PabstMirror
efe09682cc
Add SQFC support (#8235)
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

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

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-09-03 19:08:34 -05:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162)
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-09-03 14:50:54 -05:00
Brandon Danyluk
0f7376f60c
Vehicles - Add Auto-Throttle to Planes (#8275)
* Add auto throttle to planes

* add newline

* clarify things

* Use a better deltaTime value. Takes into account game pause

* add coment

* Add auto throttle cancellation on user input

* misc fixes
2021-09-03 14:39:52 -05:00
Salluci
be8a50c8a9
Captives - Add caller to captiveStatusChanged event (#8360)
* Add caller to ace_captiveStatusChanged event

* missing bracket

* Spaces, default value for _caller in setHandcuffed

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

* use default value in SetSurrendered

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

* update function example in doRemoveHandcuffs

* fix undefined variable

a lesson in not copy-pasting code

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

* ditto last commit

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-03 14:38:49 -05:00
∂ω∂
f7126383fe
Medical - Add treatment status events (#8385)
* Medical: Add item params to ace_treatmentSucceded

* Medical: Add treatment[Started,Failed] events
2021-09-03 14:37:48 -05:00
Salluci
ce91d19f28
Realistic Names - Add strings for Khaki MX variants (#8411)
* Add Khaki MX variants

* German Translations

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

* Translations

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

* Translations

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

* Whoops

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

* Capitalize

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-03 14:36:58 -05:00
Salluci
ee44319801
Fix typo (#8416) 2021-09-01 12:46:48 -05:00
Salluci
afde782d12
change 7.62x67 to .300 WM (#8395) 2021-09-01 12:12:22 -05:00
Salluci
b6c86d8a8a
Add MRAWS/Vorona support to reload_launchers (#8408) 2021-09-01 12:11:58 -05:00
Salluci
10e56c090d
Cleanup config & allow LIM-85 to swap barrel (#8409) 2021-09-01 12:11:02 -05:00
PabstMirror
0c1d7177c0
Common - Block user input on headbug fix (#8398)
* Common - Block input on headbug fix

* keep return
2021-08-28 14:56:13 -05:00
Salluci
039af66a8f
Medical - Fix #8389 (#8390)
* fix implicit dependency between medical damage and medical engine

* move stringtable

* valve pls fix

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-08-23 18:27:00 -05:00
PabstMirror
83cbec73ce
medical - re-enable movedToSQF for enableVehicleCrashes (#8391) 2021-08-23 18:26:32 -05:00
Serg Vergun
0d5a4d89d8
Remove duplicates from mags array (#8367) 2021-08-23 12:44:06 -05:00
Salluci
2944064c06
Add spare barrel to misc items (#8374) 2021-08-23 12:43:05 -05:00
Kyle Mckay
56123591a0
Update contribution documents (#8382)
* Update code guidelines for script_component

* Update contributing documents for pull requests

- Reflect true attribution practices
- Reflect true merge process (this changed a long time ago)

* Remove listed maintainer from component readmes

We have almost never used these and serve as a source of confusion for
new contributors.
2021-08-16 20:17:56 +01:00
Kyle Mckay
62679832df
Zeus - Move to native CBA Settings (#8381)
* Zeus - Move to CBA settings

* Zeus - Update BI module functions to 2.04 versions
2021-08-16 12:01:50 +01:00
Sergey Veryaskin
106ef17071
Translation - Russian (#8376)
* Translation - Russian

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-08-11 15:44:04 -05:00
PabstMirror
e6a0772adb
Cargo - Fix UBC on iDAB (#8358) 2021-08-06 15:15:20 -05:00
Vdauphin
34069ed031
Update CfgVehicles.hpp (#8344) 2021-08-04 12:34:44 -05:00
Serg Vergun
3827178606
Remove 4th never used parameter (#8342) 2021-08-03 13:06:12 -05:00
Brandon Danyluk
82c14a0ae2 SACLOS tweaks 2021-08-02 17:32:35 -06:00
Brandon Danyluk
98e66d20ab remove malyutka 2021-08-02 16:53:14 -06:00
Brandon Danyluk
76c5c6e6d3 make over-fly trajectory over-fly 2021-08-02 16:51:46 -06:00
Brandon Danyluk
7b7d79fbd3 fix uninitialised values 2021-08-02 16:28:29 -06:00
Brandon Danyluk
aff19ec6ea fix NLAW navigation profile 2021-08-02 16:22:38 -06:00
Serg Vergun
fa6da1ae7c
Vehicles - Add configurable engine startup delay (#8327)
* Add configurable engine startup delay

* add suggested change

Add space char

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

* Squashed commit of the following:

commit 14f5483d8fa49d36effa8b18a3df392ed39b19da
Author: Serg Vergun <1197314+severgun@users.noreply.github.com>
Date:   Fri Jul 23 20:23:52 2021 +0300

    Add 0 cap and update docs

commit e3ce7f273882b3f4e2cba916c39b506f857b20db
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:42:42 2021 +0300

    add parentheses

commit b36eedc61b5e6bb868c37901bd4191767fbdaff8
Author: severgun <sewergun@gmail.com>
Date:   Fri Jul 23 12:34:30 2021 +0300

    Add ability to set engine startup delay per vehicle by script

* Change function name

* add suggested exitWith condition

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

* Update docs/wiki/framework/vehicles-framework.md

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

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-27 12:47:07 -05:00
PabstMirror
fafd7b3928
Inventory - Fix default return for currentItemListBox (#8340) 2021-07-27 12:39:45 -05:00
Dystopian
27bd25c4b8
Interact Menu - Simplify fnc_renderActionPoints (#8186)
* Simplify fnc_renderActionPoints

* Replace nil-count with forEach
2021-07-24 12:10:49 -05:00
Elgin675
46df1bd811
Translations - Update / Fix French Translations (Markers, Medical Damage and Medical Treatment) (#8334)
* French translation - fix typo

* French translation - add french translation of `STR_ACE_Markers_MarkerDirectionScaleSlider_Tooltip` key

* French translation - Add french translation of `Medical_Treatment_CPRSuccessChance` keys
Fix french translation of `Medical_Treatment_TreatmentTimeCPR_DisplayName` key
2021-07-24 02:40:36 -05:00
Yannis Li
0e043e5fb7
fix: change conditional so a magazine is added to turret when array is not modified (#8287)
Co-authored-by: Yannis Li <yannis@trybe.ly>
2021-07-24 00:20:17 -05:00
Joko
08eadc7c19
Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
10Dozen
0b7aa7f3e5
Overheating - Drop jammed states on unit respawn (#8333)
* Overheating - Added respawn handler to drop jammed state

Fixes https://github.com/acemod/ACE3/issues/7651

* Description update

* Update addons/overheating/functions/fnc_handleRespawn.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:48:16 -05:00
Serg Vergun
489fab4cb8
Cargo - Prevent damage to items (created from classnames) on unloading (#8324) 2021-07-23 22:45:36 +02:00
Dystopian
35290a1a10
Interact Menu - Add settings for self interaction menu reordering (#8036) 2021-07-23 22:44:27 +02:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon (#8329)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
BaerMitUmlaut
c7ff918554
Medical Engine - Disable third party medical systems (#8289)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 21:32:36 +02:00
Lupus the Canine
4ae4dba3bb
DAGR - Align underlining in waypoint editing page (#8313)
* Allign uderlining in DAGR waypoint editing

* Removed duplicated DAGR_MENU_PSELECTION8
2021-07-23 13:51:35 -05:00
Dystopian
ad41bf2c60
Dragging - Add more objects configs (#8104)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 16:11:57 +02:00
pterolatypus
c81f371f5d
Medical Treatment - Allow variable CPR chance based on blood volume (invalidates old setting) (#7983) 2021-07-23 15:59:32 +02:00
BaerMitUmlaut
88bbb0dd69
Medical - Add functions to serialize / deserialize the medical state of a unit (#7944) 2021-07-23 15:49:04 +02:00
10Dozen
d3ee39d8e4
Markers - Add direction/scale reset on Right Mouse Button (#8319)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-07-23 15:06:31 +02:00
Serg Vergun
5e56885b1e
Fix category duplication in Russian (#8326) 2021-07-22 11:59:17 -05:00
Kyle Mckay
e870e2f1f9
Common - Improve vehicle icon caching implementation (#8318)
* Use native hashmap for common vehicle icon caching

Should be more optimised
2021-07-18 18:26:23 +01:00
PabstMirror
75934f883c
Rangecard - All use inside vehicles via interaction menu (#8310) 2021-07-07 12:10:35 -05:00
StuntKeeper
1b43cd6951
Added missing Russian translations (#8307)
Added missing Russian translations and fixed a few incorrect ones in acemedical.
2021-07-06 14:25:52 -05:00
Elgin675
238d285344
French translation : fix Mine M6 and IED french translations (#8309) 2021-07-06 14:25:10 -05:00
Brandon Danyluk
25b1b47f5f Merge branch 'missileDynamics' of https://github.com/TheCandianVendingMachine/ACE3 into missileDynamics 2021-07-02 17:47:29 -06:00
Brandon Danyluk
d50491f44f Destroy projectile on all clients
The projectile needs to be destroyed on all clients to stop it from being simulated. If not destroyed where projectile is local, it will still explode when hitting the ground. If not destroyed on remote clients, the projectile will still be visible but deal no damage
2021-07-02 17:47:15 -06:00
Brett
8bd755e40a
capitalize huntir monitor (#8303) 2021-07-02 16:42:23 -05:00
PabstMirror
5acc2775ee Update 9m14_joystick.p3d
removed p:\ part from proxy path:
was: `\p:\a3\data_f\proxies\gunner_static_low01\gunner.p3d`
2021-07-02 11:46:58 -05:00
PabstMirror
59e3b07c36
Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -05:00
BaerMitUmlaut
9291d9b714
Medical - Hide cursor when unconscious (#8269)
* Hide cursor when blocking inputs

* Update addons/common/DisableMouseDialog.hpp

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

* Update addons/common/functions/fnc_disableUserInput.sqf

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

* Update addons/common/DisableMouseDialog.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-06-27 15:39:17 -05:00
BaerMitUmlaut
2ea0106550
Vehicle Lock - Increase vehicle key mass to 0.1 (#8270)
* Increase vehicle key mass to 0.1

* Update addons/vehiclelock/CfgMagazines.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-06-27 15:38:34 -05:00
mharis001
97ac12039f
Interaction - Disable open box action when inventory is locked (#8285) 2021-06-27 15:24:41 -05:00
mharis001
da3251c641
Explosives - Fix missing action name for setup helper object (#8288) 2021-06-27 15:17:25 -05:00
Brett
a417ea87d3
Arsenal - Add on loadout delete event (#8294) 2021-06-27 21:08:39 +02:00
Brett
2507e8f36b
fix minor cut re-opening (#8296) 2021-06-27 13:25:55 -05:00
PabstMirror
f8d2837b36
Parachute - Put both setting in same subcategory (#8299) 2021-06-27 13:01:56 -05:00
Brett
d5bc7f10f5
fix my name, add it to contributers (#8295) 2021-06-27 07:01:12 +02:00
mharis001
cc0d2424d4
Attach - Improve IR Strobe blinking pattern and increase lifetime (#8283)
* Improve IR Strobe blinking pattern and increase lifetime

* Improve readability of maxLifetime entry

Co-authored-by: commy2 <commy-2@gmx.de>

* Apply suggestions from code review

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

Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2021-06-20 23:37:57 -05:00
Brandon Danyluk
d8eb425ece Better flare decoy calculation 2021-06-11 22:02:59 -06:00
Brandon Danyluk
038c82a489 better JDAM simulation
Attack heading and impact angle now are followed better
2021-06-11 20:37:36 -06:00
Brandon Danyluk
8142bb069b remove TERCOM guidance 2021-06-11 18:44:02 -06:00
Brandon Danyluk
4308d33c50 remove testing constants 2021-06-06 20:28:39 -06:00
Brandon Danyluk
79c6bf9167 Change GBU navigation 2021-06-02 00:34:48 -06:00
Brandon Danyluk
7cf29ba715 work on parsing heightmap 2021-06-01 14:13:45 -06:00
Sergey Veryaskin
c8812e093a
up russian language (#8263)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-05-25 21:06:00 -05:00
Brandon Danyluk
e6fcd110d2 add TERCOM state defines 2021-05-24 21:53:19 -06:00
Brandon Danyluk
597e188b9a Merge branch 'missileDynamics' of https://github.com/TheCandianVendingMachine/ACE3 into missileDynamics 2021-05-23 17:38:05 -06:00
Brandon Danyluk
f89bf62242 progress update: tercom now flies to acquisition basket 2021-05-23 17:38:00 -06:00
Elgin675
e4a96b7229
Update French Translation and Fix Typo (#8262) 2021-05-23 16:57:36 -05:00
PabstMirror
e3e3605007 fix tabs in aim9 2021-05-23 16:46:46 -05:00
PabstMirror
9122535daa Fix tabs and manpad UBC 2021-05-23 16:38:45 -05:00
LorenLuke
52116c7fae Changes poisson disc to centered random. (#8257)
It looks nicer and distributes more realistically. I don't know what I was thinking when I first put in poisson disc.
2021-05-23 16:38:45 -05:00
PabstMirror
d3de5a9e69 Patachute - Add sound effect when cutting (#8239) 2021-05-23 16:38:44 -05:00
Drofseh
e082d7523f Fix wrong shot size in birdshot strings (#8253) 2021-05-23 16:38:44 -05:00
JoramD
ede5c1da58 Night Vision - Add color variants to all generations (#8209) 2021-05-23 16:38:44 -05:00
jonpas
a715a5f52e Markers - Fix JIP scale (#8248) 2021-05-23 16:38:44 -05:00
JoramD
00eead47c1 Parachute - Add failure chance (#8226)
* Initial push

* disable forgotten define

* Improve exitWith check

* Requested/suggested changes

* Requested changes

* Requested changes
2021-05-23 16:38:44 -05:00
Lupus the Canine
4726108c8e Cargo - paradrop fixes (#8203)
* Small fixes in ace_cargo

Makes paradropItem and unloadItem invoke event "ace_cargoUnloaded" with parameters _itemObject, _vehicle and "paradrop" or "unload" respectivelty.
paradropItem invoked said event but if item was classname it would send classname to event which is not particularly useful.

* Update XEH_postInit.sqf

Moved event invocation to unloadItem, this provides ability to always pass object to eventhandlers.

* code refactor

refactored according to https://github.com/acemod/ACE3/pull/8203#discussion_r610394484

* Update fnc_paradropItem.sqf

apply new fix

* Revert "Update fnc_paradropItem.sqf"

This reverts commit 3db5cc1910.

* Update fnc_paradropItem.sqf

fixed hint that was broken by previous fixes

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* style check

Co-authored-by: commy2 <commy-2@gmx.de>

* naming convention

replaced object references called _item with _object.

* Update fnc_paradropItem.sqf

Co-authored-by: commy2 <commy-2@gmx.de>
2021-05-23 16:38:44 -05:00
PabstMirror
c425b35c5f Markers - Fix marker scale (#8233) 2021-05-23 16:38:44 -05:00
Dedmen Miller
825596bffe Attach - Added attached/detaching events (#8193)
* Added ace_attach attached/detach events

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:44 -05:00
Abogado
cc0d8a5ada Translations - Spanish (#8229)
Complete to date spanish translation.
2021-05-23 16:38:44 -05:00
JoramD
e2e747e169 MicroDAGR - Add mode switching keybinds (#8216)
* Initial push

* Mode cycling

* Use defines
2021-05-23 16:38:44 -05:00
JoramD
d8bdde07b3 Initial push (#8225) 2021-05-23 16:38:43 -05:00
frankplow
f1338e65f4 Markers - Add scale slider (#8059)
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:43 -05:00
jonpas
a80a0b870b Interact Menu - Make List default (#8217) 2021-05-23 16:38:43 -05:00
Dystopian
89fb57fdcf User Interface - Add setting for Development Build watermark (#8140)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:43 -05:00
TyroneMF
d41c5bd053 Dragging - Fix build issue (#8219) 2021-05-23 16:38:43 -05:00
Dániel Boros
026b94903e Dragging - Add new dragging animations (#7950)
* New custom animation added

* Adjusted CfgMoves and the script components

* New drop animation and key handler

* CBA settings and new ManActions added

* Adjustments to the drop animation

* Added translations and fixed some stuff

* Update CfgMovesBasic.hpp

* Fix translations

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

* Use the same key to drop object

* Update addons/dragging/stringtable.xml

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

* Fix French translation

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

* Lower the weapon accuracy of the drag animations

* Removed auto-switch to handgun

* Update fnc_startDrag.sqf

 - Holding a launcher breaks the firing animation.
 - Now the unit has to hold either a primary weapon or handgun.

* Handle the unit's current weapon

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

* Update addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf

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

* Update addons/dragging/initSettings.sqf

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:43 -05:00
Salluci
c7d4981329 Medical - Add Vehicle Crashes setting (#8149)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:43 -05:00
PabstMirror
e3a3e29444 Tools - Add script to check sqf/config with sqfvm (#8137) 2021-05-23 16:38:43 -05:00
Kyle J. McKeown
7c879976ce Name Tags - Add ability to set custom rank icon (#8174) 2021-05-23 16:38:43 -05:00
Steve Zhao
fa870a3ccd Medical - Allow unconscious unit in Taru pods (#8168)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2021-05-23 16:38:43 -05:00
R3voA3
517b576193 Map - Fix stuck map compass size (add 0.1 zoom duration) (#8176)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-05-23 16:38:43 -05:00
commy2
9d6843fdb3 Fix Injured Sounds Not Playing At Altitudes Above 70 (#8212) 2021-05-23 16:38:43 -05:00
Brett
b181f1badf Medical - Add Alternative Survival Chance (#8192)
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
2021-05-23 16:38:43 -05:00
jonpas
4e3d3ceeae Mk6 Mortar - Fix README.md typo (#8205) 2021-05-23 16:38:43 -05:00
Pascal Dunaj
44ecfc8ac3 Typo in usage example (#8201) 2021-05-23 16:38:43 -05:00
PabstMirror
c5972e692c Various - Add missing units/weapons to cfgPatches (#8175)
* Various - Add missing units/weapons to cfgPatches

* Update config.cpp
2021-05-23 16:38:42 -05:00
Brandon Danyluk
2694453b56 init commit of cruise missile 2021-05-23 00:24:13 -06:00
Brandon Danyluk
22e5596399 Add missile hiding for malyutka 2021-05-21 15:36:32 -06:00
LorenLuke
750030c6f1
Changes poisson disc to centered random. (#8257)
It looks nicer and distributes more realistically. I don't know what I was thinking when I first put in poisson disc.
2021-05-20 13:08:37 -05:00
PabstMirror
99bfef1592
Patachute - Add sound effect when cutting (#8239) 2021-05-19 23:39:34 -05:00
Brandon Danyluk
790faf1c21 Add settings for various things 2021-05-18 21:32:04 -06:00
Brandon Danyluk
395b2b2d12 Avoid overshooting target 2021-05-18 04:12:44 -06:00
Brandon Danyluk
f7bd523221 Update doppler seeker to allow the tracking and killing of projectiles 2021-05-18 03:44:05 -06:00
Brandon Danyluk
36d75765c6 avoid making un-needed calls to the server 2021-05-18 03:18:42 -06:00
Brandon Danyluk
e67aefcf51 change events to allow for any number of arguments 2021-05-18 02:46:30 -06:00
Brandon Danyluk
72ca725242 add local event for mission makers 2021-05-18 02:42:42 -06:00
Brandon Danyluk
f825d6ff92 Only launch if we are above a threshold angle 2021-05-18 02:37:34 -06:00
Brandon Danyluk
a25cf7031b Optimise iron dome 2021-05-18 02:23:52 -06:00
Brandon Danyluk
980c3d0546 Add Iron Dome interceptor API 2021-05-18 00:32:55 -06:00
Drofseh
be1045c43f
Fix wrong shot size in birdshot strings (#8253) 2021-05-09 17:13:07 -05:00
JoramD
2e1e6daef5
Night Vision - Add color variants to all generations (#8209) 2021-05-09 18:49:56 +02:00
jonpas
97701fc075
Markers - Fix JIP scale (#8248) 2021-05-08 23:30:09 -05:00
Brandon Danyluk
b82484b73c add trail to vikhr 2021-05-08 03:11:20 -06:00
Brandon Danyluk
6165be0c2f tweak Vikhr guidance 2021-05-08 03:10:19 -06:00
Brandon Danyluk
c71be6543e tweak metis guidance params 2021-05-08 03:04:29 -06:00
Brandon Danyluk
ef529d286f tweak HOT guidance params 2021-05-08 03:00:51 -06:00
Brandon Danyluk
175652456b add the ability to see a light trail 2021-05-08 02:49:16 -06:00
Brandon Danyluk
5315b11177 add MCLOS guidance 2021-05-08 02:49:07 -06:00
Brandon Danyluk
fc7b310529 Add realistic 9m14 behaviour
the 9m14 control joystick can attach 4 9m14 launchers at a time. Replicate that here
2021-05-08 02:48:40 -06:00
Brandon Danyluk
8b3e90925e Add joystick model 2021-05-07 04:19:26 -06:00
Brandon Danyluk
f4f3224947 fix game crashing on load 2021-05-06 20:20:20 -06:00
Brandon Danyluk
e76fde4c0d perplexed 2021-05-06 20:03:59 -06:00
Brandon Danyluk
a0e193a241 crash on load 2021-05-06 19:18:44 -06:00
Brandon Danyluk
d8fb60808a update stringtables so they are in titlecase 2021-05-06 19:06:10 -06:00
Brandon Danyluk
20a3277ac8 init commit 9m14 2021-05-06 15:01:50 -06:00
Brandon Danyluk
80b2595abb tabs -> spaces again 2021-05-02 01:40:23 -06:00
Brandon Danyluk
7988469fe3 localise vikhr 2021-05-02 01:37:03 -06:00
Brandon Danyluk
72297be13e localise sdb 2021-05-02 01:31:52 -06:00
Brandon Danyluk
0a28e3e5a3 localise sam 2021-05-02 01:28:28 -06:00
Brandon Danyluk
f45ee879ac localise missile guidance 2021-05-02 00:34:45 -06:00
Brandon Danyluk
0d38505ea3 localise maverick 2021-05-02 00:17:13 -06:00
Brandon Danyluk
5edabba174 actually localise manpad 2021-05-02 00:04:11 -06:00
Brandon Danyluk
c67bc4d98e localise manpad 2021-05-02 00:00:56 -06:00
Brandon Danyluk
c0e623af9b fix IR tracker losing lock immediately due to being blocked by launcher 2021-05-01 23:58:15 -06:00
Brandon Danyluk
988768ae3d localise gbu 2021-05-01 23:36:45 -06:00
Brandon Danyluk
f12e93414a localise aim9 2021-05-01 23:32:37 -06:00
Brandon Danyluk
79bd76a9a1 localise aim120 2021-05-01 23:20:50 -06:00
Brandon Danyluk
89e64dfcdc tabs -> spaces 2021-05-01 23:04:08 -06:00
Brandon Danyluk
f3bea7bb30 change how IR seeker performs
The angle check is better now. Relative velocites guarenteed
2021-05-01 22:58:11 -06:00
Brandon Danyluk
356ff4ce4d Tweak hellfire attack profile 2021-05-01 22:04:11 -06:00
Brandon Danyluk
b4e5a29119 Add hellfire mid course guidance 2021-05-01 21:42:49 -06:00