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

447 Commits

Author SHA1 Message Date
Steffen 78c16fe201
Merge pull request #114 from eddgabriel/main 
Legion!
 2021-02-05 13:19:28 +01:00
eddgabriel 18a594ea5b Legion! 2021-02-04 22:10:32 +00:00
Steffen 484f9f0e63 fixed fabled roles breaking night order modal (fixes #112) 2021-02-04 12:11:40 +01:00
Steffen 142968bf8a
Merge pull request #109 from bra1n/network-refactoring 
Network refactoring
 2021-02-02 10:32:43 +01:00
Steffen 43070ae1d3
Merge pull request #108 from davotronic5000/#94_parse_link_when_joining 
#94 parse link when joining
 2021-01-30 18:00:51 +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
Steffen 4d33e7dda9 optimized ping and gamestate messages 2021-01-29 21:54:27 +01:00
Dave 724a218b6f simplified the regex on joining a session to only look for anything starting with http(s):// and parseing out the code. 2021-01-29 14:55:19 +00:00
Dave fafbb3c23f 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-01-27 23:22:56 +00:00
Dave 7c3908f1fa
Merge pull request #4 from bra1n/main 
merge upstream
 2021-01-27 22:14:41 +00:00
Steffen ea0e6d2d72 ping changed to direct message 2021-01-27 22:05:32 +01:00
Steffen 7b301ffa73 2.6.0 2021-01-27 22:04:49 +01:00
Steffen 8aa6f6b7f8 highlight dead players on night order sheet (closes #106) 2021-01-27 21:40:36 +01:00
Steffen a03fd30bf5
Merge pull request #105 from davotronic5000/#90_hotkey_night_mode 
#90 hotkey night mode
 2021-01-27 20:34:11 +01:00
Dave 1670011a95 removing sun from font awesome import as it is no longer being used anywhere, 2021-01-27 17:27:36 +00:00
Dave fbbe1d2013
Merge pull request #3 from bra1n/main 
updating from upstream
 2021-01-25 22:20:49 +00:00
Dave 2515dcc328 changing menu item for toggle night mode to list the new hotkey for user reference 2021-01-25 20:30:17 +00:00
Dave c573908a50 adding case to hotkeys switch statement for "s" to switch between day and night mode 2021-01-25 20:29:20 +00:00
Steffen 58246a2352 2.5.0 2021-01-25 21:01:47 +01:00
Steffen c33e5ddf6d night order shows player names near roles now (closes #102) 2021-01-25 21:01:33 +01:00
Dave 87c9735b4a
Merge pull request #2 from bra1n/main 
Merge from bra1n/townsquare main
 2021-01-25 19:39:34 +00:00
Steffen 679927bc27
Merge pull request #91 from davotronic5000/#52_other_edition_travelers 
#52 other edition travelers
 2021-01-25 20:11:29 +01:00
Dave c034647e9d removing other travelers button group for spectators/live session players as they cannot assign travelers anyway 2021-01-25 17:20:18 +00:00
Dave bddd1f94bd fixing bug where a script that includes all travellers leaves the other travellers tab empty, the tabs now check if there is any other travelers before displaying the tabs. 2021-01-25 16:09:53 +00:00
Dave db8f23a572 fixing comment for clarity 2021-01-25 15:53:35 +00:00
Dave df12930762 moving the isBluffs() logic to be inline in the template, as it is simple enough and has not needed repeating. 2021-01-25 15:51:24 +00:00
Dave bee0eba732 moving otherTravelers in the role modal from a computed function to spreading in mapstate for clarity and code style matching 2021-01-25 15:48:46 +00:00
Dave a95b3065bd renaming extraTravelers to otherTravelers for consistancy accross the app 2021-01-25 14:49:37 +00:00
Dave 64f5621d7c renaming travellers to travelers for consistancy with existing code. 2021-01-25 14:46:37 +00:00
Dave 0ef34ca3a1 moving button group to the bototm of the modal, as it is not priority information, swapped out the active CSS for the existing .townsfolt class took the button group out of the UL and surounded in a div. 2021-01-25 14:42:27 +00:00
Dave 8006ecb55c removine unneeded parens for clarity 2021-01-25 14:36:37 +00:00
Dave 468e45475a removing code to display global reminders for out of script travelers as the travelers should not have global reminders anyway. 2021-01-25 14:35:03 +00:00
Steffen 64d48167c7 amnesiac post-processing 2021-01-24 22:34:38 +01:00
Steffen e3a0796b0d
Merge pull request #100 from JulGvoz/main 
Update Amnesiac icon
 2021-01-24 22:31:34 +01:00
Jul Gvoz fd84e6ef07 Merge remote-tracking branch 'upstream/main' into main 2021-01-23 11:03:06 +02:00
Jul Gvoz dd21825412 Update Amnesiac icon 2021-01-23 10:59:26 +02:00
Steffen ab1710487f 2.4.0 2021-01-22 22:06:57 +01:00
Steffen 7a70586db4 changelog 2021-01-22 22:06:51 +01:00
Steffen 83726b1435 fix setting player roles to one that is not on the current script (fixes #95) 2021-01-22 22:05:16 +01:00
Steffen 0e7730b2e9 updated pixie icon 2021-01-22 22:04:56 +01:00
Steffen c009005290
Merge pull request #98 from eddgabriel/main 
Pixie!
 2021-01-22 20:59:16 +01:00
eddgabriel dff1ba4f6c Pixie! 2021-01-21 22:58:59 +00:00
Dave 3fc1c3c1a5 fixing bug where reminder tokens were not being displayed correctly for out of script travellers. 2021-01-17 21:01:32 +00:00
Dave 59105beb78 Fixing bug stopping player with index 0 from being assigned an out of script traveller. 2021-01-17 20:17:19 +00:00
Dave 04993633fd updating custom edition loading to update the list of travelers not in the current edition 2021-01-15 16:33:33 +00:00
Dave 151ea616da Merge branch 'main' of https://github.com/davotronic5000/townsquare into #52_other_edition_travelers 2021-01-15 14:08:35 +00:00
Dave d70007764d
Merge pull request #1 from bra1n/main 
updated lycanthrope icon
 2021-01-15 14:07:18 +00:00
AWConant b7262fbae3 updated lycanthrope icon 2021-01-10 11:12:00 +01:00
Dave ce6b66a33e making roles modal reset selected tab on close, stops traveller tab from showing on bluff selection and a better user experience 2021-01-09 21:23:24 +00:00
Dave 5a72390ac9 Merge branch 'main' of https://github.com/bra1n/townsquare into #52_other_edition_travelers 2021-01-09 20:45:15 +00:00