Update from original #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
**When merged this pull request will:** - Update translations for Japanese - fix the miss translations
* Armake model.cfg fix * Spaces! * Case sensitive filenames fix
* Allow custom materials for tags * Fix quickTag * More betterer
change an ERROR to WARNING in Markers component
* Ballistics/Realistic Names - Integrate P90 Compat * Update CfgWeapons.hpp * Remove old compat addon * Update addons/realisticnames/stringtable.xml Co-Authored-By: PabstMirror <[email protected]> * Update addons/realisticnames/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]> * Update addons/ballistics/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]> * Update addons/ballistics/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]>
Automatically committed through Travis CI. [ci skip]
Automatically committed through Travis CI. [ci skip]
add alganthe to ace3 maintainers list
* add sqflint to circleci * lint working directory * do not exit with 1 on errors * split up build jobs * change linting not to be required * use armake docker image for updating docs
* Show tourniquets in Medical and Patient information * Ace styling * Move tourniquet update function to medical
Added 1.3: Making an arsenal only with items from precreated loadouts. A very powerful addition when you want default loadouts spawnable without giving a full arsenal or looking up all classnames yourself. Discussed with commy2 and alganthe in the ArmA 3 Mission creation discord channel. If the format is not perfect, please change it to your liking. -Miles T. Focus
* Fix hide altimeter setting not working Signed-off-by: Josuan Albin <[email protected]> * Clean up altimeter PFH * Put ! back inside
* abc * Revert "abc" This reverts commit bcb4214. * Update to current commit * Added HOT1 Missile and SACLOS/Wire guidance * Added all HOT variants. Added polish to code * Fixed bug with pylons * Changed how seeker angle is calculated. When the wire snaps the missile goes haywire. Fixed bug where HOT2/3 missiles weren't getting missile guidance * Replaced Wiesel FireFIST launcher with HOT Launcher * Remove debug defines * Tweak thrust * Fix formatting issues. Added true randomness. Added ACE prefixes. Added string table. Tweaked missile dynamics * Fix bug where attack profile correction was wrong due to magnitude always being 50. Add stringtable values for relevant strings. Added reload time to Wiesel ATGM. Added "onFired" to initialize values * Moved wire-snapping logic to attack profile * Missile flight dynamics tweaked * Add a crosshair offset. The missile sits in this offset relative to the crosshair * Add LOS checks. Fix bug where wire-cutting didnt work. * Tweak explosive range for a kill radius of ~20m. Add fragmentation * Add AI Flags * Person in control of missile may not be the shooter * Fix RPT spam on missile out of LOS. Tweak missile dynamics. Add wire break sound cue * Fix bug where missile didn't go to a fake target in front of it when out of LOS * Use a better, more generic way to calculate direction camera is facing * Use ACE Macros for frag values. Get config entry with CBA * Add Wiki entry * Add new lines to wiki. Allow for SQF expressions in config for maxCorrectableDistance * Add CPP code tag * Fix wiki grammer error * Re-convert back to CBA_fnc_getConfigEntry * UAV Gunner support, cleanup * Fix bug where SACLOS for launcher guided weapons was off * Add the ability to define how far ahead of the missile the attack profile will seek toward
* Illumination Flares * add M992 IR flare * update debug script * comments
Automatically committed through Travis CI. [ci skip]
Automatically committed through Travis CI. [ci skip]
add 100Rnd mags magwell to all MX variants
Common - checkfiles use cba's list of CfgPatches
Automatically committed through Travis CI. [ci skip]
* Use CBA addons instead of activatedAddons * Better checks * Betterest checks * Delay call to toLower until needed * Apply suggestions from code review Co-Authored-By: dedmen <[email protected]>
Cleanup spacing on call COMPILE_FILE
* Cache refuel classes * Apply suggestions from code review Co-Authored-By: dedmen <[email protected]> * Fix script errors from inner _x
* Cache cargo vehicle classes to init * fix * Apply suggestions from code review Co-Authored-By: dedmen <[email protected]> * Fix initEH being added twice for static weapons
* Cache tagging static models * Fix bugs, use compileFinal * Apply suggestions from code review Co-Authored-By: dedmen <[email protected]> * Use toLower
* Cache inventory postInit config lookups * Safety * fix * More better * ugh * add parenthesii (not trolling) these are actually needed ``` Error in expression <_inventory_Grenades_ItemList", []]; if (!ace_inventory_Grenades_ItemList isEqual> Error position: <!ace_inventory_Grenades_ItemList isEqual> Error !: Type Array, expected Bool ``` * Add space
* Cache minedetector detectableClasses * use compileFinal
**When merged this pull request will:** - Title
* Interact Menu - Cache config actions for CaManBase * Update addons/interact_menu/functions/fnc_compileMenu.sqf Co-Authored-By: PabstMirror <[email protected]> * Update addons/interact_menu/XEH_preInit.sqf Co-Authored-By: PabstMirror <[email protected]> * Apply suggestions from code review Co-Authored-By: PabstMirror <[email protected]>
) * Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable - Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks. - Minor `==` to `isEqualto` replacements * `count crew _target isEqualto -1` to `count crew _target isEqualto 0` * Tab Replacement - remove \t * Reverted UAV check, Params formatting, Lazy Eval * Update addons/dragging/functions/fnc_startCarry.sqf Co-Authored-By: PiZZAD0X <[email protected]> * Update fnc_startDrag.sqf * Remove beta suggestion extra line additions * Update addons/dragging/functions/fnc_startDrag.sqf Co-Authored-By: PiZZAD0X <[email protected]> * Added ability to export loadout to defaultloadouts Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand. * Update fnc_buttonLoadoutsSave.sqf * Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf Co-Authored-By: PiZZAD0X <[email protected]> * Add usage info to tooltip
* Move zeus SelfActions to config * Port CBA PR #1048 * Move Land_Camping_Light_off_F TurnOn action to config * Move createModule function to script func * Update addons/zeus/functions/fnc_canCreateModule.sqf Co-Authored-By: dedmen <[email protected]> * Apply suggestions from code review Co-Authored-By: dedmen <[email protected]> * Teaching it a lesson about spacing * Update CBA: script_macros_common.hpp * Just change admin in cba macro
* Change SLAM magnetic to detonate upon defusal * Disable explodeOnDefuseChance on SLAM timer mode
* Added localUnits EH Code by @commy2 * Init localUnits Variable * use localUnits for medical_blood statemachine * use localUnits for medical_ai statemachine * Remove bracket hell * Add Deleted EH * Run at preInit, move to seperate file * Handle Respawns, Filter Dead * Add detection for Fake deleted EH * Use a getter function * delete all objNull at deletedEH * Cleanup header/comments * Move isBleeding check to inside statemachine * opps * debug off
No Uniform Restrictions got updated for 1.88
classicarma
pushed a commit
that referenced
this pull request
Aug 28, 2020
* Added Bandage Reopening Chance Modifier * Added Wound Reopen Chance Addon Setting * Fixed dumb error in localization setup * Credit! * Resolved issue with Addon Settings definition & removed testing values. * PR Feedback #1 - Removed unnecessary whitespace on LN 46 - Call global var directly at LN 87 - Updated Wound Reopen Chance localized name & description * PR Feedback #2 - Increased reopen coefficient upper limit from 2 to 5. * Changed author credit to reflect GitHub email.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.