hyper-set

Commit Graph

Select branches

Hide Pull Requests

RaphouBranche

game-view

master

server

working-game-withuout-html-card

#14

#32

#37

#47

#59

#66

#73

#84

#88

792122ffaa fix bug when shape have empty filling and an outline master remrem 2023-04-03 13:10:20 +0200
d59ce13b7b conflicts remrem 2023-04-03 12:18:40 +0200
d3823183d9 trop de choses remrem 2023-04-03 12:16:48 +0200
17d0fb6c97 Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet Bastien JACQUELIN 2023-04-03 12:07:22 +0200
bd9c12f63c deck define in the rooom page Bastien JACQUELIN 2023-04-03 12:07:13 +0200
28cd162516 Merge pull request 'card-class' (#88) from card-class into master Aurian JAULT 2023-04-03 10:49:49 +0200
9e4e206b59 opti checkattributes #88 Aurian JAULT 2023-04-03 10:49:12 +0200
ba3be75ddb add favicon on pages Bastien JACQUELIN 2023-04-03 10:43:10 +0200
ec42198642 fix end of game bug Bastien JACQUELIN 2023-04-03 10:39:49 +0200
869d0d6f89 Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet into card-class Aurian JAULT 2023-04-03 10:32:04 +0200
070a72162c update Checkqttriutes Aurian JAULT 2023-04-03 10:31:39 +0200
e54a8e652f add { Bastien JACQUELIN 2023-04-03 10:29:58 +0200
bef330d194 Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet Bastien JACQUELIN 2023-04-03 10:28:43 +0200
4cd4a11383 fix bug end of game Bastien JACQUELIN 2023-04-03 10:27:49 +0200
c7ddd44f54 just add an emoji remrem 2023-04-02 21:21:39 +0200
cc4eebe0ab zoomed form in cards and center game div remrem 2023-04-02 19:40:29 +0200
397a9de18c Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 15:43:11 +0200
11fcaadbef fix end of game Bastien JACQUELIN 2023-04-02 15:43:03 +0200
0e45e5e73d Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 15:40:24 +0200
12416b979a fix Bastien JACQUELIN 2023-04-02 15:40:15 +0200
3815ab4fb2 Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 15:39:21 +0200
71eb7e0d42 fix Bastien JACQUELIN 2023-04-02 15:38:22 +0200
8c082aaef9 Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 15:35:29 +0200
a2b05084de Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set Bastien JACQUELIN 2023-04-02 15:35:16 +0200
1868a12a4e fix Bastien JACQUELIN 2023-04-02 15:35:09 +0200
26dfe10ece Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 15:31:00 +0200
2293e6f304 tw remrem 2023-04-02 15:30:58 +0200
54d319ef6c Mise à jour de 'src/algo.js' Aurian JAULT 2023-04-02 15:30:17 +0200
7fe0e5f7f7 card horizontal -> vertical remrem 2023-04-02 15:03:28 +0200
430632932b css to be responsive (a moitié) remrem 2023-04-02 14:33:13 +0200
8f1f6cf7dd Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 13:20:32 +0200
83bf3ef838 add win message Bastien JACQUELIN 2023-04-02 13:20:12 +0200
44cce9f48b Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set remrem 2023-04-02 13:18:29 +0200
128d641657 tweaks + bug remrem 2023-04-02 13:18:19 +0200
76d2378146 fix bug, now remove the element key + value in the selectedCard array Bastien JACQUELIN 2023-04-02 13:12:30 +0200
1ff4e91de4 remove red outline when 3 card selected Bastien JACQUELIN 2023-04-01 17:51:48 +0200
2fe9c94bdd navigation between pages Bastien JACQUELIN 2023-04-01 16:25:28 +0200
02f974126e Merge pull request 'roomPage' (#84) from roomPage into master remrem 2023-03-30 12:51:51 +0200
bf237efc15 pull master + resolve conflicts #84 remrem 2023-03-30 12:49:52 +0200
4a0aed7345 add card-to-html to game.html + lots of things remrem 2023-03-30 12:47:56 +0200
a35cb61b4d editn favicon working-game-withuout-html-card Bastien JACQUELIN 2023-03-29 17:19:11 +0200
f43772694e Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet Bastien JACQUELIN 2023-03-29 17:18:10 +0200
d551f475a0 icon game-view Bastien JACQUELIN 2023-03-29 17:17:38 +0200
8c99f9408b conflict index.html ok remrem 2023-03-27 22:27:05 +0200
c73b7b6859 i want to pull master remrem 2023-03-27 22:24:02 +0200
1c22444211 Merge branch 'game-view' Bastien JACQUELIN 2023-03-27 20:16:50 +0200
3f19ac66a1 add remaining cards Bastien JACQUELIN 2023-03-22 20:11:52 +0100
aa019a020d add id room, timer etc & style Bastien JACQUELIN 2023-03-22 18:28:41 +0100
3fc90743e2 taille fixe, card se stackent Bastien JACQUELIN 2023-03-22 10:44:06 +0100
7c5a2ff4f3 need to minimize card when more than 12 Bastien JACQUELIN 2023-03-22 08:46:38 +0100
6908cc0754 display wrap, size adaptable Bastien JACQUELIN 2023-03-22 07:45:57 +0100
7c342f365c fix bug when multiple click Bastien JACQUELIN 2023-03-21 22:58:32 +0100
b478e374d5 bug to fix : add card when no set, only add 1 sometime Bastien JACQUELIN 2023-03-21 22:44:32 +0100
e2b718624c Ajout du calcul de performances RaphouBranche Raphael LACOTE 2023-03-21 21:02:15 +0100
ecc4d5aca4 check if selected cards are equal to do a set call methods of deck tu actualize deck BUG : click twice on already clicked card Bastien JACQUELIN 2023-03-21 20:59:42 +0100
176634351c doc Bastien JACQUELIN 2023-03-20 22:55:44 +0100
07e9604c2b class diagrams title update Bastien JACQUELIN 2023-03-20 18:20:50 +0100
8bf8f5575f class diagrams title update Bastien JACQUELIN 2023-03-20 18:20:29 +0100
caf579da09 Merge branch 'game-view' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set into game-view Bastien JACQUELIN 2023-03-20 18:16:03 +0100
8a37e8624d class diagrams Bastien JACQUELIN 2023-03-20 18:15:52 +0100
0e5f32f673 roomPage.html css + idk remrem 2023-03-15 15:02:47 +0100
90de25cc81 Amélioration en cours Raphael LACOTE 2023-03-15 14:53:34 +0100
24ef8900a6 Début de création de la vue high scores Raphael LACOTE 2023-03-15 14:29:12 +0100
acd360740d add deck to view, can click on cards Bastien JACQUELIN 2023-03-15 14:27:31 +0100
8c7921d611 update game show Bastien JACQUELIN 2023-03-13 20:48:07 +0100
d49436d413 Merge branch 'game-view' of https://codefirst.iut.uca.fr/git/HyperSet/hyper-set into game-view Bastien JACQUELIN 2023-03-13 20:20:15 +0100
7cdd4d4ac0 merge conflirs Bastien JACQUELIN 2023-03-13 20:20:07 +0100
ec7d2f2d81 Merge branch 'game-view' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet into game-view Bastien JACQUELIN 2023-03-13 19:18:41 +0100
6b04c11beb rebuild architecture Bastien JACQUELIN 2023-03-13 20:15:37 +0100
4bb5dd45a0 edit modules Bastien JACQUELIN 2023-03-13 19:18:33 +0100
61217ca181 Merge pull request 'RaphouBranche' (#73) from RaphouBranche into master Raphael LACOTE 2023-03-13 16:55:47 +0100
c1b57e318f Merge branch 'master' into RaphouBranche #73 Raphael LACOTE 2023-03-13 16:53:39 +0100
cc7ccb16a2 Supression d'éléments inutiles Raphael LACOTE 2023-03-13 16:52:47 +0100
1f1e0a1aaa Pages terminé (enfin normalement) Raphael LACOTE 2023-03-13 16:40:31 +0100
73497d3c5e Page tutorial avec image Raphael LACOTE 2023-03-13 16:33:26 +0100
5a68199adb rewrite all tests cards with new constructor remrem 2023-03-13 16:29:32 +0100
1177bb3889 a lot of things: repair code, room.css ... remrem 2023-03-13 16:24:47 +0100
ef22a1ab3d affichage des différentes cartes Bastien JACQUELIN 2023-03-13 15:32:31 +0100
7ee4d17776 module card & deck Bastien JACQUELIN 2023-03-13 15:13:52 +0100
e3e5d1320f Création de la vue tutorial Raphael LACOTE 2023-03-13 11:03:36 +0100
50b50ac8f0 Merge pull request 'Hyperset3' (#66) from Hyperset3 into master Raphael LACOTE 2023-03-13 10:36:54 +0100
18fc9d86d0 Merge branch 'master' into Hyperset3 #66 Raphael LACOTE 2023-03-13 10:33:45 +0100
b35f4b15dd Ca marche !!! Vive les pingouins Raphael LACOTE 2023-03-08 12:21:30 +0100
205de31c1c create game page Bastien JACQUELIN 2023-03-07 17:34:38 +0100
d51368dc3e create room.html + room.css remrem 2023-03-07 17:25:57 +0100
66498cf227 Les tests remarchent Raphael LACOTE 2023-03-07 17:24:37 +0100
6a564d3f60 pb trouveelements Bastien JACQUELIN 2023-03-07 16:31:53 +0100
bb8a27017b edit const Bastien JACQUELIN 2023-03-07 16:16:44 +0100
515d42739e Merge branch 'master' of https://codefirst.iut.uca.fr/git/HyperSet/HyperSet Bastien JACQUELIN 2023-03-07 16:01:17 +0100
a7b7533f4c add viewJS to project Bastien JACQUELIN 2023-03-07 16:01:04 +0100
d3b72a91f7 Merge pull request 'home-page(rem)' (#59) from home-page(rem) into master remrem 2023-03-07 15:58:29 +0100
577375fae9 resolve conflicts #59 remrem 2023-03-07 15:40:30 +0100
809f00cba1 idk wtf all these changements are remrem 2023-03-07 15:31:14 +0100
3d45e10f1b Merge branch 'card-class' Bastien JACQUELIN 2023-03-06 23:19:46 +0100
0fe3e6f05a Merge branch 'master' into card-class Bastien JACQUELIN 2023-03-06 23:15:41 +0100
e0d33fe2f8 Mise à jour de 'src/Model/Const.js' Bastien JACQUELIN 2023-03-06 23:12:27 +0100
68fbfc3ab0 Mise à jour de 'src/Console/main.js' Bastien JACQUELIN 2023-03-06 23:08:56 +0100
e56dd34a4f Mise à jour de 'src/Console/main.js' Bastien JACQUELIN 2023-03-06 23:08:50 +0100
8b1a51cb40 deck and factory work together, resolve pbs Bastien JACQUELIN 2023-03-06 23:02:50 +0100
6e6826efb5 line 677 in deck to edit, all functional Bastien JACQUELIN 2023-03-06 23:01:56 +0100