batche
|
9586fe63fc
|
problèmes du jeu réglés en grosse partie
|
2022-12-22 15:29:43 +01:00 |
|
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 |
|
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 |
|
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 |
|
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
|
04029c9988
|
fix sound selector
+ favicon
+ temporary debug log for sound in RectangleClient
|
2022-12-17 20:33:58 +01:00 |
|
LuckyLaszlo
|
42f2d76f30
|
Wip fetch() from gameServer to nestServer
+ miscs (html, css, svelte warning, ...)
|
2022-12-17 17:22:42 +01:00 |
|
batche
|
67f7d0e8ec
|
Suite de l'intégratyion du jeu. De nombreux paquets sont indisponibles.
|
2022-12-16 10:51:40 +01:00 |
|
Me
|
de06007d60
|
fixed some stuff in the Friendship backend, but had to cut some corners, it's kinda gross, will fix later, better flow to frontend friendship page, most stuff works, still a few kinks to work out
|
2022-12-16 04:14:44 +01:00 |
|
Me
|
db02946268
|
Query Builder, more specifically an orWhere, is being difficult... hard to test the friendships flow in the frontend without it, still have a good bit of work as a result
|
2022-12-15 05:42:09 +01:00 |
|
lenovo
|
e18010a1ef
|
wip style of chat layouts, alreade done home and room
|
2022-12-14 20:32:41 +01:00 |
|
batche
|
c2242c481b
|
Le jeu fonctionne yipa !
|
2022-12-14 12:12:10 +01:00 |
|
batche
|
0877cd284f
|
connection upgrade with nginx
|
2022-12-14 11:18:02 +01:00 |
|
batche
|
fd8435b632
|
travail avec lucky - suite
|
2022-12-14 11:01:11 +01:00 |
|
batche
|
f1f94cb9bc
|
serveur de jeu - work in progress
|
2022-12-14 10:45:10 +01:00 |
|
Me
|
6eaf28d4d8
|
working on accepting friend requests, have to muck about with the DB, i have to learn how to use .find()
|
2022-12-14 08:59:00 +01:00 |
|
Me
|
3a6729b9a3
|
adding the ability to add and delete friends, in progress
|
2022-12-14 06:31:09 +01:00 |
|
batche
|
bd4938b64b
|
changement mineur fonction pour chercher ami via username
|
2022-12-13 17:47:29 +01:00 |
|
batche
|
aa171bd844
|
ajout de deux fonctions afin de trouver une relation amicale ou non via le username de ladite relation
|
2022-12-13 17:25:00 +01:00 |
|
Me
|
51125eee0f
|
minor fixes to Friendpage
|
2022-12-13 17:09:17 +01:00 |
|
batche
|
6ca35ccaa7
|
la galère continue
|
2022-12-13 16:57:00 +01:00 |
|
Me
|
44074af237
|
Cleaned up ProfileFriends page, but i need some input about the backend, might need to change some things
|
2022-12-13 07:06:08 +01:00 |
|
Me
|
913a81ef0a
|
ok so we fixed the button problem i was having, turns out i'm dumb, but we knew that, and i got reactive component loading, good news, not sprucing up the FriendPage, adding more functionality
|
2022-12-13 03:26:38 +01:00 |
|
batche
|
a8743940a5
|
dockerfile
|
2022-12-12 15:13:59 +01:00 |
|
batche
|
b04cd0aa48
|
Implémentation du jeu dans svelte HOPE
|
2022-12-12 12:37:47 +01:00 |
|
batche
|
34bdcad3a2
|
pendant req
|
2022-12-11 16:46:13 +01:00 |
|
batche
|
a9460fb41c
|
Changements amitiés
|
2022-12-11 15:30:30 +01:00 |
|
Me
|
db1e269e2e
|
Stuggling a bit to get components to rerender when a prop updates in the Friendship page, will sort out tomorrow
|
2022-12-11 08:12:22 +01:00 |
|
Me
|
6eeb2b5474
|
ok so i fixed the get user by username issue, left all the comments in the back so Cherif and I can go over what i changed just to make sure i didn't break something else, but yea that and my front work just fine
|
2022-12-11 06:04:03 +01:00 |
|