110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mat_02	a043cb487f	Correct all thing say expect the one about switchRoot I didn't understand (Btw add some comment)	2023-05-06 21:45:56 +02:00
Mat_02	1af5db700e	Add the picture of background	2023-05-05 12:18:54 +02:00
tonitch	752c722b0c	Merge branch 'master' into menu	2023-05-05 12:11:19 +02:00
Mat_02	a3ad448fba	Finally finish the menu	2023-05-05 11:50:17 +02:00
tonitch	a7a3e8b36e	DownDate to java 11	2023-05-04 22:12:13 +02:00
Mat_02	8110a93910	Make operational and also organize all the buttons	2023-05-04 18:22:23 +02:00
Debucquoy	53972cd1ef	Merge branch 'master' of git.herisson.ovh:undefined_name/School_project	2023-05-04 15:40:31 +02:00
Debucquoy	de146b216d	Down to java11	2023-05-04 15:40:05 +02:00
tonitch	f1519ba40c	levelMaker (#36) ... This is a really simple and not efficient level Maker to build levels. you have to run the main method in FileParserFacotry.java with your idea and respond to all the questions. it's painfully slow but less than doing it by hand on a paper I guess. I added level11.level as an example for where to put the level when finished. To access it you have to do: `new File(getClass().getResources("level11.level").getFile())` and put it into `FileParserFactory.loadMapFromFile(File f)` Co-authored-by: Debucquoy <debucqquoy.anthony@gmail.com> Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com> Reviewed-on: #36 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-03 17:29:10 +02:00
tonitch	72dcbcbf4f	Adding Color to pieces (#31) ... Just adding a color field to pieces for drawing later Carefull when you review, I also moved Vec2 to Utils where I feel it belong. Solve #29 Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com> Reviewed-on: #31 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-03 17:27:10 +02:00
Mat_02	a43e3b150a	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:48:49 +02:00
Mat_02	7ac860850c	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:47:40 +02:00
Mat_02	a076ca12cb	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:45:51 +02:00
Mat_02	dc5da4956a	Affichage des boutons pour les levels ok	2023-05-01 20:07:44 +02:00
tonitch	c6df656381	MapGenerator (#34) ... This generate maps following a simple structure First we choose map size depending on the difficulty we grind the edge with a random pattern so the map is not just a square we pick a random open piece and try to make a piece out of it between a size of 1 to 3 and we do this in a loop until all open spaces are filled this is not the best but it's efficient known problem: - We can have sometime a lot of small pieces - We can have weird shape, for instance pieces that are only connected by corner I think this is technically not a problem in the end. but this could be changed Co-authored-by: Debucquoy <debucqquoy.anthony@gmail.com> Reviewed-on: #34 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-01 18:38:52 +02:00
tonitch	692e22b5b9	Merge pull request 'Adding Array Copy for matrix' (#33) from ArrayDeepCopy into master ... Reviewed-on: #33 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-01 17:53:54 +02:00
tonitch	f21c036b1c	Merge pull request 'addition of vectors' (#32) from Vec2Upgrade into master ... Reviewed-on: #32 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-01 17:53:05 +02:00
Mat_02	b4b89bcd86	Finishing MenuAcceuil	2023-05-01 16:05:59 +02:00
Mat_02	644af67a55	Make a package for all the Menu class	2023-05-01 12:31:27 +02:00
Mat_02	ee0350c251	clear CreateLevelMenu2 and all object useless in Controller	2023-04-30 13:50:44 +02:00
Mat_02	d455b7f450	Clear CreateLevel1 to make a new class	2023-04-30 13:44:08 +02:00
Mat_02	02b4ab8a35	Clear the method CreateMenu to make a new class with the same role	2023-04-30 13:07:36 +02:00
Mat_02	24a7a73f36	forget to update syntaxe with the array	2023-04-28 12:04:22 +02:00
Mat_02	ce99e1faf9	Make an array for buttons and add a constructor	2023-04-28 12:01:30 +02:00
Mat_02	075bdd9338	Sub element from Controller to a new class	2023-04-28 11:48:31 +02:00
Mat_02	25a6782f3c	beginning of the final interface	2023-04-28 11:28:10 +02:00
Debucquoy	0baef08205	Adding Array Copy for matrix ... Currently only boolean but we can add more if we need	2023-04-27 11:16:31 +02:00
Debucquoy	f71675dd21	addition of vectors ... Vector to string	2023-04-27 11:09:56 +02:00
tonitch	9711be3665	Bug journal de bord	2023-04-21 21:00:46 +02:00
tonitch	8749c23333	File Parser for levels (#18) ... Co-authored-by: Debucquoy Anthony (tonitch) <debucquoy.anthony@gmail.com> Reviewed-on: #18 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-04-21 20:00:15 +02:00
Mat_02	ac368a6d19	Merge pull request 'rajout du prototype de menu pour le jeu' (#26) from interface-du-menu into master ... Reviewed-on: #26 Reviewed-by: BrokenBrad <eddyjiofak@gmail.com> Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-04-18 13:11:42 +02:00
Mat_02	00f62097f1	fix the issue about the position of the footer	2023-04-02 23:37:35 +02:00
Mat_02	592b179a19	rajout du prototype de menu pour le jeu	2023-03-28 13:23:36 +02:00
tonitch	eeae13b339	Merge pull request 'Shape_Piece_Map' (#15) from Shape_Piece_Map into master ... Reviewed-on: #15 Reviewed-by: BrokenBrad <eddyjiofak@gmail.com> Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-03-28 00:31:41 +02:00
Mat_02	b41714c27f	Merge pull request 'Story' (#24) from Story into master ... Reviewed-on: #24 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com> Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>	2023-03-27 19:39:08 +02:00
Mat	7527309d79	Correction des fautes, hésité pas si il en reste	2023-03-26 20:12:08 +02:00
tonitch	0a72e6e047	Merge branch 'master' into Story	2023-03-23 14:46:20 +01:00
Mat	3b6234f4a1	Rajout du meeting du 23 mars	2023-03-23 12:02:41 +01:00
Mat	dd01bc96cb	rajout de la syntaxe (titre)+modification day3	2023-03-23 11:32:19 +01:00
Debucquoy	e7d82b3076	Setting default position of vector to 0.	2023-03-23 11:24:34 +01:00
tonitch	bc2feee03c	Merge branch 'master' into Shape_Piece_Map	2023-03-21 23:07:32 +01:00
tonitch	e4478c878c	trying to fix drone again	2023-03-21 23:05:39 +01:00
tonitch	1ef428962f	Merge branch 'master' into Shape_Piece_Map	2023-03-21 21:28:23 +01:00
Debucquoy	c585c54da2	fixing drone c585c54	2023-03-21 14:54:48 +01:00
tonitch	df457b830a	Merge branch 'master' into Shape_Piece_Map	2023-03-21 14:30:53 +01:00
Debucquoy	bd41d24a36	Merge branch 'master' into Shape_Piece_Map	2023-03-21 14:21:13 +01:00
Debucquoy	24df4e376c	Adding Pieces positions	2023-03-21 14:14:39 +01:00
tonitch	4854fef677	wip ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-03-21 09:56:13 +01:00
tonitch	71beb69c84	Changing addShape to AddPiece ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-03-20 23:57:10 +01:00
tonitch	1740ad2e13	Merge pull request 'deplacement du fichier texte de l'histoire' (#21) from Story into master ... Reviewed-on: #21 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-03-17 15:07:48 +01:00