Commit Graph

171 Commits

Author SHA1 Message Date
Mat_02 229782c772 Corriger qlq faute vu sur relecture
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-19 23:28:27 +02:00
Mat_02 2d27786e48 Make conclusion and correct some accent
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-19 23:06:18 +02:00
Mat_02 3bcfdfc084 Add some explain about MapGenerator
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-19 22:12:17 +02:00
Mat_02 878caf1c99 Add Apport Positifs et négatifs 2023-05-19 20:25:58 +02:00
Mat_02 9671f8ec53 Add Point forts
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-05-19 15:32:50 +02:00
Mat_02 2d4462735a Add Point faibles dans le rapport 2023-05-19 15:32:50 +02:00
tonitch 59fd891fd9 minor corrections
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-19 14:46:17 +02:00
tonitch e6853ab3d3 Parser de fichier + Consignes de base
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-19 10:20:11 +02:00
tonitch ff5ed0c85f correction fautes 2023-05-19 10:20:11 +02:00
tonitch 0330303129 Avancement global
- Section Personelle
- Generateur de niveaux
- Organisation
2023-05-19 10:20:11 +02:00
tonitch 0354679969 File Parser 2023-05-19 10:20:11 +02:00
tonitch 714e904d1c Base de Rapport 2023-05-19 10:20:10 +02:00
tonitch d52d1cab77 Clean the pieces position when restarting the game
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
tonitch 9bc66ad6b1 Solve the position problem
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
tonitch 41be423f94 Draw the piece at their places at the start of the level
continuous-integration/drone/push Build is passing
2023-05-19 00:32:12 +02:00
tonitch 774c594cb8 avoid too bright colors
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-18 19:46:19 +02:00
Mat_02 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)
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
tonitch 8c8dacadd0 Bug Correction, Load Button linked
continuous-integration/drone/push Build is passing
2023-05-18 19:24:01 +02:00
tonitch a726019b18 lock fullscreen
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-18 19:11:43 +02:00
Mat_02 391d94afbe Make a screen when the player finish the level (#64)
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
Mat_02 7bd43062d0 Make a Button to load the previous game (#68)
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
tonitch 4c185f0a81 saveLevel (#69)
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
tonitch ac6c8611e7 Adding all levels + linking buttons
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
tonitch ff167b4d0f deleting piece position when clicked to avoid fantom pieces
continuous-integration/drone/push Build is passing
2023-05-17 23:41:55 +02:00
tonitch 34ea408202 stop piece screen overflow
continuous-integration/drone/push Build is passing
2023-05-17 22:38:00 +02:00
tonitch c9fdb4a7db removing println to stop spamming the console
continuous-integration/drone/push Build is passing
2023-05-17 20:43:20 +02:00
Mat_02 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
Mat_02 518a37ba8c Merge pull request 'correct_lonely_piece' (#54) from correct_lonely_piece into master
continuous-integration/drone/push Build is passing
Reviewed-on: #54
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-16 20:25:31 +02:00
Mat_02 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
Mat_02 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
Mat_02 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
tonitch 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
tonitch 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
tonitch 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
tonitch 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
tonitch 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
tonitch 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
tonitch 201eb3ec10 avoid piece to be placed when right clicking 2023-05-11 11:56:00 +02:00
tonitch 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
tonitch 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
tonitch 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
tonitch a35d823ec4 Adding documentation
continuous-integration/drone/push Build is passing
2023-05-10 23:09:57 +02:00
tonitch 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
tonitch 9aa09f8fbd Method to add a piece to a map with it's position 2023-05-10 22:55:42 +02:00
tonitch 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
tonitch 8ec5a622d8 isColumn/RowOnlyFalse 2023-05-10 20:22:20 +02:00
tonitch e7c7065a8d Adding MatrixRemoveRow/Column 2023-05-10 20:02:10 +02:00
Mat_02 a472df26ed Merge pull request 'menu' (#43) from menu into master
continuous-integration/drone/push Build is passing
Reviewed-on: #43
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-05-09 15:52:13 +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
Mat_02 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