Commit Graph

108 Commits

Author SHA1 Message Date
a796fbf504
Positionning on the screen
Some checks failed
continuous-integration/drone/push Build is failing
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-05-04 13:14:10 +02:00
94be15100d
Keep the Shape Size
Some checks failed
continuous-integration/drone/push Build is failing
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-05-04 13:12:22 +02:00
64f77d870d
Piece rotation
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-03 18:21:54 +02:00
31314749d2
Adding Gap and texture
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-03 17:46:26 +02:00
Mat
456128c904
Finish initiate all the button in the gridPane For MenuLevel 2023-05-03 17:46:26 +02:00
Mat
0273703cbb
Finish initiate all the button in the gridPane For MenuLevel 2023-05-03 17:46:26 +02:00
Mat
7c28326408
Finish initiate all the button in the gridPane For MenuLevel 2023-05-03 17:46:26 +02:00
Mat
76a4525329
Affichage des boutons pour les levels ok 2023-05-03 17:46:26 +02:00
Mat
40eb5bd58a
Finishing MenuAcceuil 2023-05-03 17:46:26 +02:00
Mat
f41c073b41
Make a package for all the Menu class 2023-05-03 17:46:26 +02:00
Mat
89a6b09ea9
clear CreateLevelMenu2 and all object useless in Controller 2023-05-03 17:46:25 +02:00
Mat
09c4e87534
Clear CreateLevel1 to make a new class 2023-05-03 17:46:25 +02:00
Mat
b259ca8ad6
Clear the method CreateMenu to make a new class with the same role 2023-05-03 17:46:25 +02:00
Mat
4cf6fff9af
forget to update syntaxe with the array 2023-05-03 17:46:25 +02:00
Mat
dd76f4c0df
Make an array for buttons and add a constructor 2023-05-03 17:46:25 +02:00
Mat
c0f8871487
Sub element from Controller to a new class 2023-05-03 17:46:25 +02:00
c2857fb88a
set default color of pieces 2023-05-03 17:46:25 +02:00
0bab3fbef6
Show Map and pieces shape in gameui 2023-05-03 17:45:51 +02:00
Mat
4f927cbf9d
beginning of the final interface 2023-05-03 17:45:49 +02:00
f1519ba40c levelMaker (#36)
All checks were successful
continuous-integration/drone/push Build is passing
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
72dcbcbf4f Adding Color to pieces (#31)
All checks were successful
continuous-integration/drone/push Build is passing
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
c6df656381 MapGenerator (#34)
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
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
692e22b5b9 Merge pull request 'Adding Array Copy for matrix' (#33) from ArrayDeepCopy into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-01 17:53:54 +02:00
f21c036b1c Merge pull request 'addition of vectors' (#32) from Vec2Upgrade into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-01 17:53:05 +02:00
Debucquoy
0baef08205
Adding Array Copy for matrix
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Currently only boolean but we can add more if we need
2023-04-27 11:16:31 +02:00
Debucquoy
f71675dd21
addition of vectors
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Vector to string
2023-04-27 11:09:56 +02:00
9711be3665 Bug journal de bord
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-21 21:00:46 +02:00
8749c23333 File Parser for levels (#18)
All checks were successful
continuous-integration/drone/push Build is passing
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
ac368a6d19 Merge pull request 'rajout du prototype de menu pour le jeu' (#26) from interface-du-menu into master
All checks were successful
continuous-integration/drone/push Build is passing
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
00f62097f1 fix the issue about the position of the footer
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-04-02 23:37:35 +02:00
Mat
592b179a19 rajout du prototype de menu pour le jeu
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-28 13:23:36 +02:00
eeae13b339 Merge pull request 'Shape_Piece_Map' (#15) from Shape_Piece_Map into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-03-28 00:31:41 +02:00
b41714c27f Merge pull request 'Story' (#24) from Story into master
All checks were successful
continuous-integration/drone/push Build is passing
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
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-26 20:12:08 +02:00
0a72e6e047 Merge branch 'master' into Story
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-23 14:46:20 +01:00
Mat
3b6234f4a1 Rajout du meeting du 23 mars
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-23 12:02:41 +01:00
Mat
dd01bc96cb rajout de la syntaxe (titre)+modification day3
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-23 11:32:19 +01:00
Debucquoy
e7d82b3076
Setting default position of vector to 0.
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-23 11:24:34 +01:00
bc2feee03c Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 23:07:32 +01:00
e4478c878c
trying to fix drone again
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-21 23:05:39 +01:00
1ef428962f Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 21:28:23 +01:00
Debucquoy
c585c54da2
fixing drone
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2023-03-21 14:54:48 +01:00
df457b830a Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 14:30:53 +01:00
Debucquoy
bd41d24a36
Merge branch 'master' into Shape_Piece_Map
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-21 14:21:13 +01:00
Debucquoy
24df4e376c
Adding Pieces positions 2023-03-21 14:14:39 +01:00
4854fef677
wip
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-03-21 09:56:13 +01:00
71beb69c84
Changing addShape to AddPiece
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-03-20 23:57:10 +01:00
1740ad2e13 Merge pull request 'deplacement du fichier texte de l'histoire' (#21) from Story into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-03-17 15:07:48 +01:00
Mat
04fd342a57 deplacement du fichier texte de l'histoire
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-17 15:03:16 +01:00
dfc6056767 Merge pull request 'story' (#20) from undefined_name/School_Project#8 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-03-17 14:53:46 +01:00