* move overheating cookoff into separate function
* move heatCoef and require mission restart for setting change
- move heatCoef to a more sensible place
- require mission restart for heatCoef setting change (it gets cached per ammo type)
* add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission
- add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission, this prevents an issue where all weapon cookoff regardless of temp, because required temp gets multiplied by cookoffCoef which has been set to 0.
* file end new line
* update header for ace_overheating_fnc_cookoffWeapon
* use ambientTemperature as floor for weapon and ammo temp
* add coolingCoef setting
* improve feature documentation
* add fnc_cookoffWeapon to XEH_PREP
* add type of jam to ace_weaponJammed local event
- add type of jam to ace_weaponJammed local event
- fix#8637
* fix misspelling
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
* clear all weapon heat on death
* Update addons/overheating/functions/fnc_updateTemperature.sqf
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
* deprecate ace_overheating_fnc_getBarrelMass, cache weapon bolt and barrel mass values
- cache closed bolt value by moving config look up to ace_overheating_fnc_getWeaponData
- cache barrel mass value by moving calculation from ace_overheating_fnc_getBarrelMass to ace_overheating_fnc_getWeaponData
- deprecate ace_overheating_fnc_getBarrelMass to be a wrapper for ace_overheating_fnc_getWeaponData that only returns barrel mass
* add public functions to get and set weapon and ammo temperature
* add `canCoolWeaponWithItem` function, workaround for #8657
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* add coef setting for addition heat from suppressor
* Update fnc_overheat.sqf
* improve fnc_canCoolWeaponWithItem
* remove extra (
* Move canCoolWeaponWithItem action code to function
* Use hashmaps and reset on settings change
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
* added check if burning in fullheal and then extinguish
* Add check if fire module is loaded as PabstMirror showed
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* General - Setting category cleanup
- Localize ACE Uncategorized
- Add subcategories for everything in Uncategorized
- Put colors in subCategory (alphabetically last)
- Add extra info on ViewDistance settings descriptions
- Move all settings to initSettings.sqf
* Update initSettings.sqf
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Added German Translation
Added German Translation
* Update addons/arsenal/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ballistics/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cargo/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update stringtable.xml
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/ui/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehicle_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/vehiclelock/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/common/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/cookoff/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/field_rations/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/fortify/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/grenades/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gunbag/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/hellfire/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interact_menu/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/interaction/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/magazinerepack/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/map_gestures/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/markers/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_feedback/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Apply suggestions from code review
Co-authored-by: Jo David <github@jonathandavid.de>
* Update stringtable.xml
* Update addons/explosives/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/gforces/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
* Update addons/medical_engine/stringtable.xml
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Jo David <github@jonathandavid.de>
* Add french translation of EnableSpeedIndicator keys
* Add french translation of EpilepsyFriendlyMode keys
* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)
* Add french translation of the cargo renaming fonctionality (added in PR8023)
* Fix typo in 127x99_API_Mag_NameShort translations
* Add french translation of `LocationsBoostTraining_Description` key
* Add french translation of `interactWithTerrainObjects_Description` key
* Add french translation of `repackLoadedMagazines` keys
* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)
* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys
* Add french translation of Vehicle Towing fonctionality (Added in PR8380)
* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)
* Add french translation of customize Medical GUI colors settings (added in PR8350)
* Add french translation for additional progress bar information feature (added in PR8428)
* Add french translation in multiple modules.
* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
* 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>
* 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>
* 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>
* 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>
* 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
* 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>
* 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
* 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
* 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>
* 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
* 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>
* 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>
* make registerItemReplacement add to proper container
* cleanup, fix variable in itemReplacements namespace
* add exception for not having room in original container
* 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>
* 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>
* 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
* fix fnc_ai_handleFired
* remove debug messages
* use banana instead of FakePrimaryWeapon
* switch from dummy item to new weaponholder
* use exitWith instead of break
* 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
* 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>
* 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.
* 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
* 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>
* 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>
* Fix ammo box cook off when setting is Players only
* Update addons/cookoff/functions/fnc_handleDamage.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add macro for virtualItems index 0 (weapons)
* Add macro for virtualItems index 1 (attachments)
* Add macro for virtualItems index 2 (all items)
* Add macro for virtualItems index 3 (headgear)
* Add macro for virtualItems index 4 (uniform)
* Add macro for virtualItems index 5 (vest)
* Add macro for virtualItems index 6 (backpack)
* Add macro for virtualItems index 7 (goggles)
* Combine parent menu with single child
* Adapt fastroping Cut ropes action for the setting
* Change setting name and description
* Fix action object when child action has different object
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Adapt quickmount Change Seat actions
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Try and put converted item back in the same container
* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf
Co-authored-by: Dystopian <sddex@ya.ru>
* Update addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf
Co-authored-by: Dystopian <sddex@ya.ru>
* Less hacky handling of container names
* Return value convention
Co-authored-by: Dystopian <sddex@ya.ru>
* Fix loading patients into turret only seats
* Fix cargo logic, adjust function for captives (#8000)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove global DAGR_NEXT variable
* Remove global ERR variable
* Fix overwriting global this variable
* Fix overwriting global total and hitpoint variables
* fix condition
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Added Addon Settings for several Medical Treatment Times
Tourniquets, IV Bags, Syringes, Splints, and Body Bags.
* Fixed stringtable indentation
* And again
* Implement Events in slideshow framework.
* Update function header
* Pass correct agruments to next call of autoTransiton.
* Add return of slideshow ID
Return slideshow ID so it can be stored for later use with the events.
* Replace repeat code with variable. _image.
* Redundant comment removal
* Update addons/slideshow/functions/fnc_createSlideshow.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
* Translation - add/fix french grenades keys
* Translation - fix french convertExplosives and Convert_Fuse keys
* Translations - fix some french keys in Advanced Throwing module
* Medical - Add force walk option to fracture setting
* Add French translation
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Reduce calls to statusEffect_set (#7865)
* Reduce calls to statusEffect_set
* statusEffect_addType fracture to forcewalk
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Add Variable Range for Camera Users (Zeus, Spectator) + Settings
Add Setting to Disable Zeus and/or Spectator Map Draws
Add Ability to use Map Gestures on Briefing screen
Add Setting for Briefing Screen mode (All, Only Group, Only Side, Proximity, Disabled)
* disable DISABLE_COMPILE_CACHE
* minor cleanup and add some translations
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* add nicer microdagr model
* rename files
(2 renames because of change in case (MicroDAGR -> microdagr)
* reduce gloss, reduce dirt on screen
* rotate model by 180° and use dummyweapon item model for better ground alignment when placing or dropping the microdagr
* Add: Simplified Chinese Translation for medical items and GUI
Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation
* Add: Simplified Chinese Translation for medical items and GUI
Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation
* Update SC Translation for triage card
Update SC Translation for triage card
* Update Chinesesimp Translations
Update: usage for doing something in SC.
Update: Bandaging action in SC.
* Update: Unlock action for SC Translation
Update: Unlock action for SC Translation
* Add support of localized string
* Add: Support of localized string for tagging interaction
https://github.com/acemod/ACE3/pull/7819#issuecomment-663993956
* Update addons/tagging/functions/fnc_applyCustomTag.sqf
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
* Add custom anim entries
* Switch to SQF based animation detection
* Add time out to CBA_fnc_waitUntilAndExecute
* Remove unneeded comments or defines
* Restore line break
* Styling and removal of not needed code
* Move waitForAnime and make it local nil
* Extended comment
* Add Kola to authors file
* Small bug fix in terms of animation names
* Add custom anim entries
Switch to SQF based animation detection
Add time out to CBA_fnc_waitUntilAndExecute
Remove unneeded comments or defines
Restore line break
Styling and removal of not needed code
Move waitForAnime and make it local nil
Extended comment
Add Kola to authors file
Small bug fix in terms of animation names
* Move animations into data folder
* add uppercase on sqf command
* Rename animation config names and files
* fix physx uncon fix
* Change initial after ragdoll animation name
* Add: Simplified Chinese Translation for medical items and GUI
Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation
* Add: Simplified Chinese Translation for medical items and GUI
Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation
* Update SC Translation for triage card
Update SC Translation for triage card
* Exit earlier the playInjuredSound if no player is around
* Check if _targets array has at least one player
* Remove useless parenthesis
Co-Authored-By: commy2 <commy-2@gmx.de>
* Handle player inside a vehicle
If any player is inside the area then the _targets will not be empty. This also handle the case where player is inside a vehicle or _unit is a player.
* Handle z axis
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Initial Rewrite
* improve getProximityPlayers
* add Zeus Implementation
* fix missing simicolon
* add Spectator Support
* improve local responsiveness
* add Vanilla Spectator Support
* Fix Both Spectators are now working correctly
* exit mouse moving event early when disabled
* Move Diary Event registration to XEH DisplayLoaded
Port Settings to SQF
Add Setting for only showing Friendly Units pointing
* Fix Merge Issue in Stringtable
Redo Settings
* fix a copy past script error
* Update addons/map_gestures/functions/fnc_getProximityPlayers.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Lazy evals and defines
* Small changes
* Simplify initDisplayDiary and fix loading saves
* Cache getProximityPlayers
Improve Vanilla Spectator Support and how Followed unit Nearby data
* Minor header update
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Gunbag Update
adds capability to swap a currently held primary weapon and the weapon current stored in the gunbag. Has a 1.5x time to complete compared to just adding or removing a weapon from the gunbag.
* Update stringtable.xml
* Update addons/gunbag/functions/fnc_swapWeapon.sqf
Update authors field to add credit to the original author of much of the changed code
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf
Update the virtual load in a more efficient way.
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf
Properly attribute author of majority of original code
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
* Update stringtable.xml
* Update French translation
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Remove non-English translations
Leave translations open to translators
* Add CBA setting to enable weapon switching (Default false)
* Fixed variables and updated names for consistancy
* Convert from ACE Settings to CBA Settings
* Fix stringtable.xml indentation
* Update addons/gunbag/initSettings.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/initSettings.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/functions/fnc_swapGunbag.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/initSettings.sqf
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/gunbag/initSettings.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update initSettings.sqf
Change default value to true
* Update CfgVehicles.hpp
Co-authored-by: Joko <hoffman.jonas95@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Improve Performance from handleFirePFH in Advanced Ballistics
* PabstMirror Suggestion
* Dont remove and readd the PFH but have one persitently running
* Update addons/advanced_ballistics/XEH_postInit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Move GForce settings to CBA Settings
* Add GForce coefficient setting
* Fix typo
* Restore ACE Settings class and mark as moved to SQF
* Apply translation suggestions from code review
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
* Arsenal - Add grenade fuse time stat
* Add German translation
Co-authored-by: Jo David <github@jonathandavid.de>
* Add French translations
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Improve IR grenades handling
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Get ammo config once
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>