From d77998bbd890aad5d366fd66e4dcb09e958d32b9 Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Wed, 17 Mar 2021 23:17:06 +0000 Subject: [PATCH] started making game and readme's --- README => README.md | 0 TODO | 6 ++++-- client/{README => README.md} | 0 client/game.html | 4 ++++ client/public/game/lobbies.js | 2 +- client/public/game/lobby.css | 10 ---------- server/{README => README.md} | 0 server/src/game-registrar.js | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) rename README => README.md (100%) rename client/{README => README.md} (100%) rename server/{README => README.md} (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/TODO b/TODO index f07eca1..072231a 100644 --- a/TODO +++ b/TODO @@ -5,8 +5,10 @@ [x] Fix user timeouts / deletion [x] User sockets, or "users" are made innactive after timeout on socket - Prevents softlock of users and stops socket spamming - [-] Game lobying system - [ ] Delete lobby once user disconnects - no reconnection + [x] Game lobying system + [ ] Sanatise lobby names + [ ] Make lobby names uppercase + [x] Delete lobby once user disconnects - no reconnection [ ] Matchmaking system [ ] 1v1 game framework that allows spectators [ ] diff --git a/client/README b/client/README.md similarity index 100% rename from client/README rename to client/README.md diff --git a/client/game.html b/client/game.html index a13f7c4..dcd139a 100644 --- a/client/game.html +++ b/client/game.html @@ -9,5 +9,9 @@ + + + + \ No newline at end of file diff --git a/client/public/game/lobbies.js b/client/public/game/lobbies.js index 4bc25e7..5813f6c 100644 --- a/client/public/game/lobbies.js +++ b/client/public/game/lobbies.js @@ -216,7 +216,7 @@ socket.on('lobby-update', obj => { if (obj.state === 'lobby-deregister') { - pageLog(`${obj.updateuser.username} deregistered lobby`); + pageLog(`${obj.updateuser.username} deleted lobby`); leaveLobby(); } }); diff --git a/client/public/game/lobby.css b/client/public/game/lobby.css index 878f0a3..5264e2f 100644 --- a/client/public/game/lobby.css +++ b/client/public/game/lobby.css @@ -10,13 +10,3 @@ textarea { position: fixed; bottom: 0; } - - -.lobby-type { - /* display: block; - margin-left: auto; - margin-right: auto; - border: 1px solid green ;*/ -} - - diff --git a/server/README b/server/README.md similarity index 100% rename from server/README rename to server/README.md diff --git a/server/src/game-registrar.js b/server/src/game-registrar.js index 53b172d..ac0b545 100644 --- a/server/src/game-registrar.js +++ b/server/src/game-registrar.js @@ -11,7 +11,7 @@ USER OBJECT ip: ip, // REGISTERED, CONNECTED, DISCONNECTED state: 'CONNECTED', - // LOBYING, GAME, UNDECIDED + // LOBYING, GAMETRANSITION, GAME, UNDECIDED intent: 'LOBBYING', // Doesn't update if state changes connectionid: 'none',