Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolving 1.8.x branch merge conflicts (#388)
* feat: Add linting packages and config * chore: Get ready for Prettier * chore: Get eslint --fix ready to roll; add eslint globals * fix: Explicitly support array-flat and array-includes * fix: Don't fix linting issues during the build step * feat: Add linting packages and config * chore: Get ready for Prettier * chore: Get eslint --fix ready to roll; add eslint globals * fix: Explicitly support array-flat and array-includes * fix: Don't fix linting issues during the build step * fix: async restores treasure result text (#272) * fix: async restores treasure result text * fix: avoid race conditions with flag "async:false" * fix: Monster Data Model bugfixes (#279) * fix: On dropping item onto actor, check for existence before checking for anything related to containers * fix: Remove pre-container-data-model code for handling containers on monsters * fix: Programmers and linguists agree: Why Plurals? * fix: don't reroll on round 1 if already rolled (#280) * Create CNAME * docs: add Haxxer as a contributor for code (#281) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * fix(temporary): removed caching from the build ci * fix: AC/AAC display fix + party overview fix (#286) * fix: Add missing usesAscendingAC key * fix: Update deprecated code * fix: use game.system.id instead of OSE.systemName when getting party members * fix: `lint:js` script now lints the correct folder * fix: == to === * chore: Disable some less useful linting rules * chore: Add file summary to ose.scss.js * chore: Fix ose.js per linting rules * feat: Get prettier set up to sort imports * chore: Use prettier-eslint to sort imports * fix: Macro for same item name now creates (#314) * fix: async restores treasure result text (#272) * fix: async restores treasure result text * fix: avoid race conditions with flag "async:false" * fix: Monster Data Model bugfixes (#279) * fix: On dropping item onto actor, check for existence before checking for anything related to containers * fix: Remove pre-container-data-model code for handling containers on monsters * fix: Programmers and linguists agree: Why Plurals? * fix: don't reroll on round 1 if already rolled (#280) * Create CNAME * docs: add Haxxer as a contributor for code (#281) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * fix(temporary): removed caching from the build ci * fix: AC/AAC display fix + party overview fix (#286) * fix: Add missing usesAscendingAC key * fix: Update deprecated code * fix: use game.system.id instead of OSE.systemName when getting party members * fix: Additional v1.7.x fixes (#289) * fix: Character generator now properly sets scores * fix: Items should once again properly display their descriptions. * fix: Treasure items should be created under the Treasure inventory heading * fix: Item and armor descriptions should target the correct fields * fix: replaced broken chart with "translated" badge * chore: update README to where people can find the Discord invite * feat: add Catalan and Chinese support to manifest * Updates to Item Piles system integration (#292) * Updates to system integration * Added unstackable item types * [enhancement] Added option to revert Ctrl/Meta behavior (#294) * [enhancement] Added option to revert Ctrl/Meta behavior * Extracted skipDialogCheck to method * Removed comment about monster testing. * Moved skipRollDialogcheck to helper collection * cleanup Co-authored-by: bakbakbakbakbak <[email protected]> * docs: add bakbakbakbakbak as a contributor for code (#302) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add adn770 as a contributor for translation (#303) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * [enhancement] Container delete confirmation (#299) * [enhancement] Added confirmation when deleting containers containing items * [fix] Container now pushes out containing items. * Changed to Dialog.confirm * Cleanup * cleanup * Allow first item check condition to allow no item Co-authored-by: bakbakbakbakbak <[email protected]> * fix: shopping cart now deducts gold * Remove confusing monster options (#308) Co-authored-by: bakbakbakbakbak <[email protected]> * [fix] Correctly creating link anchors in TextEditor & dragging items to hotbar (#304) * [fix] Use item.getDragData to fix bad link * [fix] Macro creation when dragging item from actor * Fixed macro warning for non-actor items * Tests for item macros * Cleanup * Unlinked token macro fix * Fixed typo in en.json * Fixed bug on row 67 * Non-destructive macro removal * Macro logic * Cleanup Co-authored-by: bakbakbakbakbak <[email protected]> * fix: Macro for same item name now creates Co-authored-by: Anthony Ronda <[email protected]> Co-authored-by: Tim <[email protected]> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Adam Oresten <[email protected]> Co-authored-by: bakbakbakbakbak <[email protected]> * chore: eslint-prettier automatic fixes * chore: Ignore unused expressions when writing tests * chore: Oh no * chore: Autofix rebased changes * chore: Requested PR fixes * chore: Remove unnecessary eslint disables * chore: Combine two ESlint disables into one * chore(tests): helpers, actor, dialog, item, party * chore: renaming helpers & imports * fix: exporting functions for test for treasure * fix(test): missing method import * chore(test): make sure token vision * Cleanup & comment fix * fix: entity-tweaks-tests * fix: Config tag_images not returning properly * fix(macro): Allow macro to be dragged to hotbar * fix(party): Fix recursive folder adding for 1.8.x (#346) * fix(party): Fix recursive folder adding * fix: Actor, not Folder --------- Co-authored-by: bakbakbakbakbak <[email protected]> * fix(item): Make spendSpell async for 1.8.x (#352) * fix(item): Make spendSpell async * cleanup & lint --------- Co-authored-by: bakbakbakbakbak <[email protected]> * fix(dice): Dice rolling fixes for 1.8.x (#345) * fix: dice rolling fixes * chore(test): dice rolling * chore(test): sendAttackRoll cleanup * chore(desc): Added description to attackIsSuccess * Added descriptions to helpers-dice.js * chore(test): Added tests for issue #340 * chore(desc): Better test descriptions for #340 * cleanup * fix(dice): Always allow hit when untargeted, #333 * cleanup --------- Co-authored-by: bakbakbakbakbak <[email protected]> * fix(treasure): Make drawTreasure asynchronous * fix: making percent call synchronous * chore(utils): testUtils tweaks * chore(test): Actor testing up to sheet * chore(lint): Test linting & remova assert(false) * chore(structure): Better naming of test suite * chore(structure): Fixed remaining test names * fix(test): revert closeSheets to standard delay * fix(test): renamed cleanUpActorsKey * chore(lint): spacing and linting to dice tests * chore(lint): sheet linewidth linting * fix: defined type for key in cleanUpActorsByKey * fix(tweaks): Added class to entity tweaks * fix: wyrmisis comments * Symlinker now supports array of dataPaths (#360) * fix(symlink): support path array * fix(symlink): capitalization & typedef * fix: Array for right term --------- Co-authored-by: bakbakbakbakbak <[email protected]> * chore: data migration to default img (#325) * chore: data migration to default img * fix: checking for empty instead of undef --------- Co-authored-by: bakbakbakbakbak <[email protected]> * fix(item): Dragging a container onto itself pops it from inventory sheet (#359) * fix(actor-sheet): use item in _removeItemFromActor * fix(actor-sheet): dropping items on container * chore(test): Issue #357 tests * fix(container): Container drop onto itself #357 * chore: Updated comment --------- Co-authored-by: bakbakbakbakbak <[email protected]> * fix: isNew() tests now check against saves (#386) * feat: added itemId tag to spell card for AA compat * fix: the isNew tests now check against saves * fix: undo ItemIds commit * feat: added itemId tag to spell card for AA compat * fix: resolve conflicts mistakes part 1 * fix: character creation autoroll no longer broken * fix: actor's language delete button * fix: additional "data" to "system" fixes --------- Co-authored-by: wyrmisis <[email protected]> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: bakbakbakbakbak <[email protected]> Co-authored-by: Adam Oresten <[email protected]> Co-authored-by: bakbakbakbakbak <[email protected]>
- Loading branch information
6 people
authored
Apr 7, 2023
1 parent
a7bd972
commit 8022336