Commit Graph

105 Commits

Author SHA1 Message Date
marsteralex
fc408e0a65 default no un sets for basic 2022-09-20 17:58:06 -04:00
marsteralex
e88697b09b update json 2022-09-20 13:08:32 -04:00
marsteralex
b1ac37ea87 Merge branch 'main' of https://github.com/marsteralex/manifold 2022-09-20 12:48:57 -04:00
marsteralex
5f2bdf02bc cleanup let to const 2022-09-20 12:42:48 -04:00
marsteralex
44deaf7b0a
WIP: add artist category (#866)
* fix https

* add beasts

* Remove extra file

* Prettier-ify code

* Prettier-ify

* add basic land guesser

also added fetcher to filter all cards instead of only unique art

* default to original

makes basic better

* added set symbol to basics

added set symbol to the basics game mode. Changed name to "How Basic"

* cleanup

* changed some pixels

* only load set data if needed

* hacked fix for removing image from name

* removed check from original

* remove check from original

* sort names by set instead of by set symbol

* include battlebond

* update cards for categories

update for dominaria united

* added commander category

commander category

* update basic land art

* can use double feature

* removing racist cards upstream

this way we don't have to store the cards in the json

* remove generated cards from digital commanders

* fix counterspell setting default

* added difficulty rating

* updated padding

* add dfc support for commanders

* add artists

* use latest non-digital if possible

* change vsCode settings for python

* update with latest non-digital printing

* update artist list

* update algo to select k samples

* cleanup code

* equally weight artists

* weight everything equally

* updated for all artists

* update artists

* add allowlist

* update artists to min 50 art

* allow promo to be replaced

* update jsons

* update with min 100 arts

* update code to be smaller jsons

* updated to 18 artists per game

* update ui

* update importing artists

* update to 21

* move num artists to top of js file

* update artistList to not include artist sigs

* update to 50 artists

* update for ub

* update artist list

* update ub defaults

* update jsons

* allow non-english cards to be replaced

* update allowlist

* update jsons

* add watermark

* update jsons

* update jsons

* make jsons slightly smaller

* add checkmarks and x's

* remove python

* add no answer and checkbox and x

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
2022-09-19 18:10:14 -07:00
marsteralex
7ea5d4d46b add no answer and checkbox and x 2022-09-19 10:19:08 +02:00
marsteralex
9d6353be79 add checkmarks and x's 2022-09-19 01:58:44 +02:00
marsteralex
21c8e23756 make jsons slightly smaller 2022-09-19 01:32:11 +02:00
marsteralex
0debf4b21a
Merge branch 'manifoldmarkets:main' into main 2022-09-16 17:20:52 -07:00
marsteralex
b4edcb7309 update jsons 2022-09-17 02:20:26 +02:00
Phil
833ec518b4
Twitch prerelease (#882)
* Bot linking button functional.

* Implemented initial prototype of new Twitch signup page.

* Removed old Twitch signup page.

* Moved new Twitch page to correct URL.

* Twitch account linking functional.

* Fixed charity link.

* Changed to point to live bot server.

* Slightly improve spacing and alignment on Twitch page

* Tidy up, handle some errors when talking to bot

* Seriously do the thing where Twitch link is hidden by default

Co-authored-by: Marshall Polaris <marshall@pol.rs>
2022-09-16 00:22:13 -07:00
marsteralex
37d899a15f update jsons 2022-09-16 08:44:11 +02:00
marsteralex
b84e6100fb add watermark 2022-09-16 08:09:19 +02:00
marsteralex
d690824ce5 update jsons 2022-09-16 06:50:58 +02:00
marsteralex
dec29348ac update allowlist 2022-09-16 06:44:32 +02:00
marsteralex
1a039f22dd allow non-english cards to be replaced 2022-09-16 06:36:42 +02:00
marsteralex
9be01b940f update jsons 2022-09-16 06:32:03 +02:00
marsteralex
5f031f68c0 update ub defaults 2022-09-16 05:48:44 +02:00
marsteralex
1c2ab715ae update artist list 2022-09-16 05:47:50 +02:00
marsteralex
955536f758 update for ub 2022-09-16 05:28:56 +02:00
marsteralex
351ad9b32e update to 50 artists 2022-09-16 04:01:00 +02:00
marsteralex
3f266dac86 update artistList to not include artist sigs 2022-09-16 01:35:50 +02:00
marsteralex
59d6a8d977 move num artists to top of js file 2022-09-16 00:52:02 +02:00
marsteralex
932003bff3
Merge branch 'manifoldmarkets:main' into main 2022-09-15 15:45:01 -07:00
marsteralex
475c3c0909 update to 21 2022-09-16 00:44:29 +02:00
mantikoros
a2d61a1daa
Twitch integration (#815)
* twitch account linking; profile page twitch panel; twitch landing page

* fix import

* twitch logo

* save twitch credentials cloud function

* use user id instead of bot id, add manifold api endpoint

* properly add function to index

* Added support for new redirect Twitch auth.

* Added clean error handling in case of Twitch link fail.

* remove simulator

* Removed legacy non-redirect Twitch auth code. Added "add bot to channel" button in user profile and relevant data to user type.

* Removed unnecessary imports.

* Fixed line endings.

* Allow users to modify private user twitchInfo firestore object

* Local dev on savetwitchcredentials function

Co-authored-by: Phil <phil.bladen@gmail.com>
Co-authored-by: Marshall Polaris <marshall@pol.rs>
2022-09-14 01:52:31 -07:00
marsteralex
bf8ac2f21e update importing artists 2022-09-14 01:31:47 +02:00
marsteralex
5bfb624907 update ui 2022-09-13 15:36:27 +02:00
marsteralex
68bdadde37 updated to 18 artists per game 2022-09-13 14:04:36 +02:00
marsteralex
37da650aca update code to be smaller jsons 2022-09-13 05:25:18 +02:00
marsteralex
bbb915fe05 update with min 100 arts 2022-09-12 06:43:53 +02:00
marsteralex
86120ef1ec update jsons 2022-09-12 06:09:06 +02:00
marsteralex
afe6f47eb4 allow promo to be replaced 2022-09-12 06:07:18 +02:00
marsteralex
816d142b38 update artists to min 50 art 2022-09-12 05:37:42 +02:00
marsteralex
6e4357ea9a add allowlist 2022-09-12 05:31:49 +02:00
marsteralex
1890a1cb8a update artists 2022-09-12 05:07:45 +02:00
marsteralex
1b54503393 updated for all artists 2022-09-12 02:52:17 +02:00
marsteralex
db0567b04e weight everything equally 2022-09-11 15:22:47 +02:00
marsteralex
8c18c7a475 equally weight artists 2022-09-11 15:05:51 +02:00
marsteralex
9046b2ad43 cleanup code 2022-09-11 14:46:51 +02:00
marsteralex
8706ddf733 update algo to select k samples 2022-09-11 14:42:49 +02:00
marsteralex
bf69800cdc update artist list 2022-09-10 03:00:21 +02:00
marsteralex
c3bc96a0a3 update with latest non-digital printing 2022-09-10 01:26:46 +02:00
marsteralex
fed6380af6 change vsCode settings for python 2022-09-10 00:54:14 +02:00
marsteralex
c408c55086 use latest non-digital if possible 2022-09-10 00:36:12 +02:00
marsteralex
c30a2b05c2 add artists 2022-09-10 00:09:30 +02:00
marsteralex
1ae0f0e273
add dfc support to commanders (#865)
* fix https

* add beasts

* Remove extra file

* Prettier-ify code

* Prettier-ify

* add basic land guesser

also added fetcher to filter all cards instead of only unique art

* default to original

makes basic better

* added set symbol to basics

added set symbol to the basics game mode. Changed name to "How Basic"

* cleanup

* changed some pixels

* only load set data if needed

* hacked fix for removing image from name

* removed check from original

* remove check from original

* sort names by set instead of by set symbol

* include battlebond

* update cards for categories

update for dominaria united

* added commander category

commander category

* update basic land art

* can use double feature

* removing racist cards upstream

this way we don't have to store the cards in the json

* remove generated cards from digital commanders

* fix counterspell setting default

* added difficulty rating

* updated padding

* add dfc support for commanders

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
2022-09-09 13:54:54 -07:00
marsteralex
bbc4551eec add dfc support for commanders 2022-09-09 22:25:04 +02:00
marsteralex
aa5876fe0d
added difficulty rating (#864)
* fix https

* add beasts

* Remove extra file

* Prettier-ify code

* Prettier-ify

* add basic land guesser

also added fetcher to filter all cards instead of only unique art

* default to original

makes basic better

* added set symbol to basics

added set symbol to the basics game mode. Changed name to "How Basic"

* cleanup

* changed some pixels

* only load set data if needed

* hacked fix for removing image from name

* removed check from original

* remove check from original

* sort names by set instead of by set symbol

* include battlebond

* update cards for categories

update for dominaria united

* added commander category

commander category

* update basic land art

* can use double feature

* removing racist cards upstream

this way we don't have to store the cards in the json

* remove generated cards from digital commanders

* fix counterspell setting default

* added difficulty rating

* updated padding

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
2022-09-09 09:51:20 -07:00
marsteralex
3a2fea57b9 updated padding 2022-09-09 13:37:01 +02:00