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

464 Commits

Author SHA1 Message Date
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
nicfreeman1209 61be9aa8d0 more requested changes 2021-02-12 18:00:59 +00:00
Steffen 819534dab6 moved image opt-in to grimoire tab 2021-02-11 13:48:06 +01:00
nicfreeman1209 6d649a963a minor requested changes 2021-02-10 22:49:10 +00:00
nicfreeman1209 97ac46c1fb reference modal defaults to maximized 
others don't
 2021-02-10 19:55:45 +00:00
nicfreeman1209 a7cdbf34e3 whitespace: run lint -- --fix 2021-02-10 07:41:57 +00:00
nicfreeman1209 9a6d257679 remove debug print 2021-02-10 02:07:03 +00:00
nicfreeman1209 1abbea3cff add maximize button to modals 
status is remembered, per modal
 2021-02-10 02:04:02 +00:00
Steffen 8bd3c9b450 Merge branch 'main' into custom-images 
# Conflicts:
#	CHANGELOG.md
 2021-02-08 13:58:27 +01:00
Steffen 5c4811ba91 wrap up and changelog 2021-02-07 22:14:27 +01:00
Steffen 1c31de430a allow selecting multiple characters (closes #77) 2021-02-06 22:24:46 +01:00
Steffen 429bcb8cfc added firstNightReminder for demon/minion info on night order modal 2021-02-06 21:11:43 +01:00
Steffen b4311db090 added night order tooltips (closes #104) 2021-02-05 22:12:59 +01:00
Steffen ad7fddd6a5 added video background support (mp4/webm) 2021-02-05 22:12:59 +01:00
Steffen 126dda1733 added a slight shadow 2021-02-05 22:12:59 +01:00
eddgabriel 440ea569ff Legion! 2021-02-05 22:12:59 +01:00
Steffen 65c959e07f fixed fabled roles breaking night order modal (fixes #112) 2021-02-05 22:12:59 +01:00
Dave 6026a6e8e8 changed code to grab session id from pasted domain in join dialog to be a pop, to avoid errors if the hash string is not present 2021-02-05 22:12:59 +01:00
Dave aee12a23be simplified the regex on joining a session to only look for anything starting with http(s):// and parseing out the code. 2021-02-05 22:12:59 +01:00
Dave f60069caa9 adding a regex in to the join session method in Menu.vue, to check if a townsquare domain has been entered in to join dialog, if it finds one it will get the session id from the # query string instead of just taking the value directly from the dialog. 2021-02-05 22:12:59 +01:00
Steffen c3c753f5b3 added night order tooltips (closes #104) 2021-02-05 22:07:25 +01:00
Steffen 2eb228ec81 added video background support (mp4/webm) 2021-02-05 20:50:12 +01:00
Steffen 83e86874f0 added a slight shadow 2021-02-05 13:49:53 +01:00
eddgabriel 18a594ea5b Legion! 2021-02-04 22:10:32 +00:00
Steffen 317c5a1ff8 reduce custom role transport by replacing object keys with numerical indices 2021-02-04 21:55:04 +01:00
Steffen a5d6d593c8 show generic icons for custom roles and opt out players 2021-02-04 21:40:59 +01:00
Steffen 484f9f0e63 fixed fabled roles breaking night order modal (fixes #112) 2021-02-04 12:11:40 +01:00
nicfreeman1209 3020b2248c z-index: modals in front of menu 
+fix padding
 2021-02-03 23:50:19 +00:00
Steffen d409186ff1 re-enabled custom role support 2021-02-03 22:12:38 +01:00
Steffen 142968bf8a
Merge pull request #109 from bra1n/network-refactoring 
Network refactoring
 2021-02-02 10:32:43 +01:00
Steffen ec64584da5 added custom image opt in 2021-02-01 22:33:59 +01:00
Dave 7f0d60c272 changed code to grab session id from pasted domain in join dialog to be a pop, to avoid errors if the hash string is not present 2021-01-30 12:50:09 +00:00
nicfreeman1209 f60ed34ee3 Merge branch 'main' of https://github.com/nicfreeman1209/townsquare into main 2021-01-29 22:33:53 +00:00
nicfreeman1209 3126de390d maximize reference modal 
& darken background, slightly compactify

-> fits into half of a 1920x1080 screen
 2021-01-29 22:33:38 +00:00
Steffen 4d33e7dda9 optimized ping and gamestate messages 2021-01-29 21:54:27 +01:00