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

714 Commits

Author SHA1 Message Date
Steffen 6b38a352ad
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	CHANGELOG.md
 2021-05-25 19:41:34 +02:00
Steffen 1afec12478
farmer 2021-05-25 19:41:08 +02:00
Steffen 1f4871b3b0
Merge branch 'main' into develop 
# Conflicts:
#	CHANGELOG.md
#	src/store/index.js
 2021-05-25 19:40:20 +02:00
Steffen 965001f065
Merge branch 'main' into develop 2021-05-25 12:06:13 +02:00
eddgabriel 5804f67cac
Farmer (#172) 
Farmer
 2021-05-20 23:54:49 +02:00
Steffen 300395de08
v2.13.0 (#168) 
* add support for custom fabled (closes #110)

* 2.13.0

* show custom fabled first

* add recordVoteHistory & clearVoteHistory to session menu

* Update CHANGELOG.md

* socket part of toggle recordVoteHistory

analogous to isNight

* remove accidental

* Add files via upload

* add custom fabled

* Add option to reduce night animations to save power.

* add fallback icon for fabled

* changelog

* disable all animations now

* linter

* 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

* hide rounded corners on maximized modals

(barely visible anyway)

* ST always sees vote history

i.e. toggle affects only players

* empty block at night

* avoid clashing with seat icon

* nlc: toggle within session.js

* lint

* minor

* Use proper "Exile" terminology for exile

* Add info about "Banishment"->"Exile" to CHANGELOG

* requested changes

* remove direct ST control of block

* player menu order

* move block/night logic from socket to menu

* minor fix to previous

* on block -> marked

* requested changes

* requested change

Co-authored-by: Steffen <steffen@baumgart.biz>

* fix players being moved or removed during a nomination (closes #164)
add vue linter

* let's try adding a lint error

* linter adjusted

* it's working!

* requested change

record marked player id in session

* feedback implemented
npm audit

* prepare develop branch

* adjust linter config

* revert version bump

* fixes & visuals

* Update CHANGELOG.md

* restore old lint command (fixes #170)

* minor fix default

* show jinxed interactions on character reference modal

* 2.13.0

* changelog

Co-authored-by: nicfreeman1209 <nicfreeman1209@gmail.com>
Co-authored-by: nicfreeman1209 <14160941+nicfreeman1209@users.noreply.github.com>
Co-authored-by: Adrian Irving-Beer <wisq@wisq.net>
Co-authored-by: Andrew Conant <emptierset@gmail.com>
 2021-05-15 20:07:54 +02:00
Steffen f45601b8a7 changelog 2021-05-14 22:17:21 +02:00
Steffen 04f0282fe1 2.13.0 2021-05-14 22:07:10 +02:00
Steffen 2d98f44d14
Merge pull request #171 from bra1n/jinxes 
show jinxed interactions on character reference modal
 2021-05-13 19:52:37 +02:00
Steffen af05bd19c8
Merge branch 'develop' into jinxes 2021-05-10 22:01:36 +02:00
Steffen d86ee3b7cf
show jinxed interactions on character reference modal 2021-05-10 21:58:16 +02:00
Steffen f718d8b24b
Merge pull request #160 from nicfreeman1209/on_block 
add 'on the block' indicator
 2021-05-10 21:16:42 +02:00
nicfreeman1209 5457a65de9 minor fix default 2021-05-10 19:34:02 +01:00
Steffen 184a77a039
restore old lint command (fixes #170) 2021-05-10 20:04:05 +02:00
nicfreeman1209 7fa763cd26 Update CHANGELOG.md 2021-05-09 22:23:10 +01:00
nicfreeman1209 dda94d75df fixes & visuals 2021-05-09 22:13:06 +01:00
nicfreeman1209 5937209b35
Merge branch 'develop' into on_block 2021-05-09 21:18:41 +01:00
Steffen b73de453a5
revert version bump 2021-05-09 22:09:46 +02:00
Steffen bdffdc6b9b
Merge pull request #165 from bra1n/164_fix_voting 
fix players being moved or removed during a nomination (closes #164)
 2021-05-09 22:04:05 +02:00
Steffen d62a39ca89
adjust linter config 2021-05-09 22:02:44 +02:00
Steffen ed8bcb6b30
Merge branch 'develop' into 164_fix_voting 2021-05-09 22:01:51 +02:00
Steffen ccb48f16fd
Merge pull request #163 from AWConant/main 
Use proper "Exile" terminology for exile
 2021-05-09 22:00:55 +02:00
Steffen c5d8d2beaa
Merge branch 'develop' into main 2021-05-09 22:00:50 +02:00
Steffen c868f0930a
Merge pull request #159 from bra1n/animation_toggle 
add global animation toggle
 2021-05-09 22:00:26 +02:00
Steffen d50a90de21
Merge branch 'develop' into animation_toggle 2021-05-09 21:59:59 +02:00
Steffen e911d07869
Merge pull request #152 from nicfreeman1209/main 
add ST toggle for recording nomination history
 2021-05-09 21:59:33 +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 8d4bf876a7
prepare develop branch 2021-05-09 21:43:51 +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 3c250eff86
linter adjusted 2021-05-06 21:54:38 +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 a71ed650b6
Add info about "Banishment"->"Exile" to CHANGELOG 2021-05-04 20:34:29 -07: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