Commit Graph

155 Commits

Author SHA1 Message Date
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
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
Me
1a584483e7 trying to work out 2fa 2022-12-07 12:12:33 +01:00
Me
baa9465018 merging 2022-12-07 11:56:27 +01:00
batche
f835f74443 Ajout des fichiers de lucky + quelques corrections mineures sur l'auth (2FA) et le flow pour le user 2022-12-07 11:50:39 +01:00
Me
263d117d1a about to pull new updates from Cherif 2022-12-07 11:50:33 +01:00
Me
657460b8ae ok so i added the fetch(user) in the conditions of the routing, works just fine, but still need to add some stuff, like passing on params and special conditions for special pages 2022-12-06 16:56:35 +01:00
LuckyLaszlo
6985d2218f minor wsServer changes
("for...of" loop replace a "map.forEach" to make early break possible)
2022-12-06 07:40:15 +01:00
LuckyLaszlo
38c0acb917 mp3 replaced by ogg
+ value of radio button discared, because never used
2022-12-06 04:12:25 +01:00
LuckyLaszlo
4be38c59e8 HTML sound selector 2022-12-06 03:53:44 +01:00
LuckyLaszlo
9dde821f67 HTML game modes selector
+ pong.css in a separate file
2022-12-06 01:56:39 +01:00
Me
c79d6f9b7d ok so trying to get the {wrap} to do what i want for the routing, but the store and local storage aren't complying, something about a Forbidden Resource, either way seems like i need to scrap the store entirely and go with the fetch(user) in the {wrap} each time anyway, for security, and also cuz that works 2022-12-05 05:55:43 +01:00
Me
450f6873a6 ok so it still works, the settings work more or less properly, and they look better, tho still kinda shit 2022-12-05 03:15:57 +01:00
Me
e9e4f564eb Ok about to do some clean up 2022-12-04 21:55:14 +01:00
LuckyLaszlo
7355a70821 minors GameComponents changes 2022-12-04 19:05:21 +01:00
LuckyLaszlo
59c7ae2a16 added alternate game mode "movingWalls" 2022-12-02 21:01:06 +01:00
Me
ce7d75a954 ok everything still works, now can see the avatar, working on better ProfileSettings 2022-12-01 22:46:34 +01:00
Me
042053ee2b great news, the new svelte store that is connected to the local storage works great, not only do i always know if a user is logged in but i have their user data too 2022-12-01 21:48:38 +01:00
Me
92acf36962 so far this works, in the middle of adding a new store that connects to local storage 2022-12-01 21:02:43 +01:00
LuckyLaszlo
93a40f2ad9 memo.txt update 2022-12-01 18:20:58 +01:00
LuckyLaszlo
f73932c131 multiBalls refactoring with ballsArr[] 2022-12-01 17:48:34 +01:00
Me
f8095c7ec6 oops i did some work directly on master, but it's still stable so should be fine 2022-12-01 16:27:56 +01:00
LuckyLaszlo
c8c3111ed4 WIP multiBalls (need refactoring) 2022-12-01 15:55:40 +01:00
LuckyLaszlo
6e572f2fb5 matchmaking rework for multiples game modes 2022-12-01 05:50:31 +01:00
Me
4cff63e264 moved files around make more logical folders, got some 502 errors turns out VSCode isn't magic, you just need to go through all the files and make sure the import paths are right 2022-12-01 00:06:34 +01:00
Me
6f7361a5dd well i tried a bunch of things to fix the CSS, most did not work, will need some help 2022-11-30 23:32:11 +01:00
Me
fc9c72b6b3 well i finally got the glittery stars animation to work for the ProfileDisplay page, cool 2022-11-30 22:42:43 +01:00