kass/matteo-the-prestige
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/indev' into dynamic-grid

Browse Source
This commit is contained in:
Elijah Steres 2021-01-05 00:51:23 -05:00
commit bfd7a8065d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/game.css
View File

@ -19,9 +19,13 @@
border-right: none; border-right: none;
border-bottom: none; border-bottom: none;
height: min-content; height: min-content;
<<<<<<< HEAD
width: 100%; width: 100%;
min-width: 32rem; min-width: 32rem;
max-width: 44rem; max-width: 44rem;
=======
min-width: 500px;
>>>>>>> upstream/indev
} }
.header { .header {

2
the_prestige.py
View File

@ -1121,7 +1121,7 @@ async def game_watcher():
this_array = gamesarray.copy() this_array = gamesarray.copy()
for i in range(0,len(this_array)): for i in range(0,len(this_array)):
game, channel, user, key = this_array[i] game, channel, user, key = this_array[i]
if game.over and main_controller.master_games_dic[key][1]["end_delay"] <= 9: if game.over and main_controller.master_games_dic[key][1]["end_delay"] <= 8:
final_embed = game_over_embed(game) final_embed = game_over_embed(game)
if isinstance(user, str): if isinstance(user, str):
await channel.send(f"A game started by {user} just ended.") await channel.send(f"A game started by {user} just ended.")