Commit Graph

181 Commits

Author SHA1 Message Date
LuckyLaszlo
de00a4fdcd last update before merge with Cherif 2022-12-20 16:49:01 +01:00
LuckyLaszlo
c29db6d5f3 WIP token identification 2022-12-19 21:48:16 +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
LuckyLaszlo
42f2d76f30 Wip fetch() from gameServer to nestServer
+ miscs (html, css, svelte warning, ...)
2022-12-17 17:22:42 +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
batche
6ca35ccaa7 la galère continue 2022-12-13 16:57:00 +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
fb8368cc63 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into cherif_back_and_game 2022-12-11 17:32:39 +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
Me
61828e5be7 much progress on layout the foundations of the Friendship page in the front, also refactored some code to reuse displaying a users profile info 2022-12-10 07:13:28 +01:00
Me
15ea27955b trying to push again 2022-12-09 16:53:00 +01:00
Me
b75bce4212 this merge with master should come with the right backend stuff to make friendship requests work 2022-12-09 15:46:40 +01:00
batche
87fe4bbbf4 correction mineure 2022-12-09 11:42:58 +01:00
batche
f2e57bef79 petite erreur 2022-12-09 11:35:17 +01:00
batche
86e007d6c0 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master 2022-12-09 11:29:38 +01:00
batche
3802973dfa corrections mineures 2022-12-09 11:29:19 +01:00
batche
98fe5e0bd6 je dois refaire toute l'amitié :( 2022-12-09 10:01:41 +01:00
Me
58234c8a6c ok so the problem seems to be that i was sending a username not an ID (which is unique), so i made a way to do that, bu t it's still a work in progress figuring out the restults 2022-12-09 05:33:32 +01:00
Me
302ebd674c working on friendships in teh frontend but having to do some debuging in the backend 2022-12-09 05:19:12 +01:00
Me
999b40430d was mucking about with trying to integerate the game but will leave that for some other time 2022-12-09 02:23:58 +01:00
batche
8d640ae4ab début de la mise en place du jeu (partie client uniquement). 2022-12-08 19:08:07 +01:00
batche
a3aaedb1fd début création du jeu 2022-12-08 18:04:59 +01:00
batche
3afc0996ac début création du jeu 2022-12-08 17:56:46 +01:00
batche
58787215ad Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2022-12-08 17:13:29 +01:00
batche
8953a0c09b réforme de l'amitié 2022-12-08 17:13:12 +01:00
Me
c777fb3592 merged with master 2022-12-08 17:09:02 +01:00
Me
8688f3b48f pushing to master, only minor changes 2022-12-08 17:04:50 +01:00
LuckyLaszlo
abf5c45aa7 spectator mode WIP, working so far 2022-12-08 14:43:07 +01:00
batche
46fcb423e5 changements mineurs 2022-12-08 14:34:14 +01:00
batche
b00c9e1474 changements mineurs 2022-12-08 14:01:07 +01:00
batche
8c2df71cde les redirections fonctionnent 2022-12-08 13:51:56 +01:00
LuckyLaszlo
c88a6145eb minor refactoring 2022-12-08 07:35:20 +01:00
LuckyLaszlo
75925b5f84 messages refactoring 2022-12-08 04:42:31 +01:00
LuckyLaszlo
b3bd43c423 added victory by forfeit 2022-12-08 04:08:16 +01:00
Me
d2f45ba86a Merge remote-tracking branch 'origin' into eric_front_and_back 2022-12-07 20:47:34 +01:00
batche
365bac36ef 2A la suite 2022-12-07 20:38:11 +01:00
batche
081a3c1dc2 Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence into inclusion_jeu_a_partir_de_master 2022-12-07 20:02:42 +01:00
batche
bccb342043 amélioration de la 2Fa 2022-12-07 19:59:05 +01:00
LuckyLaszlo
d2cdc564ac Match abort if all players not ready in time (5s)
+ HTML Keys instructions
2022-12-07 19:33:56 +01:00
Me
3cdedc921c ok now it actually works, had a few imports left over that i needed to get rid of, also added extra protection in my ProfileSettings so you can not change the username and it's still ok 2022-12-07 19:20:55 +01:00
Me
59bc893173 removed the userStore, didn't make sense and now we don't even need to use local storage so no security vulnerability, cool, oh and everything still works 2022-12-07 18:49:31 +01:00
Me
6c3cad3b3d mucking about trying to solve the weird 2fa issues, putting a pin in it for now tho 2022-12-07 18:25:15 +01:00