Commit Graph

327 Commits

Author SHA1 Message Date
LuckyLaszlo
46b914a29a Merge branch 'master' into luke 2023-01-13 14:53:17 +01:00
cherif
0addb48c84 mini changement sur la façon de mettre à jour le statut pendant la création d'une partie. Cette corection sera complétée par une correction au niveau du gameserver 2023-01-13 14:49:06 +01:00
cherif
97f0a52b2c Correction d'un bug qui ne mettait pas à jour le statut lorsque l'on quittait et revenait se connecter sur le site 2023-01-13 14:25:08 +01:00
lperrey
7e13dc3f61 /resetuserstatus when player leave the gameserver 2023-01-12 19:52:28 +01:00
simplonco
8e99a764f7 Merge branch 'master' into hugo 2023-01-12 00:52:59 +01:00
simplonco
ff90c9d1fb pull fixed conflicts 2023-01-12 00:52:43 +01:00
simplonco
b27e9b1cc9 wip gitignore 2023-01-12 00:50:55 +01:00
simplonco
c737435579 wip gitignore 2023-01-12 00:49:41 +01:00
simplonco
8cc7d30a1a wip gitignore 2023-01-12 00:47:21 +01:00
simplonco
b851613f0f creation of directs messages
+ can choose myrooms fields
+ trying to make type validation without success
2023-01-12 00:36:38 +01:00
LuckyLaszlo
20905b88de GenerateUserDisplay primary fix 2023-01-11 21:05:16 +01:00
LuckyLaszlo
8856c46fb6 fetchAvatar() generic function 2023-01-11 20:52:15 +01:00
simplonco
aa86299e73 wip direct messages 2023-01-11 18:20:48 +01:00
LuckyLaszlo
708aadf868 bundle.js remove (again 🤡) 2023-01-11 13:29:13 +01:00
simplonco
8e7efbb65a wip validation dto 2023-01-11 13:16:27 +01:00
LuckyLaszlo
7c038f90d2 Merge branch 'master' into luke 2023-01-11 13:14:25 +01:00
simplonco
dcf129b4f1 fixed pbm if messages return null 2023-01-11 12:42:38 +01:00
LuckyLaszlo
de26c3c89c avatar display on game pages
+ multiples user.status bug unresolved, temp rollback in generateToken()
+ STATUS enum fix game.service.ts
+ multiples smalls refactoring
2023-01-11 12:00:03 +01:00
simplonco
9db3c053ea changed return value of controller for void 2023-01-11 10:59:54 +01:00
simplonco
e97de4f137 wip directs 2023-01-11 10:07:38 +01:00
Me
9e53ed140a minor modifications, header now tells you which page you are on, slightly fewer comments 2023-01-11 00:47:05 +01:00
simplonco
9aad7019ab small cleanup 2023-01-10 23:03:43 +01:00
simplonco
7f01ccdb78 created querybuilder for direct users 2023-01-10 19:49:53 +01:00
simplonco
4af3654e58 added promise return type in service 2023-01-10 17:11:48 +01:00
simplonco
8f07be709e store sockets in a map so controller can access them 2023-01-10 16:45:16 +01:00
simplonco
239b16bfa8 moving gateway logic in service 2023-01-10 15:36:41 +01:00
simplonco
1594ab6f05 added socket dto 2023-01-10 15:21:18 +01:00
simplonco
2e67d3ce6f wip escape chars 2023-01-10 11:17:05 +01:00
simplonco
0f8cca33bf merge hugo fixed pbm in room name check 2023-01-10 10:43:08 +01:00
simplonco
e80b1887d1 bundle.js things 2023-01-10 10:36:55 +01:00
simplonco
223599542b fixed pbm in room name check 2023-01-10 10:32:46 +01:00
hugogogo
89ffe9d4a3 merge hugo in master 2023-01-09 22:50:42 +01:00
hugogogo
316d4c6fa9 protected agains bad room names 2023-01-09 22:49:08 +01:00
Me
f44170338a scrapping my attempt at a new version of the SplashPage, we'll just use Cherif's, it's way better 2023-01-09 21:27:28 +01:00
hugogogo
5d20e1614c leave room 2023-01-09 21:26:49 +01:00
Me
9eececb045 Merge remote-tracking branch 'origin/master' into eric_front_and_back 2023-01-09 21:17:01 +01:00
Me
9b8e0e8890 attempts at a better splash page, not the best results 2023-01-09 21:14:10 +01:00
hugogogo
eea631b18a list of room users 2023-01-09 20:52:59 +01:00
hugogogo
5184097765 changed services to add join message 2023-01-09 20:02:35 +01:00
hugogogo
ac20571ad4 delete tests hugo 2023-01-09 19:04:33 +01:00
hugogogo
ea395ce1af fixed error message not showing in room creation 2023-01-09 18:29:32 +01:00
hugogogo
8c9c260fc7 merge hugo now have a basic functional chat with rooms 2023-01-09 18:25:11 +01:00
hugogogo
3eb338d822 socket are working but it's not the right way 2023-01-09 16:47:30 +01:00
hugogogo
e23699dd51 rooms have name 2023-01-09 16:29:27 +01:00
hugogogo
e71e555ea4 rooms now change properly in home 2023-01-09 16:10:37 +01:00
hugogogo
94ec37b847 changed layout for a store variable 2023-01-09 14:44:01 +01:00
hugogogo
45edd2f25f wip multiple rooms 2023-01-09 12:23:41 +01:00
batche
0f60b83121 remise du css pour game et game spectator 2023-01-09 11:13:41 +01:00
batche
a346b7d5a2 remise du tableau de score 2023-01-09 11:09:33 +01:00
LuckyLaszlo
d55f3eedf5 fix draw game
+ status update in generateToken()
2023-01-09 11:01:57 +01:00