Commit Graph

254 Commits

Author SHA1 Message Date
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
LuckyLaszlo
0f30a3d8d4 audio changes 2023-01-09 07:46:31 +01:00
LuckyLaszlo
2ae0ee043a initGame() try catch 2023-01-09 07:17:16 +01:00
LuckyLaszlo
42e3e148b4 initGame() changes 2023-01-09 06:51:13 +01:00
LuckyLaszlo
d53b0998f0 Merge branch 'master' into luke 2023-01-09 06:27:19 +01:00
Me
f7c728a009 So i added a check to make it so you can't change your username to someone else's, also turns out Cherif already has a check so that if you change your username to someone else's 42 username who isn't a user yet and then they try to become a user, their username will have a random string attached to the end so it is also unique, then fixed a few minor things, and made it so all UnauthorizedPages take you back to / as in the SplashPage rather than a special page from which you navigate to /, that said, i think feedback for the user is kinda nice, will decide with team eventually 2023-01-07 01:41:06 +01:00
LuckyLaszlo
711f971333 major rework in Game.svelte and GameSpectator.svelte
+ WIP match draw
2023-01-06 20:04:40 +01:00
Me
0470676c5d added the thing so you can see other people's avatars, fixed checks on frontend routes like game and such that other people created, need help understanding ValidationPipe() to make it so a user must have a unique username. TBH this shit is still being held together by Duct Tape and Holy Water 2023-01-05 22:37:56 +01:00
LuckyLaszlo
68ae8ac333 bugfix with countdown() on early pong.destroy call
+ svelte reactivity with forfeit button
+ little matchmaking changes
+ Wip audio rework
2023-01-05 20:18:59 +01:00
Me
b35082148c merge stuff 2023-01-05 12:33:51 +01:00
Me
730b8c4e4a sorting out merge stuff 2023-01-05 12:31:47 +01:00
Me
9889eae77f seems like the merge worked 2023-01-05 12:30:54 +01:00
Me
46090b1e33 ok the friendship and user refactor is done, there are still a lot of comments but that's fine, it's duct taped together, but it works, time to merge 2023-01-05 11:21:34 +01:00
batche
eab2749c0e Clean de quelques trucs dans le front 2023-01-04 18:56:32 +01:00
Me
d3be6e5fe8 ok gotta test all the paths but we more or less have the friendships and users modules working the new way 2023-01-04 16:04:48 +01:00
simplonco
6dd18c6b06 merge with master 2023-01-03 19:54:53 +01:00
Me
000987fbde ok after talking with cherif we decided not to send things like the user.id so i need to recreate more or less what i had before, but i'm gonna keep using the user.id everywhere in the back and keep my better simpler friendship.entity, working on all that now, got a thing that compiles in the front and back, a few more things to fix and then test everything 2023-01-03 19:42:14 +01:00
batche
9bfb1a6ca3 yolo bis 2023-01-03 15:20:46 +01:00
batche
3844c4df53 yolo 2023-01-03 15:18:36 +01:00
batche
5150990d6f Changement de TOUTES les occurrences d'un host ou d'un port écrits en dur dans le projet. 2023-01-03 13:47:37 +01:00
simplonco
7d358167db Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence 2023-01-03 11:41:49 +01:00
simplonco
13ace6bc6a small changes in make_env 2023-01-03 11:41:34 +01:00
batche
387e2f60b6 suppression de l'option no-cache dans le fichier docker-compose. 2023-01-03 10:51:17 +01:00
simplonco
1676de3a49 remove temp layouts access 2023-01-03 10:31:29 +01:00
batche
0be5b2c525 maintenant seul les jpg et png sont cceptés pour l'avatar 2023-01-03 01:05:23 +01:00
batche
f00fef39ba l'env fonctionne enfin pour qsvelte 2023-01-03 00:22:53 +01:00
batche
12b2ec8ce8 toujours dans l'env 2023-01-02 22:43:09 +01:00
batche
74f17a18d6 changements de l'invocation des environnements dans les fichiers svelte 2023-01-02 20:17:51 +01:00
batche
8586e15cef changements pour l'env (encore) + corrections de quelques bugs dans game_server 2023-01-02 19:20:24 +01:00
LuckyLaszlo
095108d35e Merge branch 'master' into luke 2023-01-01 22:41:25 +01:00
LuckyLaszlo
eae5b70194 GameSpectator nearly done (missing fetch matchlist from Nest)
+ matchEnded/matchAbort proper reset (replace setTimeout)
+ abort window.addEventListener('keydown/keyup', ...)
+ refactoring Game.svelte and others
+ fix $POSTGRES_PASSWORD in make_env.sh
+ Wip bug audio
2023-01-01 22:13:22 +01:00
simplonco
9fc7954919 fixed password pbm when creating env files 2023-01-01 17:28:50 +01:00
simplonco
432a7dfdd5 basic server chat action find connected users 2023-01-01 14:51:15 +01:00
simplonco
ec639f71c1 fixed some css pbm with chat msg 2022-12-31 20:28:16 +01:00
simplonco
0060f5daf7 fixed env script
+ fixed domain en port variable in svelte
2022-12-31 19:22:12 +01:00
hugogogo
8824868ff9 fix some errors in make_env, and in svelte replace instances of domain url by a variable 2022-12-30 20:45:26 +01:00
simplonco
9961c6c529 small changes in chat gateway 2022-12-30 14:29:24 +01:00
LuckyLaszlo
941b0ea7ea GameSpectator wip
+ forfeit button
+ refactoring GameSession
2022-12-30 07:16:39 +01:00
simplonco
898d27dad0 merge from master 2022-12-28 20:48:22 +01:00
simplonco
4d74e1a9a5 merge master 2022-12-28 20:29:43 +01:00
simplonco
cad9dd464c svelte architecture separation of global css and layouts and websockets init 2022-12-28 18:43:14 +01:00
simplonco
2c61864551 wip divide chat.svelte into pieces 2022-12-28 16:58:12 +01:00
batche
2e10bbf9f0 La connexion websocket fonctionne maintenant. 2022-12-28 16:54:24 +01:00
simplonco
b6203fc7b1 wip trying to connect socket 2022-12-28 16:20:07 +01:00
batche
9d4903fd1e Push pour hugo avec quelques ajouts de fichiers 2022-12-28 16:17:14 +01:00
batche
3e37a16d8c Push pour hugo avec quelques ajouts de fichiers 2022-12-28 16:09:25 +01:00
simplonco
ead4a1c264 wip adding web socket with nest 2022-12-28 14:53:05 +01:00
batche
efb9af8df9 suppression de fichiers inutiles 2022-12-28 12:23:41 +01:00