Commit e03c9ef0 authored by Hugo "ThePooN" Denizart's avatar Hugo "ThePooN" Denizart
Browse files

Merge branch 'master' into prov2021

parents 69fd4d83 ea7144f7
Pipeline #4261 failed with stage
in 2 minutes and 30 seconds
<template>
<li>
<strong>1vs1</strong> Match Creation<br>
<label for="player1">Joueur 1 : </label><input type="text" id="player1" v-model="player1" @keyup.enter="createLobby()">
<label for="player2">Joueur 2 : </label><input type="text" id="player2" v-model="player2" @keyup.enter="createLobby()"><br>
<label for="player1">Player 1: </label><input type="text" id="player1" v-model="player1" @keyup.enter="createLobby()">
<label for="player2">Player 2: </label><input type="text" id="player2" v-model="player2" @keyup.enter="createLobby()"><br>
<label for="applyPreset">Preset: </label>
<select id="applyPreset" v-model="presetName">
<option v-for="preset in presets" :value="preset.name" :key="preset.name">
{{ preset.name }}
</option>
</select><br>
Nom du lobby : {{ lobbyName }}<br>
Lobby name: {{ lobbyName }}<br>
<button class="btn btn-primary btn-smaller" @click="createLobby()">Create</button>
</li>
</template>
......
......@@ -3,7 +3,7 @@
<strong>Qualifiers</strong> Match Creation<br>
<label>Lobby : <input type="text" v-model="lobby"></label><br>
<label v-for="(player, id) in players" :key="id">
Joueur {{ id + 1 }} : <input type="text" v-model="players[id]" @keyup.enter="createLobby()">
Player {{ id + 1 }}: <input type="text" v-model="players[id]" @keyup.enter="createLobby()">
</label>
<br>
<label for="applyPreset">Preset: </label>
......@@ -12,7 +12,7 @@
{{ preset.name }}
</option>
</select><br>
Nom du lobby : {{ lobbyName }}<br>
Lobby name: {{ lobbyName }}<br>
<button class="btn btn-primary btn-smaller" @click="createLobby()">Create</button>
</li>
</template>
......
......@@ -190,7 +190,7 @@ class Lobby extends EventEmitter {
}
get lobbyUrl() {
return "https://osu.ppy.sh/community/matches/"+this.id;
return "https://osu.ppy.sh/mp/"+this.id;
}
set teamMode(teamMode) {
......
const path = require("path");
const util = require("util");
const express = require("express");
const logger = require("./logger");
......@@ -48,5 +49,5 @@ process.on("warning", (warning) => {
});
process.on("uncaughtException", (err) => {
logger.error("Uncaught exception:", { err });
});
\ No newline at end of file
logger.error("Uncaught exception:", { err: util.inspect(err) });
});
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment