Commit Graph

128 Commits

Author SHA1 Message Date
marsteralex
c64d839447 update to dig 2022-10-13 22:24:08 -04:00
marsteralex
b85dbba895
Merge branch 'manifoldmarkets:main' into main 2022-10-13 18:02:33 -07:00
marsteralex
2c6253dc64 fixed watermark 2022-10-13 20:51:46 -04:00
marsteralex
9b11133133 remove creature from artifact 2022-10-13 20:35:14 -04:00
marsteralex
d57c78cc0b add artifacts 2022-10-13 20:22:31 -04:00
ingawei
5ba4a9dce7
Inga/tip button (#1043)
* added tip jar
* made market actions/comments and manalink buttons IconButtons
2022-10-13 01:53:26 -05:00
ingawei
1d618ba337
Inga/fr remove double comments (#1019)
incorporating answer comments into general comments section
2022-10-12 13:05:58 -05:00
marsteralex
7a0efe22c9 update jsons 2022-10-11 23:33:04 -04:00
marsteralex
2e01e2d76b
Merge branch 'manifoldmarkets:main' into main 2022-10-11 12:43:58 -07:00
Ian Philips
f26ba1c4a2
Award badges for market creation, betting streaks, proven correct (#891)
* Award badges for market creation, betting streaks, proven correct

* Styling

* Add minimum unique bettors for proven correct

* Add name, refactor

* Add notifications for badge awards

* Correct styling

* Need at least 3 unique bettors for market maker badge

* Lint

* Switch to badges_awarded

* Don't include n/a resolutions in market creator badge

* Add badges by rarities to profile

* Show badges on profile, soon on market page

* Add achievements to new user

* Backfill all users badges
2022-10-10 14:32:29 -06:00
Sinclair Chen
7863a4232d
Un-daisy share buttons (#1010)
* Make embed and challenge buttons non-daisyui

* Allow link Buttons. Change tweet, dupe buttons.

* lint
2022-10-05 15:51:10 -07:00
Austin Chen
70bfec2742 Improve sitemaps 2022-10-05 11:41:32 -04:00
marsteralex
8d597c6999 update jsons 2022-10-03 22:57:39 -04:00
marsteralex
9328e9a238
Merge branch 'manifoldmarkets:main' into main 2022-10-02 17:53:05 -07:00
marsteralex
01b6fdb085 update jsons 2022-10-02 20:52:48 -04:00
marsteralex
002e52401a update commanders 2022-10-02 05:47:05 -04:00
marsteralex
5ec67d1ae2 update jsons with unfinity 2022-10-01 23:12:25 -04:00
Phil
b2f81c1149
Twitch minor fix (#973)
* Made Twitch copy link buttons links so right-click -> copy URL works.

* Added Twitch OBS screenshot to public folder.
2022-09-30 20:01:51 +01:00
Sinclair Chen
ebcecd4fe9 remove unused files 2022-09-23 15:01:48 -04:00
marsteralex
d7b563655c update jsons 2022-09-21 19:02:11 -04:00
marsteralex
eec2dc3718 filter flavor name when importing cards 2022-09-20 19:49:28 -04:00
marsteralex
975f669e66 watermark update 2022-09-20 18:30:52 -04:00
marsteralex
ae251b6fbe Update artist.json 2022-09-20 18:04:29 -04:00
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