batche
|
bb7edac11e
|
Merge branch 'luke' of bitbucket.org:LuckyLaszlo/ft_transcendence into cherif_back_and_game
|
2022-12-22 13:17:49 +01:00 |
|
LuckyLaszlo
|
d172f418a3
|
Chérif et Luke coop, invitations fix et timeout
|
2022-12-22 13:17:20 +01:00 |
|
batche
|
4fd77673c4
|
Quelques problèmes ont été résolues.
|
2022-12-22 13:13:16 +01:00 |
|
batche
|
1f0b165f20
|
Ranking débuts
|
2022-12-22 11:43:35 +01:00 |
|
LuckyLaszlo
|
7de9f3a9f1
|
refactoring Game.svelte (INVITATION NOT TESTED !)
|
2022-12-22 05:15:32 +01:00 |
|
Me
|
beeaf1fb27
|
better findAll() in user module, no pagination tho, could add but would be hella annoying
|
2022-12-22 03:34:53 +01:00 |
|
LuckyLaszlo
|
84062d5a89
|
changes in Game.svelte
+ playerOne is always in left
+ kick players after match end
+ slow down ball and player
+ re in Makefile
|
2022-12-22 00:27:41 +01:00 |
|
Me
|
670936e4a1
|
cleaned up friendship module in backend, still haven't tested blocking feature
|
2022-12-21 23:58:36 +01:00 |
|
LuckyLaszlo
|
351ffc1756
|
Merge branch 'cherif_back_and_game' into luke
|
2022-12-21 20:19:11 +01:00 |
|
LuckyLaszlo
|
a1472c9059
|
SpectatorMatchList first test
|
2022-12-21 19:35:40 +01:00 |
|
batche
|
eb1a5b47dd
|
Ajout du ranking côté back, reste à l'implémenter côté front
|
2022-12-21 17:13:50 +01:00 |
|
batche
|
e786324896
|
fin du game
|
2022-12-21 16:38:34 +01:00 |
|
hugogogo
|
9c2a8ce2f7
|
Merge branch 'master' into hugo
|
2022-12-21 16:09:16 +01:00 |
|
hugogogo
|
ab3e232743
|
cleaned code after shift enter configuration
|
2022-12-21 16:07:22 +01:00 |
|
hugogogo
|
084e18da80
|
wip write msg now shift enter to send
|
2022-12-21 15:44:12 +01:00 |
|
batche
|
cc797d1118
|
Le multijoueur fonctionne enfin. Mise à jour des scores. Et de la partie.
|
2022-12-21 15:22:07 +01:00 |
|
batche
|
d6da8bf70b
|
Suite intégration jeu
|
2022-12-21 10:05:36 +01:00 |
|
hugogogo
|
55cff329c3
|
wip handle newline with enter shift
|
2022-12-20 23:02:45 +01:00 |
|
batche
|
77857a873d
|
Vive le rouge !
|
2022-12-20 20:23:15 +01:00 |
|
batche
|
fb7bfa0097
|
jeu suite
|
2022-12-20 17:56:18 +01:00 |
|
batche
|
bd66fe60ff
|
Merge branch 'luke' into cherif_back_and_game
|
2022-12-20 17:51:18 +01:00 |
|
batche
|
c26ea0bb3c
|
suppression de fonctions inutiles dans la partie svelte
|
2022-12-20 17:45:15 +01:00 |
|
LuckyLaszlo
|
de00a4fdcd
|
last update before merge with Cherif
|
2022-12-20 16:49:01 +01:00 |
|
hugogogo
|
6f29dab558
|
fixed css error in write area expansion
|
2022-12-20 11:04:47 +01:00 |
|
Me
|
84488ee407
|
cherif helped me fix the queryBuilder, so much better now
|
2022-12-20 04:37:12 +01:00 |
|
LuckyLaszlo
|
c29db6d5f3
|
WIP token identification
|
2022-12-19 21:48:16 +01:00 |
|
batche
|
8a11d9c591
|
Suite du jeu et toujours pas fin
|
2022-12-19 21:37:58 +01:00 |
|
batche
|
dbd95089a8
|
Game, suite et presque fin ?
|
2022-12-19 20:58:46 +01:00 |
|
batche
|
27a4bfae7a
|
lien serveur de jeu => serveur nestjs
|
2022-12-19 09:34:34 +01:00 |
|
LuckyLaszlo
|
674eff0d6d
|
deleted useless duplicates files
|
2022-12-17 20:34:48 +01:00 |
|
LuckyLaszlo
|
04029c9988
|
fix sound selector
+ favicon
+ temporary debug log for sound in RectangleClient
|
2022-12-17 20:33:58 +01:00 |
|
lenovo
|
fcd009ade7
|
layout mute ok
|
2022-12-17 18:29:59 +01:00 |
|
LuckyLaszlo
|
42f2d76f30
|
Wip fetch() from gameServer to nestServer
+ miscs (html, css, svelte warning, ...)
|
2022-12-17 17:22:42 +01:00 |
|
hugogogo
|
9d4bb85c2d
|
wip mute panel
|
2022-12-17 11:04:29 +01:00 |
|
hugogogo
|
bfc465879c
|
changed graph drawio
+ replaced 'placeholder' by room_name and user
+ fixed line of panel user
|
2022-12-17 10:12:12 +01:00 |
|
hugogogo
|
639f83045e
|
moved testing inputs to js file
+ added room name in user if from room settings
|
2022-12-17 09:35:55 +01:00 |
|
hugogogo
|
93c9927422
|
layout play for debug is better with toggle and replace
|
2022-12-16 22:02:14 +01:00 |
|
hugogogo
|
cdef20795b
|
user layout works with classes
|
2022-12-16 21:10:47 +01:00 |
|
hugogogo
|
30faab336e
|
added minimal form requirement
|
2022-12-16 20:03:23 +01:00 |
|
hugogogo
|
044f5bc54a
|
form ok
|
2022-12-16 19:42:12 +01:00 |
|
hugogogo
|
72b4f72901
|
changed layout function name for chat_layout
|
2022-12-16 16:40:59 +01:00 |
|
hugogogo
|
ca06dddaaf
|
changed back button to be one unique button
|
2022-12-16 16:30:55 +01:00 |
|
hugogogo
|
b73bc14ac9
|
layout protected
|
2022-12-16 15:48:54 +01:00 |
|
hugogogo
|
e4aad0ead7
|
layout room set ok
|
2022-12-16 14:46:19 +01:00 |
|
hugogogo
|
0b326ad853
|
added lock logo to blocked users
|
2022-12-16 14:35:46 +01:00 |
|
hugogogo
|
41184ecdce
|
global style for button list
|
2022-12-16 13:43:05 +01:00 |
|
hugogogo
|
e91103132c
|
added light background to home and new rooms names
|
2022-12-16 13:03:19 +01:00 |
|
lenovo
|
84176f3a52
|
wip layout new buttons background
|
2022-12-16 11:54:18 +01:00 |
|
lenovo
|
e84ca9592a
|
wip layout new almost done
|
2022-12-16 11:48:54 +01:00 |
|
batche
|
67f7d0e8ec
|
Suite de l'intégratyion du jeu. De nombreux paquets sont indisponibles.
|
2022-12-16 10:51:40 +01:00 |
|