183 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Debucquoy	cb54e753d7	align piece when placed	2023-05-11 11:51:53 +02:00
Anthony Debucquoy	0f1ecc753b	leaving debug printing and reseting piece position if not placed	2023-05-11 11:47:16 +02:00
Anthony Debucquoy	334e0ad99b	Piece overlap detection ... there is 3 addition: - `ArrayList getOccupation()` to get a list of all spot occupied by a piece - Fixing a bug to rotate right where width and height where inverted - Check if a piece is overlapping another when placing and refusing the placement if so	2023-05-11 11:34:50 +02:00
Anthony Debucquoy	a35d823ec4	Adding documentation	2023-05-10 23:09:57 +02:00
Anthony Debucquoy	4f821b44bc	When a piece is placed at a position, check if this space is placable and place it there.	2023-05-10 22:59:43 +02:00
Anthony Debucquoy	9aa09f8fbd	Method to add a piece to a map with it's position	2023-05-10 22:55:42 +02:00
Anthony Debucquoy	90d6d47cc8	limit piece matrix to their minimum size	2023-05-10 22:49:29 +02:00
Anthony Debucquoy	8ec5a622d8	isColumn/RowOnlyFalse	2023-05-10 20:22:20 +02:00
Anthony Debucquoy	e7c7065a8d	Adding MatrixRemoveRow/Column	2023-05-10 20:02:10 +02:00
Mat_02	a472df26ed	Merge pull request 'menu' (#43) from menu into master ... Reviewed-on: #43 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-05-09 15:52:13 +02:00
Debucquoy	24730a1362	Merge branch 'menu'	2023-05-09 13:05:53 +02:00
Mat	af3489d078	change the switchRoot method	2023-05-09 12:56:33 +02:00
Mat_02	7320fea2f9	Merge pull request 'Game UI' (#38) from gameui into master ... Reviewed-on: #38 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-09 12:51:18 +02:00
Anthony Debucquoy	60bf1fa5d0	make white space on detached pieces	2023-05-07 16:13:13 +02:00
Anthony Debucquoy	7c37c46830	Correct position on draging pieces	2023-05-07 16:13:13 +02:00
Anthony Debucquoy	6280b39c20	Cleaner code	2023-05-07 16:13:09 +02:00
Anthony Debucquoy	592780bb73	DownDate to java 11	2023-05-07 16:07:08 +02:00
Anthony Debucquoy	e3d28b21b4	Positionning on the screen ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-05-07 16:07:07 +02:00
Anthony Debucquoy	7b6291bda9	Keep the Shape Size ... Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>	2023-05-07 16:07:07 +02:00
Anthony Debucquoy	382af6b541	Piece rotation	2023-05-07 16:07:07 +02:00
Anthony Debucquoy	15e1745ad1	Adding Gap and texture	2023-05-07 16:07:07 +02:00
Anthony Debucquoy	4583bbd7e6	set default color of pieces	2023-05-07 16:07:07 +02:00
Debucquoy Anthony (tonitch)	c68e680768	Show Map and pieces shape in gameui	2023-05-07 16:07:05 +02:00
Mat	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	1af5db700e	Add the picture of background	2023-05-05 12:18:54 +02:00
Debucquoy Anthony	752c722b0c	Merge branch 'master' into menu	2023-05-05 12:11:19 +02:00
Mat	a3ad448fba	Finally finish the menu	2023-05-05 11:50:17 +02:00
Anthony Debucquoy	a7a3e8b36e	DownDate to java 11	2023-05-04 22:12:13 +02:00
Mat	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
Debucquoy Anthony	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
Debucquoy Anthony	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	a43e3b150a	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:48:49 +02:00
Mat	7ac860850c	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:47:40 +02:00
Mat	a076ca12cb	Finish initiate all the button in the gridPane For MenuLevel	2023-05-01 20:45:51 +02:00
Mat	dc5da4956a	Affichage des boutons pour les levels ok	2023-05-01 20:07:44 +02:00
Debucquoy Anthony	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
Debucquoy Anthony	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
Debucquoy Anthony	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	b4b89bcd86	Finishing MenuAcceuil	2023-05-01 16:05:59 +02:00
Mat	644af67a55	Make a package for all the Menu class	2023-05-01 12:31:27 +02:00
Mat	ee0350c251	clear CreateLevelMenu2 and all object useless in Controller	2023-04-30 13:50:44 +02:00
Mat	d455b7f450	Clear CreateLevel1 to make a new class	2023-04-30 13:44:08 +02:00
Mat	02b4ab8a35	Clear the method CreateMenu to make a new class with the same role	2023-04-30 13:07:36 +02:00
Mat	24a7a73f36	forget to update syntaxe with the array	2023-04-28 12:04:22 +02:00
Mat	ce99e1faf9	Make an array for buttons and add a constructor	2023-04-28 12:01:30 +02:00
Mat	075bdd9338	Sub element from Controller to a new class	2023-04-28 11:48:31 +02:00
Mat	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