150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mat	5593f1834a	Link the choiceBox to some Action but doesn't generate level :')	2023-05-17 21:28:58 +02:00
Mat	e1f7d7a729	Branch done	2023-05-17 20:34:49 +02:00
Mat	1df3918718	Change a simple button to a choiceBox	2023-05-17 20:27:45 +02:00
Mat	c867ff70ce	Add some space	2023-05-17 19:40:24 +02:00
Mat	d2f3f71976	Make a ScreenLevelFinish and add a picture for the background	2023-05-17 19:30:46 +02:00
Mat_02	3d4730cfc0	Merge pull request 'change acceuil to accueil' (#55) from Acceuil_to_Accueil into master ... Reviewed-on: #55 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-05-16 20:25:57 +02:00
Mat_02	518a37ba8c	Merge pull request 'correct_lonely_piece' (#54) from correct_lonely_piece into master ... Reviewed-on: #54 Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-05-16 20:25:31 +02:00
Mat	aecbf2cb9a	add a comment and delete space useless	2023-05-16 10:35:46 +02:00
Mat	178d076883	change acceuil to accueil	2023-05-15 23:58:12 +02:00
Mat	16d2c89e95	Make the code to sub a piece alone without link to others pieces	2023-05-15 19:31:21 +02:00
Anthony Debucquoy	3dd1b6b059	Less Small Pieces	2023-05-12 11:38:21 +02:00
Debucquoy Anthony	3e4b4d257e	Merge pull request 'This commit will align piece to their in game position' (#48) from pieceDrawing into master ... Reviewed-on: #48 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-11 20:09:46 +02:00
Debucquoy Anthony	d389b22f2d	Merge pull request 'Place pieces on the board' (#46) from pieceInteraction into master ... Reviewed-on: #46 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-11 20:09:23 +02:00
Debucquoy Anthony	9fabc8128b	Merge pull request 'Set the matrix size of a new piece to its minimum size' (#45) from matrixMinimumSize into master ... Reviewed-on: #45 Reviewed-by: Mat_02 <diletomatteo@gmail.com>	2023-05-11 20:08:39 +02:00
Anthony Debucquoy	def25d9e38	Check if the baord is completed and return to main menu	2023-05-11 12:24:56 +02:00
Anthony Debucquoy	e424cdca4e	selected piece get to the front	2023-05-11 12:01:59 +02:00
Anthony Debucquoy	201eb3ec10	avoid piece to be placed when right clicking	2023-05-11 11:56:00 +02:00
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