Commit Graph

Select branches

Hide Pull Requests

Brad_GraphPiece

MenuPrototype

Rapport

Rotation_piece_

delete_white_piece

master

menu-javafx

#11

#12

#13

#14

#15

#16

#17

#18

#20

#21

#24

#25

#26

#28

#3

#31

#32

#33

#34

#36

#37

#38

#39

#4

#43

#44

#45

#46

#48

#5

#52

#53

#54

#55

#56

#61

#62

#63

#64

#65

#68

#69

#71

#73

#74

#75

#76

#82

#83

#84

#85

Final

FinalReleased

archive

c585c54

Mono Color

• ce99e1faf9 Make an array for buttons and add a constructor Mat_02 2023-04-28 12:01:30 +02:00
• 075bdd9338 Sub element from Controller to a new class Mat_02 2023-04-28 11:48:31 +02:00
• 25a6782f3c beginning of the final interface Mat_02 2023-04-28 11:28:10 +02:00
• 0baef08205 Adding Array Copy for matrix Debucquoy 2023-04-27 10:04:31 +02:00
• f71675dd21 addition of vectors Debucquoy 2023-04-27 10:35:36 +02:00
• 56ed89d668 Prototype MenuPrototype Mat_02 2023-04-25 14:41:14 +02:00
• a273e7736a Basement for the menu Mat_02 2023-04-21 22:47:57 +02:00
• 9711be3665 Bug journal de bord tonitch 2023-04-21 21:00:46 +02:00
• 8749c23333 File Parser for levels (#18) tonitch 2023-04-21 20:00:15 +02:00
• d5db1b14af Merge branch 'master' of https://git.herisson.ovh/undefined_name/School_Project Mat_02 2023-04-21 15:47:23 +02:00
• ac368a6d19 Merge pull request 'rajout du prototype de menu pour le jeu' (#26) from interface-du-menu into master Mat_02 2023-04-18 13:11:42 +02:00
• 37cc19f49a fixup! Fixing Branch Brad_GraphPiece tonitch 2023-04-06 18:25:04 +02:00
• a6fc46a0ea Fixing Branch tonitch 2023-04-06 18:15:33 +02:00
• 114acc8126 first try for the menu in javafx menu-javafx Mat_02 2023-04-06 15:23:34 +02:00
• 78e50549d0 Mise à jour de 'app/src/main/java/school_project/Controller.java' BrokenBrad 2023-04-04 15:20:40 +02:00
• 00f62097f1 fix the issue about the position of the footer Mat_02 2023-04-02 23:37:35 +02:00
• d4f254139c Mise à jour de 'app/src/main/java/school_project/Controller.java' BrokenBrad 2023-03-31 00:20:47 +02:00
• fbbda476b4 Mise à jour de 'app/src/main/java/school_project/Controller.java' BrokenBrad 2023-03-30 23:59:21 +02:00
• 70fef807d5 Supprimer 'app/src/main/java/school_project/Controller.java' BrokenBrad 2023-03-30 23:58:42 +02:00
• 90f25b1c26 Ajouter 'app/src/main/java/school_project/Piece.java' BrokenBrad 2023-03-30 23:58:06 +02:00
• 5bfb2aba9b progress Eddy 2023-03-30 11:51:47 +02:00
• a99a53868b progress Eddy 2023-03-30 11:47:23 +02:00
• 592b179a19 rajout du prototype de menu pour le jeu Mat_02 2023-03-28 13:23:36 +02:00
• eeae13b339 Merge pull request 'Shape_Piece_Map' (#15) from Shape_Piece_Map into master tonitch 2023-03-28 00:31:41 +02:00
• b41714c27f Merge pull request 'Story' (#24) from Story into master Mat_02 2023-03-27 19:39:08 +02:00
• bb5e2ff401 new progress , succeded in moving the node with the mouse still not finished tho Eddy 2023-03-27 01:19:34 +02:00
• 895b20b680 new progress , succeded in moving the node with the mouse still not finished tho Eddy 2023-03-27 01:14:05 +02:00
• 7527309d79 Correction des fautes, hésité pas si il en reste Mat 2023-03-26 20:12:08 +02:00
• 5911d88918 progress with the rotation system but still not finished , it works tho Eddy 2023-03-25 18:22:47 +01:00
• 49d2c5d7ab WIP:piece graphics Eddy 2023-03-23 14:54:45 +01:00
• 0a72e6e047 Merge branch 'master' into Story tonitch 2023-03-23 14:46:20 +01:00
• 3b6234f4a1 Rajout du meeting du 23 mars Mat 2023-03-23 12:02:41 +01:00
• dd01bc96cb rajout de la syntaxe (titre)+modification day3 Mat 2023-03-23 11:32:19 +01:00
• e7d82b3076 Setting default position of vector to 0. Debucquoy 2023-03-23 11:24:34 +01:00
• bc2feee03c Merge branch 'master' into Shape_Piece_Map tonitch 2023-03-21 23:07:32 +01:00
• e4478c878c trying to fix drone again tonitch 2023-03-21 23:05:39 +01:00
• 1ef428962f Merge branch 'master' into Shape_Piece_Map tonitch 2023-03-21 21:28:23 +01:00
• c585c54da2 fixing drone c585c54 Debucquoy 2023-03-21 14:54:48 +01:00
• df457b830a Merge branch 'master' into Shape_Piece_Map tonitch 2023-03-21 14:30:53 +01:00
• bd41d24a36 Merge branch 'master' into Shape_Piece_Map Debucquoy 2023-03-21 14:21:13 +01:00
• 24df4e376c Adding Pieces positions Debucquoy 2023-03-21 14:14:39 +01:00
• 4854fef677 wip tonitch 2023-03-21 09:56:13 +01:00
• 71beb69c84 Changing addShape to AddPiece tonitch 2023-03-20 23:57:10 +01:00
• 1740ad2e13 Merge pull request 'deplacement du fichier texte de l'histoire' (#21) from Story into master tonitch 2023-03-17 15:07:48 +01:00
• 04fd342a57 deplacement du fichier texte de l'histoire Mat 2023-03-17 15:03:16 +01:00
• dfc6056767 Merge pull request 'story' (#20) from undefined_name/School_Project#8 into master tonitch 2023-03-17 14:53:46 +01:00
• 1837d976aa Merge branch 'master' into undefined_name/School_Project#8 tonitch 2023-03-17 13:40:48 +01:00
• f5bd36f4e0 premier test Mat 2023-03-16 11:01:10 +01:00
• 716e874b7e test add storie Mat 2023-03-10 11:08:00 +01:00
• 3ab6ff1bfa Merge branch 'master' of git.herisson.ovh:undefined_name/School_project Debucquoy 2023-03-04 18:59:04 +01:00
• f08ed98897 signing Debucquoy 2023-03-04 18:58:14 +01:00
• aafb5f5c66 Update 'README.md' tonitch 2023-03-04 16:15:42 +01:00
• bbfc5687d9 fix ci Debucquoy 2023-03-04 15:36:11 +01:00
• 922497573b fixup! fixup! fixup! fixup! fixup! maybe finishing ci? hopefully Debucquoy 2023-03-04 15:14:38 +01:00
• e55b17fcd8 fixup! fixup! fixup! fixup! maybe finishing ci? hopefully Debucquoy 2023-03-04 15:13:21 +01:00
• 08c4a08a01 fixup! fixup! fixup! maybe finishing ci? hopefully Debucquoy 2023-03-04 15:12:15 +01:00
• 207195c0c8 fixup! fixup! maybe finishing ci? hopefully Debucquoy 2023-03-04 15:05:17 +01:00
• ec7692f8d3 fixup! maybe finishing ci? hopefully Debucquoy 2023-03-04 14:59:37 +01:00
• 5c4dc5c370 maybe finishing ci? hopefully Debucquoy 2023-03-04 14:53:38 +01:00
• bc05260ba7 adding missing wraper Debucquoy 2023-03-04 14:21:14 +01:00
• 36c79daa4e fixup! fixup! fixup! fixup! adding drone ci Debucquoy 2023-03-04 14:05:59 +01:00
• 5a45ab43ba fixup! fixup! fixup! adding drone ci Debucquoy 2023-03-04 14:05:04 +01:00
• c70e30b629 fixup! fixup! adding drone ci Debucquoy 2023-03-04 14:00:22 +01:00
• a55dcc678a fixup! adding drone ci Debucquoy 2023-03-04 13:56:10 +01:00
• d5b8da4f21 adding drone ci Debucquoy 2023-03-04 13:49:40 +01:00
• 2ef6bdb9ed Merge pull request 'pre-commit script for linux' (#17) from pre-commit-linux-script into master tonitch 2023-03-04 10:50:39 +01:00
• 2d9a4d2aec pre-commit script for linux Debucquoy 2023-03-04 10:33:57 +01:00
• acd786744b Merge pull request 'cleaning up some stuff don't worry' (#16) from test into master tonitch 2023-03-01 23:58:50 +01:00
• 8d88f01c9d Removing Position because my brain bugged tonitch 2023-03-01 23:44:26 +01:00
• e983c5aa13 Adding Map class tonitch 2023-02-27 11:22:07 +01:00
• 498529f29a Finishing RotateRight tonitch 2023-02-27 11:05:32 +01:00
• e06abe60de Starting Piece Shape and Maps, WIP: wrong algorithm tonitch 2023-02-27 00:52:19 +01:00
• 4055f12fba Starting Window tonitch 2023-02-25 13:55:35 +01:00
• 15fe864d5a Merge pull request 'Adding idea and pref to .gitignore' (#12) from idea_to_gitignore into master tonitch 2023-02-24 13:59:28 +01:00
• cf83036c99 Merge branch 'master' into idea_to_gitignore tonitch 2023-02-24 13:59:12 +01:00
• 0cba7899ab Adding idea and pref to .gitignore tonitch 2023-02-24 13:55:29 +01:00
• 93b3a946cb Merge pull request 'ProtoBrad' (#11) from ProtoBrad into master tonitch 2023-02-24 13:35:10 +01:00
• ecbb784b0a Merge branch 'master' into ProtoBrad BrokenBrad 2023-02-24 12:30:40 +01:00
• 30388303ba Mise à jour de 'JournalDeBord/src/rapports/200223.md' BrokenBrad 2023-02-24 12:24:40 +01:00
• 424da00791 Adding meeting to the summary tonitch 2023-02-21 21:54:37 +01:00
• 46987915de Mise à jour de 'JournalDeBord/src/rapports/200223.md' BrokenBrad 2023-02-21 21:00:09 +01:00
• 4a04faac06 Mise à jour de 'JournalDeBord/src/rapports/200223.md' BrokenBrad 2023-02-21 20:53:01 +01:00
• b01572f49e Ajouter 'JournalDeBord/src/rapports/200223' BrokenBrad 2023-02-21 20:48:38 +01:00
• 55198d04e6 Merge pull request 'gradle_implementation' (#5) from gradle_implementation into master tonitch 2023-02-20 15:24:28 +01:00
• 0df803c50a Merge branch 'master' into gradle_implementation tonitch 2023-02-20 15:22:01 +01:00
• dfccb65f02 Merge pull request 'saving and loading map parser prototype' (#4) from prototype_saves into master Mat_02 2023-02-20 15:21:46 +01:00
• 40b6c8cfb4 Default gradle implementation + openjfx tonitch 2023-02-20 15:15:48 +01:00
• 0159ba196d Merge branch 'master' into prototype_saves tonitch 2023-02-20 12:39:14 +01:00
• a74c78d8a9 finishing prototype tonitch 2023-02-20 12:37:04 +01:00
• cc11b0d882 final version Mat 2023-02-19 11:50:40 +01:00
• 3b6c21f4b4 add turn piece Mat 2023-02-19 11:50:24 +01:00
• 56ee3e943c wip: menu Debucquoy 2023-02-17 17:02:34 +01:00
• 49904f8e17 Merge pull request 'Journal de bord pour ce lundi' (#3) from JDB into master tonitch 2023-02-14 18:31:28 +01:00
• c6d7e148df save parser finished Debucquoy 2023-02-14 16:27:02 +01:00
• 56cde5623e WIP: prototype for saves Debucquoy 2023-02-14 15:21:43 +01:00
• 4608208b7f add choose level and correct spelling Mat 2023-02-13 19:27:55 +01:00
• 90161800bc fixup! Première entrevue tonitch 2023-02-13 18:55:12 +01:00
• 38feaa1a16 Première entrevue tonitch 2023-02-13 18:53:37 +01:00
• 29b73a31b3 mon prototype Mat 2023-02-13 16:20:05 +01:00
• 1c34d22467 Merge pull request 'chapt2' (#1) from new_page into master Mat_02 2023-02-13 15:54:48 +01:00