open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,875 Commits 88 Branches 0 Tags 33 MiB
351ad9b32e
Commit Graph

2875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marsteralex
9247bffe70
Merge branch 'manifoldmarkets:main' into main 2022-09-11 05:42:05 -07:00
mantikoros
93033b5b24 Revert "Yes and no buttons on contract page (#868)" 
This reverts commit b39e0f304f.
 2022-09-10 21:57:50 -05:00
mantikoros
18815caed4 Revert "Put sale value above quick bet button" 
This reverts commit 9ee7173305.
 2022-09-10 21:57:35 -05:00
Ian Philips
9ee7173305 Put sale value above quick bet button 2022-09-10 17:48:35 -06:00
Ian Philips
b39e0f304f
Yes and no buttons on contract page (#868) 
* Yes and no buttons on contract page

* Cheating by adding 0.05 to max shares but gives better quickbet UX
 2022-09-10 17:07:23 -06:00
mantikoros
e17234ecce typo 2022-09-10 17:43:52 -05:00
Austin Chen
33bcc1a65e Clean up /tournaments styling 2022-09-10 12:00:01 -07:00
Austin Chen
e61591622e Feature a few other semi-tournaments 2022-09-10 11:50:03 -07:00
marsteralex
67201a5ce2
Merge branch 'manifoldmarkets:main' into main 2022-09-09 18:00:38 -07: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
jahooma
11ba65ec4a Auto-remove unused imports 2022-09-09 22:43:33 +00:00
FRC
26f83ac4f6
Adds investmentValue to group leaderboard calculation (#855) 
* Adds investmentValue to group leaderboard calculation

* Initial investment is no longer counted, only the profit

* Simplify scoring calculation

* Remove console.log

* Group bets by user first

Co-authored-by: James Grugett <jahooma@gmail.com>
 2022-09-09 17:42:51 -05: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
e204b336b3
Merge branch 'manifoldmarkets:main' into main 2022-09-09 14:37:59 -07:00
akrolsmir
cca870ced5 Auto-remove unused imports 2022-09-09 21:27:16 +00:00
Austin Chen
fdf123b875 Remove console.logs from common code 
This makes it easier to debug in local; we shouldn't be checking in console.log into the codebase, as a general rule
 2022-09-09 14:26:23 -07:00
Austin Chen
a737ae9f46 Link to tournament /about pages 2022-09-09 14:14:22 -07:00
mantikoros
43660387fa modal positioning 2022-09-09 16:08:42 -05:00
mantikoros
7729bdd2dc bet panel: higher threshold for warning; no autofocus on mobile 2022-09-09 15:58:26 -05: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
2d3ec3c96d
Merge branch 'manifoldmarkets:main' into main 2022-09-09 13:25:36 -07:00
marsteralex
bbc4551eec add dfc support for commanders 2022-09-09 22:25:04 +02:00
Austin Chen
18466afc78 Fix API URLs from non "manifold.markets" domains 2022-09-09 11:43:23 -07:00
Austin Chen
4c801f76b4
Submit comments on ctrl/cmd-enter (#830) 
* Submit comments on ctrl/cmd-enter

* Remove unused import

* Tweak padding on /tournaments

* Always submit on ctrl+enter

Since we took out group chats, this should be fine for all comments
 2022-09-09 11:09:31 -07:00
marsteralex
6e77b4a987
Merge branch 'manifoldmarkets:main' into main 2022-09-09 10:27:49 -07:00
Austin Chen
6a69f44f07 Tweak padding on /tournaments 2022-09-09 10:16:25 -07: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
Ian Philips
e639cb654e Add group endpoint note in api docs 2022-09-09 07:22:31 -06:00
marsteralex
3a2fea57b9 updated padding 2022-09-09 13:37:01 +02:00
Austin Chen
1408908959 List the Manifold F2P tournament 2022-09-09 01:46:25 -07:00
mantikoros
cd1d8ecd8a WarningConfirmationButton for bets 2022-09-09 01:02:30 -05:00
mantikoros
0dbb42aa69 Auto-prettification 2022-09-09 05:03:05 +00:00
mantikoros
2ebb83418c bet panel: disable input focus on mobile 2022-09-09 00:02:14 -05:00
mantikoros
eac56b1f4f slider: smarter step increments; disable clicking on track 2022-09-09 00:02:14 -05:00
James Grugett
987ebccdfd Contract tabs: used passed in bets 2022-09-08 23:45:26 -05:00
James Grugett
cf74a195b2 Redeem shares: pay back a smaller frac of your loan 2022-09-08 22:59:25 -05:00
marsteralex
9afb706aa9 Merge branch 'main' of https://github.com/marsteralex/manifold 2022-09-09 05:47:30 +02:00
marsteralex
0d56273247 added difficulty rating 2022-09-09 05:43:48 +02:00
marsteralex
677b20a7ba
fix brawl commanders for digital (#862) 
* 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

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
 2022-09-08 20:23:31 -07:00
Austin Chen
e3e80a5fd0 Change user info using bulkWriter 2022-09-08 20:21:32 -07:00
marsteralex
10f160fee3 fix counterspell setting default 2022-09-09 05:13:34 +02:00
marsteralex
866f814927 remove generated cards from digital commanders 2022-09-09 05:01:11 +02:00
marsteralex
d342de83e0
Merge branch 'manifoldmarkets:main' into main 2022-09-08 19:56:45 -07:00
marsteralex
8aeb544f7e
add commander category (#861) 
* 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

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
 2022-09-08 18:38:48 -07:00
marsteralex
1c76d79760 removing racist cards upstream 
this way we don't have to store the cards in the json
 2022-09-09 03:04:08 +02:00
marsteralex
4be4c72362 can use double feature 2022-09-09 02:41:18 +02:00
marsteralex
1e8c7defbc update basic land art 2022-09-09 02:21:45 +02:00