diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 3d1655b..75e9d23 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -4,6 +4,7 @@ on: types: [assigned, opened, synchronize, reopened, labeled, unlabeled] branches: - main + - develop jobs: build: name: Check Actions diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2837f65..3b4c242 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [ main, develop ] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [ main, develop ] schedule: - cron: '27 22 * * 1' diff --git a/CHANGELOG.md b/CHANGELOG.md index b4aadfd..fa540df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ - fix players being moved or removed during nomination - add vue linter +- use "Exile" rather than "Banishment" for exiles +- added global animation toggle for better performance +- added record vote history toggle to session menu, and clear vote history button +- add support for custom Fabled characters + +--- ### Version 2.12.0 - tweak reference sheet to better fit screen in single column layout diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95796e5..badc122 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,6 +19,9 @@ Before submitting your contribution, please make sure to take a moment and read - The `main` branch is what is currently deployed to the website. All development should be done in dedicated branches. +- The `develop` branch contains the changes that will be deployed to main next. In order to prepare a release, development + branches should have their Pull Request against `develop` and only releases should be merged from `develop` into `main`. + - Work in the `src` folder and **DO NOT** checkin `dist` in the commits. - It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging. @@ -30,6 +33,9 @@ Before submitting your contribution, please make sure to take a moment and read - If fixing a bug: - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`. - Provide a detailed description of the bug in the PR. Live demo preferred. + +- You'll need to update the `CHANGELOG.md` with a description of your changes before you open a pull request and your code + should pass the lint check. ## Development Setup diff --git a/README.md b/README.md index f4587c4..e67ae5b 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,8 @@ For base game characters, it is sufficient to only provide the ID, similar to wh - **remindersGlobal**: global reminder tokens that will always be available, no matter if the character is assigned to a player or not - **setup**: whether this token affects setup (orange leaf), like the Drunk or Baron - **name**: the displayed name of this character -- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon` or `traveler` +- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon`, `traveler` or `fabled`
+ _Note_: if you create a custom Fabled character, it will be automatically added to the game when the custom script is loaded - **ability**: the displayed ability text of the character ## [Code of Conduct](CODE_OF_CONDUCT.md) diff --git a/package-lock.json b/package-lock.json index 54d0f5f..2994b10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "townsquare", - "version": "2.12.0", + "version": "2.13.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.12.0", + "version": "2.13.0", "license": "GPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.32", diff --git a/package.json b/package.json index 33f32e4..8db8fbc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "townsquare", - "version": "2.12.0", + "version": "2.13.0", "description": "Blood on the Clocktower Town Square", "author": "Steffen Baumgart", "scripts": { diff --git a/src/App.vue b/src/App.vue index bb5bc65..6107e30 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,10 @@ id="app" @keyup="keyup" tabindex="-1" - :class="{ night: grimoire.isNight }" + :class="{ + night: grimoire.isNight, + static: grimoire.isStatic + }" :style="{ backgroundImage: grimoire.background ? `url('${grimoire.background}')` @@ -110,7 +113,7 @@ export default { this.$store.commit("toggleModal", "roles"); break; case "v": - if (this.session.voteHistory.length) { + if (this.session.voteHistory.length || !this.session.isSpectator) { this.$store.commit("toggleModal", "voteHistory"); } break; @@ -202,6 +205,14 @@ ul { align-items: center; align-content: center; justify-content: center; + + // disable all animations + &.static *, + &.static *:after, + &.static *:before { + transition: none !important; + animation: none !important; + } } #version { diff --git a/src/assets/icons/fabled.png b/src/assets/icons/fabled.png new file mode 100644 index 0000000..cf11af2 Binary files /dev/null and b/src/assets/icons/fabled.png differ diff --git a/src/components/Menu.vue b/src/components/Menu.vue index f0016bf..ba25972 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -60,13 +60,14 @@
  • Night order - + + /> +
  • Zoom @@ -82,6 +83,10 @@ />
  • +
  • + Background image + +
  • Show Custom Images
  • -
  • - Background image - +
  • + Disable Animations +
  • Mute Sounds @@ -131,10 +139,10 @@
  • - Nomination history[V] + Vote history[V]
  • Leave Session @@ -338,6 +346,7 @@ export default { "toggleMuted", "toggleNight", "toggleNightOrder", + "toggleStatic", "setZoom", "toggleModal" ]) diff --git a/src/components/modals/Modal.vue b/src/components/modals/Modal.vue index fe08b13..d1bd5e6 100644 --- a/src/components/modals/Modal.vue +++ b/src/components/modals/Modal.vue @@ -115,6 +115,7 @@ export default { .maximized { background: rgba(0, 0, 0, 0.95); padding: 0; + border-radius: 0; height: 100%; width: 100%; max-width: 100%; diff --git a/src/components/modals/VoteHistoryModal.vue b/src/components/modals/VoteHistoryModal.vue index 95eeaa8..882da50 100644 --- a/src/components/modals/VoteHistoryModal.vue +++ b/src/components/modals/VoteHistoryModal.vue @@ -1,17 +1,36 @@