29 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tonitch	752c722b0c	Merge branch 'master' into menu	2023-05-05 12:11:19 +02:00
tonitchandDebucquoy	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
tonitchandDebucquoy	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
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
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
tonitch	0a72e6e047	Merge branch 'master' into Story	2023-03-23 14:46:20 +01:00
tonitch	bc2feee03c	Merge branch 'master' into Shape_Piece_Map	2023-03-21 23:07:32 +01:00
tonitch	1ef428962f	Merge branch 'master' into Shape_Piece_Map	2023-03-21 21:28:23 +01:00
tonitch	df457b830a	Merge branch 'master' into Shape_Piece_Map	2023-03-21 14:30:53 +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
tonitch	dfc6056767	Merge pull request 'story' (#20) from undefined_name/School_Project#8 into master ... Reviewed-on: #20	2023-03-17 14:53:46 +01:00
tonitch	1837d976aa	Merge branch 'master' into undefined_name/School_Project#8	2023-03-17 13:40:48 +01:00
tonitch	aafb5f5c66	Update 'README.md'	2023-03-04 16:15:42 +01:00
tonitch	2ef6bdb9ed	Merge pull request 'pre-commit script for linux' (#17) from pre-commit-linux-script into master ... Reviewed-on: #17	2023-03-04 10:50:39 +01:00
tonitch	acd786744b	Merge pull request 'cleaning up some stuff don't worry' (#16) from test into master ... Reviewed-on: #16	2023-03-01 23:58:50 +01:00
tonitch	15fe864d5a	Merge pull request 'Adding idea and pref to .gitignore' (#12) from idea_to_gitignore into master ... Reviewed-on: #12	2023-02-24 13:59:28 +01:00
tonitch	cf83036c99	Merge branch 'master' into idea_to_gitignore	2023-02-24 13:59:12 +01:00
tonitch	93b3a946cb	Merge pull request 'ProtoBrad' (#11) from ProtoBrad into master ... Reviewed-on: #11 Reviewed-by: Mat_02 <diletomatteo@gmail.com> Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-02-24 13:35:10 +01:00
tonitch	424da00791	Adding meeting to the summary ... This is the file for the menu on the right of the screen. Signed-off-by: Debucquoy Anthony <d.tonitch@gmail.com>	2023-02-21 21:54:37 +01:00
tonitch	55198d04e6	Merge pull request 'gradle_implementation' (#5) from gradle_implementation into master ... Reviewed-on: #5	2023-02-20 15:24:28 +01:00
tonitch	0df803c50a	Merge branch 'master' into gradle_implementation	2023-02-20 15:22:01 +01:00
tonitch	0159ba196d	Merge branch 'master' into prototype_saves	2023-02-20 12:39:14 +01:00
tonitch	49904f8e17	Merge pull request 'Journal de bord pour ce lundi' (#3) from JDB into master ... Reviewed-on: #3 Reviewed-by: Mat_02 <diletomatteo@gmail.com> Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>	2023-02-14 18:31:28 +01:00
tonitch	7af26415f0	chapt2	2023-02-13 15:51:48 +01:00
tonitch	a3fcbdee3c	Initial commit	2023-02-09 17:08:22 +01:00