martyn
/
townsquare
mirror of https://github.com/bra1n/townsquare.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
766 Commits 3 Branches 36 Tags 66 MiB
Commit Graph

498 Commits

Author SHA1 Message Date
Steffen c5d8d2beaa
Merge branch 'develop' into main 2021-05-09 22:00:50 +02:00
Steffen d50a90de21
Merge branch 'develop' into animation_toggle 2021-05-09 21:59:59 +02:00
Steffen c6209a2510
Merge branch 'develop' into main 2021-05-09 21:58:31 +02:00
Steffen 9eb9f44e32
Merge pull request #147 from bra1n/fabled 
Custom Fabled
 2021-05-09 21:57:46 +02:00
Steffen beeb7b96f5
feedback implemented 
npm audit
 2021-05-08 22:28:05 +02:00
nicfreeman1209 4d2afadc01 requested change 
record marked player id in session
 2021-05-08 11:01:23 +01:00
Steffen 37b61d90ef
it's working! 2021-05-06 21:59:12 +02:00
Steffen 0f71e49898
let's try adding a lint error 2021-05-06 21:50:57 +02:00
Steffen 71234f3ef9
fix players being moved or removed during a nomination (closes #164) 
add vue linter
 2021-05-06 21:48:41 +02:00
nicfreeman1209 05023583da
requested change 
Co-authored-by: Steffen <steffen@baumgart.biz>
 2021-05-06 10:35:08 +01:00
nicfreeman1209 19ad2adc17 requested changes 2021-05-05 20:06:23 +01:00
nicfreeman1209 205bd0ba79 on block -> marked 2021-05-05 15:20:37 +01:00
nicfreeman1209 5aba663403 minor fix to previous 2021-05-05 15:08:49 +01:00
nicfreeman1209 8dacfea0cb move block/night logic from socket to menu 2021-05-05 11:54:48 +01:00
nicfreeman1209 946bafec5b player menu order 2021-05-05 11:21:31 +01:00
nicfreeman1209 335c2dd211 remove direct ST control of block 2021-05-05 08:20:38 +01:00
nicfreeman1209 b9b9e59b53 requested changes 2021-05-05 07:58:13 +01:00
Andrew Conant 81c449e149
Use proper "Exile" terminology for exile 2021-05-04 20:14:48 -07:00
nicfreeman1209 00e1446e64 minor 2021-05-04 23:18:25 +01:00
nicfreeman1209 4067f45ee2 lint 2021-05-04 22:01:20 +01:00
nicfreeman1209 e762e89485 nlc: toggle within session.js 2021-05-03 17:55:11 +01:00
nicfreeman1209 14de625811 avoid clashing with seat icon 2021-05-03 17:22:47 +01:00
nicfreeman1209 f0619bdaeb empty block at night 2021-05-03 16:53:46 +01:00
nicfreeman1209 5edc476b08 ST always sees vote history 
i.e. toggle affects only players
 2021-05-03 14:32:58 +01:00
nicfreeman1209 c39aef622e hide rounded corners on maximized modals 
(barely visible anyway)
 2021-05-03 13:33:51 +01:00
eddgabriel 73ce0058c2 It's Paradise! 2021-05-03 05:41:41 +01:00
nicfreeman1209 943d228e98 add 'on the block' indicator 
- after vote, ST chooses to put onto block / empty block / no change to block
- player menu has add / remove from block
- players are automatically removed from the block when (i) they die (ii) another player is put onto block
- fixed crash on add/remove/etc player mid vote
 2021-05-02 22:52:20 +01:00
Steffen ef28198679 linter 2021-05-01 22:54:55 +02:00
Steffen a99d996419 disable all animations now 2021-05-01 22:46:12 +02:00
Steffen fe0f0bfbf1
Merge pull request #157 from wisq/main 
Add option to reduce night animations to save power.
 2021-05-01 21:26:54 +02:00
Steffen 8ce8f07d26 add fallback icon for fabled 2021-05-01 21:19:35 +02:00
eddgabriel 7a7b0fd323 King and Choirboy double bill! 2021-04-29 21:43:17 +01:00
Adrian Irving-Beer a66892c30d
Add option to reduce night animations to save power. 2021-04-28 18:36:28 -04:00
Steffen 82bd7f7fff
Add files via upload 2021-04-21 15:41:15 +02:00
nicfreeman1209 654a4d02cd remove accidental 2021-04-18 17:29:20 +01:00
nicfreeman1209 230507a67f socket part of toggle recordVoteHistory 
analogous to isNight
 2021-04-18 17:26:24 +01:00
nicfreeman1209 6d3c32675b
Merge pull request #4 from bra1n/main 
update local repo
 2021-04-18 15:23:11 +01:00
nicfreeman1209 a2fb33eafe add recordVoteHistory & clearVoteHistory to session menu 2021-04-18 15:19:59 +01:00
eddgabriel fb0f7a7304 Marionette 2021-04-15 21:56:40 +01:00
Steffen 0d41e9fd46
show custom fabled first 2021-04-15 21:06:53 +02:00
Steffen a7852115fe
add support for custom fabled (closes #110) 2021-04-15 21:05:00 +02:00
Steffen 1dae16f924
add warning icon for setup roles in character assignment modal 2021-04-09 21:33:52 +02:00
Steffen d4e144f0f0
Merge pull request #144 from nicfreeman1209/main 
make reference sheet fit to screen in single col mode
 2021-04-02 20:57:10 +02:00
nicfreeman1209 3c849942fe apply only when maximized 2021-04-01 22:37:48 +01:00
eddgabriel 1dc837d12a I don't believe you... 2021-04-01 22:01:44 +01:00
nicfreeman1209 2493d3353a make reference sheet fit to screen in single col mode 2021-04-01 09:31:37 +01:00
Steffen a0a2760939
Merge pull request #142 from bra1n/updated-reference-sheets 
Updated reference sheets
 2021-03-30 21:37:55 +02:00
Steffen 5171996b39
bugfixes and improved session joining 2021-03-30 21:34:09 +02:00
Steffen 4620332fff
reference sheet finished 2021-03-30 21:33:52 +02:00
Steffen 52aff7b544
Update fabled.json 2021-03-29 09:17:13 +02:00
Steffen b4ee856705
updated character reference sheet visuals 2021-03-28 21:56:58 +02:00
eddgabriel ca475f3af2 Correct MINION/DEMON 
Correct MINION/DEMON info locations in night order
 2021-03-23 00:16:15 +00:00
Steffen da3a13518b
fix shifting player bug on delete (fixes #135) 2021-03-19 20:09:13 +01:00
Steffen 6a8f5608a1
Merge pull request #134 from bra1n/133_fix_race_condition_bug_setting_pronouns 
updated the send and update sockets methods for player pronouns to pa…
 2021-03-19 19:55:41 +01:00
Steffen fca2d386a9
Merge pull request #125 from langford/feature-visible-nom-log-indicator-button 
Adds indicator of a player-visible voting log
 2021-03-19 19:55:23 +01:00
eddgabriel 96eee80017 Opiates time! 2021-03-18 21:53:13 +00:00
Michael Langford 3cfc9939f9
Merge branch 'main' into feature-visible-nom-log-indicator-button 2021-03-18 15:49:04 -04:00
Michael Langford 13f0d82c34 Hides nomination log button when sessionId==0 
This commmit implements 2 stylistic suggestions
as well: a CSS class name change and removes seemingly
redundant spacing specification. Testing on chrome and safari
reveals neither caues a functional change.
 2021-03-17 11:16:38 -04:00
Michael Langford 9a232c835a
camel to kebab for nomlogSummary 
Adopts preferred CSS class format
 2021-03-17 10:50:53 -04:00
Dave dedf0be0b9 adding documentation comment to explain new isFromSockets property 2021-03-16 19:47:42 +00:00
Dave 8b4f09a2c4 correcting fromSockets property to be isFromSockets 2021-03-16 19:46:52 +00:00
Dave 6ad1df5a35 updated the send and update sockets methods for player pronouns to pass through a flag when the pronoun is updated from the sockets to stop the update being broadcast again and causing infinite loops of sockets messages being sent. This also simplifys from the previous loop prevention functionality. 2021-03-16 15:14:51 +00:00
Steffen a90ca50f7a
a big bunch of other bugfixes 2021-03-14 20:42:39 +01:00
Steffen f0c09cf497
fix (pre-)vote calculation being off by one if the nominee votes (fixes #131) 2021-03-14 20:41:56 +01:00
Steffen a849001068
remove player names from character reference / night order modal when town square is public (closes #119) 2021-03-14 20:29:36 +01:00
Dave 8ea11c8f9e Changing the clearRoles mutator to preserve the player pronouns when clearing all roles as a storyteller. 2021-03-13 09:59:44 +00:00
Michael Langford 40b60363c5 Adds indicator of a player visible voting log 
A new player can be suprised that this tool keeps a history of
nominations. This indicator shows a book with a skull on it
when there is a nomination log present in the session object
along with the count of nominations stored locally in the
session object.

This allows a new user to see that there is a voting log.

This allows groups that wish to only see a limited voting
log to remind the storyteller to clear the log if they see
that there is one.

If accepted, this would address #124 and the secondary
considerations metioned in #121.

This commit squashes away the previous textual version
 2021-03-11 15:04:41 -05:00
Steffen 8ed78b722e
fix roles modal part 2 2021-03-11 19:47:36 +01:00
Steffen 61ebc02490
fix roles modal part 1 2021-03-11 19:47:10 +01:00
Steffen 2b2500a6c6
Merge pull request #107 from davotronic5000/#43_gender_pronouns 
#43 gender pronouns
 2021-03-09 15:26:30 +01:00
Steffen 2af643435e
Merge pull request #111 from nicfreeman1209/main 
maximize button for modals
 2021-03-09 15:26:17 +01:00
nicfreeman1209 7fade338ea fix scrolling to top when tall modal is maximized 2021-03-07 21:55:14 +00:00
Dave 9e249765de final styling changes, making pronouns icon always appear on the same side. 2021-03-06 09:34:18 +00:00
eddgabriel 1e9363826d Mephit! 2021-03-04 21:32:30 +00:00
nicfreeman1209 60dcd956e2 requested changes 2021-03-04 10:15:18 +00:00
Dave a4a44f9ba8 fixing bug stopping pronouns from being removed by checking for null specifically instead of just a falsey value. 2021-03-03 22:34:02 +00:00
Dave 4d2225c994 tweaking styles and adding pronouns icon to name bar if the player has pronouns set, made the name bar slighlty wider to allow for the same number of charachtersfor this and moved the player menu slightly to account for it. 2021-03-03 22:23:22 +00:00
Dave 992841a45b cleaning up methods added for sending and receiveing changed pronouns in sockets.js 2021-03-02 19:16:46 +00:00
Dave 77e89f290b changed out transgender symbol for the hopefully more suitable venus-mars icon 2021-03-02 19:03:36 +00:00
Dave f6ca08d6d5 reworked CSS for pronoun tooltip and a little bit of player name to fix text overflow. Also moved the text content in to span tags for styling. 2021-03-02 18:50:18 +00:00
Dave 2590f00ea9 removing preferred, to mkae it just Player Pronouns 2021-03-01 14:55:05 +00:00
Dave 2a028bb7cd stop pronouns being set to null when cacelling prompt 2021-03-01 14:53:32 +00:00
eddgabriel 9594f96b7b Correct LM reminder and travellers night order 2021-03-01 09:51:59 +00:00
Steffen 577ab676a9
updated catfishing 2021-02-28 20:07:01 +01:00
Dave 6ad516588c updated sockets send and recieve logic for pronouns to allow ST to update players pronouns and block infinite loops between a seated player and ST updates 2021-02-28 16:08:31 +00:00
Dave 81af122458 making change pronoun option appear for story teller as well as seated player and updating flow control logic to allow story teller to change the pronouns for any player 2021-02-28 14:51:15 +00:00
Dave f670193fba added a max width and overflow hidden to the pronouns tooltip to stop it getting too long 2021-02-28 13:26:58 +00:00
Dave b9bd77789a correcting spelling of preferred on pronoun prompt 2021-02-28 13:19:34 +00:00
Dave ecb205e027 cleaning up vueX code to reuse existing player update methods, and add form flow logic to block infinite loops 2021-02-28 13:17:40 +00:00
Dave 58263e2f6d Fixing ordering of fontawesome import array to maintain alphabetical ordering 2021-02-28 11:46:54 +00:00
Dave 3f33e10564 cleaning up formatting and syntax style in player.vue CSS 2021-02-28 11:31:18 +00:00
Dave 769c891a67 correcting pronoun to pronouns in all occurances 2021-02-28 11:23:16 +00:00
Dave 0ffde84188 adding code doc comments to the sendPlayerPronoun method 2021-02-28 11:00:41 +00:00
Dave 2e930e6606 Merge branch 'main' of https://github.com/davotronic5000/townsquare into #43_gender_pronouns 2021-02-28 10:30:44 +00:00
eddgabriel 79ede0a73e Snitch! 2021-02-18 22:25:42 +00:00
Steffen fac108d12c fix missing role alert 2021-02-18 17:22:46 +01:00
nicfreeman1209 081bfbc695 align h/v center when maximized 2021-02-14 16:14:59 +00:00
nicfreeman1209 2db244b14b fix votehistory alignment 
when maximized
 2021-02-12 22:53:49 +00:00
nicfreeman1209 f463d5195b minor add. 2021-02-12 18:19:34 +00:00
nicfreeman1209 00680533a5 fit to screen nicely 2021-02-12 18:07:00 +00:00