34ea408202
stop piece screen overflow
continuous-integration/drone/push Build is passing
2023-05-17 22:38:00 +02:00
c9fdb4a7db
removing println to stop spamming the console
continuous-integration/drone/push Build is passing
2023-05-17 20:43:20 +02:00
3d4730cfc0
Merge pull request 'change acceuil to accueil' ( #55 ) from Acceuil_to_Accueil into master
...
continuous-integration/drone/push Build is passing
Reviewed-on: #55
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-16 20:25:57 +02:00
aecbf2cb9a
add a comment and delete space useless
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-16 10:35:46 +02:00
178d076883
change acceuil to accueil
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-15 23:58:12 +02:00
16d2c89e95
Make the code to sub a piece alone without link to others pieces
continuous-integration/drone/push Build is passing
2023-05-15 19:31:21 +02:00
3dd1b6b059
Less Small Pieces
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-12 11:38:21 +02:00
3e4b4d257e
Merge pull request 'This commit will align piece to their in game position' ( #48 ) from pieceDrawing into master
...
continuous-integration/drone/push Build is passing
Reviewed-on: #48
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-11 20:09:46 +02:00
d389b22f2d
Merge pull request 'Place pieces on the board' ( #46 ) from pieceInteraction into master
...
continuous-integration/drone/push Build is passing
Reviewed-on: #46
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-11 20:09:23 +02:00
9fabc8128b
Merge pull request 'Set the matrix size of a new piece to its minimum size' ( #45 ) from matrixMinimumSize into master
...
continuous-integration/drone/push Build is passing
Reviewed-on: #45
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-11 20:08:39 +02:00
def25d9e38
Check if the baord is completed and return to main menu
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-11 12:24:56 +02:00
e424cdca4e
selected piece get to the front
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-11 12:01:59 +02:00
201eb3ec10
avoid piece to be placed when right clicking
2023-05-11 11:56:00 +02:00
cb54e753d7
align piece when placed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-11 11:51:53 +02:00
0f1ecc753b
leaving debug printing and reseting piece position if not placed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-11 11:47:16 +02:00
334e0ad99b
Piece overlap detection
...
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
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
a35d823ec4
Adding documentation
continuous-integration/drone/push Build is passing
2023-05-10 23:09:57 +02:00
4f821b44bc
When a piece is placed at a position, check if this space is placable and place it there.
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-10 22:59:43 +02:00
9aa09f8fbd
Method to add a piece to a map with it's position
2023-05-10 22:55:42 +02:00
90d6d47cc8
limit piece matrix to their minimum size
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-10 22:49:29 +02:00
8ec5a622d8
isColumn/RowOnlyFalse
2023-05-10 20:22:20 +02:00
e7c7065a8d
Adding MatrixRemoveRow/Column
2023-05-10 20:02:10 +02:00
Debucquoy
24730a1362
Merge branch 'menu'
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-09 13:05:53 +02:00
af3489d078
change the switchRoot method
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is passing
2023-05-09 12:56:33 +02:00
60bf1fa5d0
make white space on detached pieces
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-07 16:13:13 +02:00
7c37c46830
Correct position on draging pieces
2023-05-07 16:13:13 +02:00
6280b39c20
Cleaner code
2023-05-07 16:13:09 +02:00
592780bb73
DownDate to java 11
2023-05-07 16:07:08 +02:00
e3d28b21b4
Positionning on the screen
...
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-05-07 16:07:07 +02:00
7b6291bda9
Keep the Shape Size
...
Signed-off-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2023-05-07 16:07:07 +02:00
382af6b541
Piece rotation
2023-05-07 16:07:07 +02:00
15e1745ad1
Adding Gap and texture
2023-05-07 16:07:07 +02:00
4583bbd7e6
set default color of pieces
2023-05-07 16:07:07 +02:00
c68e680768
Show Map and pieces shape in gameui
2023-05-07 16:07:05 +02:00
a043cb487f
Correct all thing say expect the one about switchRoot I didn't understand (Btw add some comment)
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-06 21:45:56 +02:00
1af5db700e
Add the picture of background
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-05 12:18:54 +02:00
752c722b0c
Merge branch 'master' into menu
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-05 12:11:19 +02:00
a3ad448fba
Finally finish the menu
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-05 11:50:17 +02:00
a7a3e8b36e
DownDate to java 11
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-04 22:12:13 +02:00
8110a93910
Make operational and also organize all the buttons
continuous-integration/drone/push Build is passing
2023-05-04 18:22:23 +02:00
f1519ba40c
levelMaker ( #36 )
...
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 )
...
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
a43e3b150a
Finish initiate all the button in the gridPane For MenuLevel
continuous-integration/drone/push Build is failing
2023-05-01 20:48:49 +02:00
7ac860850c
Finish initiate all the button in the gridPane For MenuLevel
2023-05-01 20:47:40 +02:00
a076ca12cb
Finish initiate all the button in the gridPane For MenuLevel
2023-05-01 20:45:51 +02:00
dc5da4956a
Affichage des boutons pour les levels ok
2023-05-01 20:07:44 +02:00
c6df656381
MapGenerator ( #34 )
...
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
...
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
b4b89bcd86
Finishing MenuAcceuil
2023-05-01 16:05:59 +02:00
644af67a55
Make a package for all the Menu class
2023-05-01 12:31:27 +02:00