Commit Graph

324 Commits

Author SHA1 Message Date
Elijah Steres
eb2c5797cb Fix js injection vulnerability 2021-01-06 14:14:19 -05:00
Sakimori
2c638970de cleaned up a comment 2021-01-06 02:27:04 -05:00
Sakimori
aff7c88775 Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-05 17:30:00 -05:00
Sakimori
9b7038990f strip trailing spaces from team name and slogan 2021-01-05 17:28:45 -05:00
Sakimori
d2461cf81b
Create LICENSE.md
added the attribution-noncommercial-sharealike 4.0 international license to simsim
2021-01-05 17:03:48 -05:00
Sakimori
0a1ce24853 Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-05 15:31:57 -05:00
Sakimori
84cb16ab5d added --bestof and --finalsbestof flags to tournament 2021-01-05 15:31:50 -05:00
Sakimori
5eee2f4d0e
Merge pull request #130 from esSteres/indev
missed a merge conflict riv
2021-01-05 15:28:51 -05:00
Elijah Steres
3b1a9d2548 missed a merge conflict riv 2021-01-05 15:25:12 -05:00
Sakimori
55f589dde1 adjusted the mulligan curve 2021-01-05 15:18:18 -05:00
Sakimori
ccd7702db8
Merge pull request #127 from jmaliksi/jm_fix_imports
Fix onomancer import
2021-01-05 14:29:36 -05:00
Sakimori
803f633a9e changed timestamp to uuid strings, adjusted variable names in the_prestige and main_controller 2021-01-05 14:26:54 -05:00
joe
60196929fd erroneous not 2021-01-05 09:15:54 -08:00
joe
56fbe809c7 fix onomancer import with add_pitcher 2021-01-05 09:09:41 -08:00
Sakimori
8d01a3cc79
Merge pull request #125 from esSteres/dynamic-grid
Dynamic grid column count
2021-01-05 01:48:29 -05:00
Elijah Steres
bfd7a8065d Merge remote-tracking branch 'upstream/indev' into dynamic-grid 2021-01-05 00:51:23 -05:00
Elijah Steres
4a8285ca9f fixes and tweaks 2021-01-05 00:26:33 -05:00
Sakimori
74a205fe74
Merge pull request #124 from esSteres/indev
fix game page getting squashed on mobile
2021-01-05 00:05:37 -05:00
Eli
b31b19ea05 make grid columns dynamically adjust to screen size 2021-01-04 23:39:24 -05:00
Elijah Steres
e37abb55a1 fix game page getting squashed on mobile 2021-01-04 22:55:53 -05:00
Sakimori
d331338d93 stopped games printing end-card 1 update too soon 2021-01-04 20:35:59 -05:00
Sakimori
ebaef8828c
Merge pull request #123 from Sakimori/indev
fixed random game end cards for real this time (probably)
2021-01-04 20:26:25 -05:00
Sakimori
6235564622 fixed random game end cards for real this time (probably) 2021-01-04 20:23:32 -05:00
Sakimori
6eec667370
Merge pull request #120 from Sakimori/indev
patch to fix game endcards
2021-01-04 19:56:24 -05:00
Sakimori
759f274efc Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-04 19:42:51 -05:00
Sakimori
5cb23c87df games will stay on "play blall" for a shorter time 2021-01-04 19:42:42 -05:00
Sakimori
fd249efb39
Merge pull request #122 from esSteres/hotfix
Hotfix safari mobile display
2021-01-04 18:14:07 -05:00
Elijah Steres
ae9b831151 Merge remote-tracking branch 'upstream/indev' 2021-01-04 17:59:23 -05:00
Elijah Steres
808712a7c7 fix safari display, maybe 2021-01-04 17:57:13 -05:00
Sakimori
772aa2f770 deletes tournament setup message, ensures more than 1 team in a tournament 2021-01-04 16:17:55 -05:00
Sakimori
32136b51dc added error message to addplayer if pitcher/batter is not specified 2021-01-04 15:45:30 -05:00
Sakimori
b4202a1a46 fixes bug #118 2021-01-04 15:37:53 -05:00
Sakimori
5870325254 Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-04 15:24:44 -05:00
Sakimori
5f5ee9e1f0 fixed bug in game_watcher, added game_freeze check to tournament and randomgame 2021-01-04 15:24:19 -05:00
Sakimori
27c1a787d1
Merge pull request #115 from Sakimori/indev
push indev branch to live on 1/4/2021
2021-01-04 13:38:11 -05:00
Sakimori
c5392d000c
Merge pull request #117 from Genderdruid/master
updated the readme and the help commands to keep them consistent when…
2021-01-04 13:03:37 -05:00
Genderdruid
4e9e02ba12 updated the readme and the help commands to keep them consistent when it makes sense 2021-01-04 08:42:02 -08:00
Sakimori
3899041536
Merge pull request #116 from Genderdruid/master
Updated the readme with all the features of the new patch and cleaned up some other parts
2021-01-04 00:57:51 -05:00
Genderdruid
5200ce687c Merge branch 'indev' 2021-01-03 21:46:23 -08:00
Genderdruid
6e403a0d1e Merge branch 'indev' of https://github.com/Sakimori/matteo-the-prestige into indev 2021-01-03 21:45:57 -08:00
Genderdruid
7a4f8d1f0f Update README.md 2021-01-03 21:45:49 -08:00
Sakimori
864c1af655 made day=1 give first pitcher, not second 2021-01-03 23:43:04 -05:00
Sakimori
ee11aca3c0 added a -d or --day flag to force rotation slots in games 2021-01-03 23:41:31 -05:00
Sakimori
6e69117e62
Merge pull request #114 from Sakimori/leagues
implements tournaments and a foundation for leagues
2021-01-03 23:23:16 -05:00
Sakimori
f391577792
Merge branch 'indev' into leagues 2021-01-03 23:23:02 -05:00
Sakimori
ff582d8709 finished implementing tournaments, slowed game ticks to 8 seconds 2021-01-03 23:18:45 -05:00
Sakimori
a2a6e9d7bb added m;randomgame 2021-01-03 17:59:13 -05:00
Genderdruid
56b5d9f45f Update README.md 2021-01-03 14:28:11 -08:00
Sakimori
63db3ba1be added handling for teams without slogans 2021-01-03 17:16:05 -05:00
Sakimori
1838e9198a added weather to discord embed at end of game 2021-01-03 16:57:41 -05:00