Commit Graph

88 Commits

Author SHA1 Message Date
03beebaeaf escape on the menu quit the game
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-20 12:45:52 +02:00
c7fe7853b4 Merge pull request 'restructuration des fichiers' (#84) from restructuration into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #84
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-20 12:32:10 +02:00
35c7ecf471 Merge pull request 'Random rotation to generated maps' (#83) from randomPieceRotation into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #83
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-20 12:31:53 +02:00
0bb327abb2
restructuration des fichiers
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-19 16:44:45 +02:00
621be3af64
removing smap from the console
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-19 16:30:02 +02:00
7467abfd11
Random rotation to generated maps
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-19 14:55:48 +02:00
d52d1cab77 Clean the pieces position when restarting the game
All checks were successful
continuous-integration/drone/push Build is passing
without that, the old pieces where still in game and this would break
the gameplay
2023-05-19 00:32:44 +02:00
9bc66ad6b1 Solve the position problem
All checks were successful
continuous-integration/drone/push Build is passing
The position was set to (70,76) for all floating pieces because it was
the value received.
nowk, if thes values are given (for the characters F & L as specified in
the specification in the rapport), the piece is set in a floating state
(position = null)
2023-05-19 00:32:26 +02:00
41be423f94 Draw the piece at their places at the start of the level
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-19 00:32:12 +02:00
774c594cb8
avoid too bright colors
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-18 19:46:19 +02:00
fed275ba09 Make a Button to load the previous game done by the player in case if he want to do it one more time(#73)
All checks were successful
continuous-integration/drone/push Build is passing
Make a Button to load the previous game done by the player in case if he want to do it one more time

Co-authored-by: Mat <diletomatteo@gmail.com>
Reviewed-on: #73
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-18 19:31:47 +02:00
8c8dacadd0
Bug Correction, Load Button linked
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-18 19:24:01 +02:00
a726019b18
lock fullscreen
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-18 19:11:43 +02:00
391d94afbe Make a screen when the player finish the level (#64)
All checks were successful
continuous-integration/drone/push Build is passing
Make a screen when the level is finish and also change the button play for select a difficulty

Co-authored-by: Mat <diletomatteo@gmail.com>
Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: #64
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-18 19:03:53 +02:00
7bd43062d0 Make a Button to load the previous game (#68)
All checks were successful
continuous-integration/drone/push Build is passing
A simple button to load a previous game

Co-authored-by: Mat <diletomatteo@gmail.com>
Reviewed-on: #68
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-18 18:36:25 +02:00
4c185f0a81 saveLevel (#69)
All checks were successful
continuous-integration/drone/push Build is passing
Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: #69
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-18 18:32:16 +02:00
ac6c8611e7 Adding all levels + linking buttons
All checks were successful
continuous-integration/drone/push Build is passing
to create new level just do

`gradle -q --console plain -PmainClass=school_project.Parsers.FileParserFactory run`

Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: #56
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
2023-05-17 23:42:44 +02:00
ff167b4d0f deleting piece position when clicked to avoid fantom pieces
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-17 23:41:55 +02:00
34ea408202 stop piece screen overflow
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-17 22:38:00 +02:00
c9fdb4a7db removing println to stop spamming the console
All checks were successful
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
All checks were successful
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
Mat
aecbf2cb9a add a comment and delete space useless
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-16 10:35:46 +02:00
Mat
178d076883 change acceuil to accueil
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-15 23:58:12 +02:00
Mat
16d2c89e95 Make the code to sub a piece alone without link to others pieces
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-15 19:31:21 +02:00
3dd1b6b059
Less Small Pieces
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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.
All checks were successful
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
All checks were successful
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'
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-09 13:05:53 +02:00
Mat
af3489d078 change the switchRoot method
Some checks failed
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
All checks were successful
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