Base sync 3.16.2 #3
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
Co-authored-by: Mike-MF <[email protected]> Co-authored-by: Drofseh <[email protected]>
* Arsenal - Add option to show live search results * use onEditChanged * Update fnc_onKeyDown.sqf * Update fnc_onKeyDown.sqf * update script_components * skip animate on live search
taller side panels Co-authored-by: PabstMirror <[email protected]>
* medical treatment: separate actions for each bodybag * remove extra icons
Co-authored-by: PabstMirror <[email protected]>
* Tools: HEMTT ignore has_include * Fix make.py and sqfvmChecker.py for changes --------- Co-authored-by: PabstMirror <[email protected]>
* KoreanTranslation Someone has returned all the translations in Korean to English. there is no need to return them. * koreantranslation * Korean Typo Fix * Korean Translation * Update stringtable.xml * Korean Translation Added Added Korean translation related to Cargo Refuel * Merge branch 'master' of https://github.com/Psycool3695/ACE3 * Korean translation Add/Updated * Fixed wrong strings * Korean translation improved * Korean translation updated * Korean translation updated * Fix Merge * Update stringtable.xml * Update stringtable.xml * Korean translation updated * Korean translation minor fix * Korean translation fixed --------- Co-authored-by: PabstMirror <[email protected]>
* NightVision - Draw under HUD Fix #6819 Requires Arma 3 v2.16 * Remove unnecessary version check - cutRsc takes extra parameters fine
Goggles - Draw under HUD
* Cleanup spaces in config macros * remove extra whitespace before call --------- Co-authored-by: Grim <[email protected]>
* use forceUnicode * Update fnc_attributeAddItems.sqf * Update fnc_handleSearchbar.sqf
Lower suture weight
Allow pulling bodies out of wrecks
* Update fnc_getHitpointArmor.sqf * Update addons/medical_engine/functions/fnc_getHitpointArmor.sqf Co-authored-by: Grim <[email protected]> --------- Co-authored-by: Grim <[email protected]>
* added possibility to define orientation on attach items in config * added documentation on attach framework * whitespace * changed to use roll and yaw parameters instead of vectordir for easier usage, and to support placement view with rolled objects. Changed vector calculations * Update addons/attach/functions/fnc_attach.sqf * Docs and comments * fix derp * Update docs/wiki/framework/attach-framework.md * Update attach-framework.md --------- Co-authored-by: Grim <[email protected]>
Remove cargo from zeus editable objects
* Fix swimming issues * Fix fire with rope in hand
* Markers - Add setting for system timestamps * Moved time zone to different setting Added UTC Time zone Added UTC time offset slider Added translation in stringtable * Update fnc_onButtonClickConfirm.sqf Fixed mistake that added offset twice * - Removed tabs - Fixed calculating error * - Fixed tab problem Was a bit enthusiastic with removing tabs. This should to the trick. * - Changed tabs to spaces (Finaly) - Checked SQF with sqf_validator.py - Fixed decimal error by CBA menu * Delete build/_deps directory - This does not belong here * Update fnc_onButtonClickConfirm.sqf Added empty line back * Update addons/markers/functions/fnc_onButtonClickConfirm.sqf Formatting update Co-authored-by: Grim <[email protected]> * Update addons/markers/functions/fnc_onButtonClickConfirm.sqf Formatting update Co-authored-by: Grim <[email protected]> * Update initSettings.sqf Added newline at end of file * Update fnc_onButtonClickConfirm.sqf Fixed fnc header formatting * Update addons/markers/functions/fnc_onButtonClickConfirm.sqf Formatting Co-authored-by: Grim <[email protected]> * Update fnc_onButtonClickConfirm.sqf Updated formatting * Implemented review changes * Review suggestion * Bugfix return absolute positive number with modulo * Updated script to allow offset to exeed midnight in the past * Updated script to allow offset to exeed midnight in the past * Updated script to allow offset to exeed midnight in the past * Updated hour offset calculation * Add support for UTC+13 and +14 timezone * Add minutes UTC offset to timestamp * Add UTC minutes offset setting * Add translation for UTC minute offset setting * Prevent timestamp going over 24 after adding minutes offset * Modify english description for offset settings * Update addons/markers/initSettings.sqf * Properly handle minute offset with negative timezone * Implemented better solution to handle negative timestamp seconds offset * reverted 'Implemented better solution to handle negative timestamp seconds offset' * Revert "Implemented better solution to handle negative timestamp seconds offset" This reverts commit d2599bd. * Update timestamp calculation comments * Update timestamp calculation comments * Update documentation in UTC timestamp calculation --------- Co-authored-by: PabstMirror <[email protected]> Co-authored-by: Grim <[email protected]> Co-authored-by: johnb432 <[email protected]>
* Added real milliseconds to marker timestamp options * Fixed tabs * portuguese translation * Update fnc_onButtonClickConfirm.sqf --------- Co-authored-by: Grim <[email protected]>
* Overheating - Add Bolt Type stat to arsenal * Add stat for barrel swapping * Update addons/overheating/ACE_Arsenal_Stats.hpp Co-authored-by: PabstMirror <[email protected]> * Update addons/overheating/functions/fnc_statTextStatement_allowSwapBarrel.sqf Co-authored-by: PabstMirror <[email protected]> --------- Co-authored-by: PabstMirror <[email protected]>
…le velocities (#9682) Co-authored-by: johnb432 <[email protected]>
* Change wrong CSTRING target descriptionShort = CSTRING(Description); to descriptionShort = CSTRING(PlottingBoard_Description); * change action name to "ToMapToolLabel" displayName = CSTRING(Name); to displayName = CSTRING(ToMapToolLabel);
* maptools, markers, overheating change/add strings to maptools for plotting board. change/add strings to markers for milliseconds add strings to overheating for stat bolt type and barrel type description * Plotting Board "to" wording * Polylines to line (More natural expressions in Japanese) * Edit map and marker words fix some wrong description * zeus mine * marker flag * fcs ajust wording * paint spray to spray paint * Weapon display name improves change "hex" katakana to kanji ヘックス>六角形 vanilla used kanji Add camo to camo names using what camo (camo > ldf camo) Nightforce NXS and M200 now using same name for jungle/tropic camo description. * NVG Wrong GEN and missing WP * Match NVG name to Arma3 default
* KoreanTranslation Someone has returned all the translations in Korean to English. there is no need to return them. * koreantranslation * Korean Typo Fix * Korean Translation * Update stringtable.xml * Korean Translation Added Added Korean translation related to Cargo Refuel * Merge branch 'master' of https://github.com/Psycool3695/ACE3 * Korean translation Add/Updated * Fixed wrong strings * Korean translation improved * Korean translation updated * Korean translation updated * Fix Merge * Update stringtable.xml * Update stringtable.xml * Korean translation updated * Korean translation minor fix * Korean translation fixed * Korean translation updated * Update stringtable.xml * Spacing fixed * Korean translation updated * Spacing fixed --------- Co-authored-by: PabstMirror <[email protected]>
nvg 4th typo 3rd hotfix 4th gen nvg shows 3rd gen nvg at japanese
* add doc on medical facilities and vehicles * fix typo Co-authored-by: johnb432 <[email protected]> * Update docs/wiki/framework/medical-treatment-framework.md Co-authored-by: johnb432 <[email protected]> --------- Co-authored-by: johnb432 <[email protected]>
Co-authored-by: johnb432 <[email protected]>
Co-authored-by: Salluci <[email protected]> Co-authored-by: johnb432 <[email protected]>
Co-authored-by: johnb432 <[email protected]>
* add JIP support to status effects * fix TRACE * typo
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.