Commit Graph

Select branches

Hide Pull Requests

Brad_GraphPiece

MenuPrototype

Rapport

Rotation_piece_

delete_white_piece

master

menu-javafx

#11

#12

#13

#14

#15

#16

#17

#18

#20

#21

#24

#25

#26

#28

#3

#31

#32

#33

#34

#36

#37

#38

#39

#4

#43

#44

#45

#46

#48

#5

#52

#53

#54

#55

#56

#61

#62

#63

#64

#65

#68

#69

#71

#73

#74

#75

#76

#82

#83

#84

#85

Final

FinalReleased

archive

c585c54

Mono Color

• 512fcc069d dernière correction par ma maman master FinalReleased tonitch 2023-05-22 02:12:50 +02:00
• 7a5a4a093e spellcheck tonitch 2023-05-21 17:54:47 +02:00
• 6d53865281 Merge pull request 'Rapport' (#53) from Rapport into master archive Final tonitch 2023-05-20 23:36:13 +02:00
• 58810fff0c corrections Rapport tonitch 2023-05-20 23:37:22 +02:00
• a98c3cd3e1 Last modification by tonitch tonitch 2023-05-20 14:17:42 +02:00
• 939f8566cd latex syntax tonitch 2023-05-20 13:11:30 +02:00
• 03beebaeaf escape on the menu quit the game tonitch 2023-05-20 12:45:52 +02:00
• c7fe7853b4 Merge pull request 'restructuration des fichiers' (#84) from restructuration into master tonitch 2023-05-20 12:32:10 +02:00
• 35c7ecf471 Merge pull request 'Random rotation to generated maps' (#83) from randomPieceRotation into master tonitch 2023-05-20 12:31:53 +02:00
• 229782c772 Corriger qlq faute vu sur relecture Mat_02 2023-05-19 23:28:27 +02:00
• 2d27786e48 Make conclusion and correct some accent Mat_02 2023-05-19 23:06:18 +02:00
• 3bcfdfc084 Add some explain about MapGenerator Mat_02 2023-05-19 22:12:17 +02:00
• 878caf1c99 Add Apport Positifs et négatifs Mat_02 2023-05-19 20:25:58 +02:00
• 0bb327abb2 restructuration des fichiers tonitch 2023-05-19 16:44:45 +02:00
• 621be3af64 removing smap from the console tonitch 2023-05-19 16:30:02 +02:00
• 9671f8ec53 Add Point forts Mat_02 2023-05-19 15:27:12 +02:00
• 2d4462735a Add Point faibles dans le rapport Mat_02 2023-05-19 15:03:31 +02:00
• 7467abfd11 Random rotation to generated maps tonitch 2023-05-19 14:55:48 +02:00
• 59fd891fd9 minor corrections tonitch 2023-05-19 14:46:17 +02:00
• e6853ab3d3 Parser de fichier + Consignes de base tonitch 2023-05-18 11:37:12 +02:00
• ff5ed0c85f correction fautes tonitch 2023-05-17 20:16:09 +02:00
• 0330303129 Avancement global tonitch 2023-05-16 14:56:49 +02:00
• 0354679969 File Parser tonitch 2023-05-16 09:45:41 +02:00
• 714e904d1c Base de Rapport tonitch 2023-05-15 13:05:16 +02:00
• d52d1cab77 Clean the pieces position when restarting the game tonitch 2023-05-18 22:08:10 +02:00
• 9bc66ad6b1 Solve the position problem tonitch 2023-05-18 20:19:40 +02:00
• 41be423f94 Draw the piece at their places at the start of the level tonitch 2023-05-18 20:17:17 +02:00
• 774c594cb8 avoid too bright colors tonitch 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) Mat_02 2023-05-18 19:31:47 +02:00
• 8c8dacadd0 Bug Correction, Load Button linked tonitch 2023-05-18 19:24:01 +02:00
• a726019b18 lock fullscreen tonitch 2023-05-18 19:10:36 +02:00
• 391d94afbe Make a screen when the player finish the level (#64) Mat_02 2023-05-18 19:03:53 +02:00
• 7bd43062d0 Make a Button to load the previous game (#68) Mat_02 2023-05-18 18:36:25 +02:00
• 4c185f0a81 saveLevel (#69) tonitch 2023-05-18 18:32:16 +02:00
• d08d57ca78 Make a local variable with the shape Rotation_piece_ Mat_02 2023-05-18 01:08:34 +02:00
• ecdff3cbd0 An other method to avoid all type of white Antho free to change this one I'm a little to lazy at this time delete_white_piece Mat_02 2023-05-18 00:32:48 +02:00
• fbd214bc23 New condition for the while Mat_02 2023-05-17 23:59:40 +02:00
• d37059b7de Add a condition to avoid white piece Mat_02 2023-05-17 23:49:21 +02:00
• ac6c8611e7 Adding all levels + linking buttons tonitch 2023-05-17 23:42:44 +02:00
• ff167b4d0f deleting piece position when clicked to avoid fantom pieces tonitch 2023-05-17 19:54:32 +02:00
• 34ea408202 stop piece screen overflow tonitch 2023-05-17 19:21:26 +02:00
• c9fdb4a7db removing println to stop spamming the console tonitch 2023-05-17 18:57:59 +02:00
• 3d4730cfc0 Merge pull request 'change acceuil to accueil' (#55) from Acceuil_to_Accueil into master Mat_02 2023-05-16 20:25:57 +02:00
• 518a37ba8c Merge pull request 'correct_lonely_piece' (#54) from correct_lonely_piece into master Mat_02 2023-05-16 20:25:31 +02:00
• aecbf2cb9a add a comment and delete space useless Mat_02 2023-05-16 10:35:46 +02:00
• 178d076883 change acceuil to accueil Mat_02 2023-05-15 23:58:12 +02:00
• 16d2c89e95 Make the code to sub a piece alone without link to others pieces Mat_02 2023-05-15 19:31:21 +02:00
• 3dd1b6b059 Less Small Pieces tonitch 2023-05-12 11:36:43 +02:00
• 3e4b4d257e Merge pull request 'This commit will align piece to their in game position' (#48) from pieceDrawing into master tonitch 2023-05-11 20:09:46 +02:00
• d389b22f2d Merge pull request 'Place pieces on the board' (#46) from pieceInteraction into master tonitch 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 tonitch 2023-05-11 20:08:39 +02:00
• def25d9e38 Check if the baord is completed and return to main menu tonitch 2023-05-11 12:24:56 +02:00
• e424cdca4e selected piece get to the front tonitch 2023-05-11 12:01:59 +02:00
• 201eb3ec10 avoid piece to be placed when right clicking tonitch 2023-05-11 11:56:00 +02:00
• cb54e753d7 align piece when placed tonitch 2023-05-11 11:51:53 +02:00
• 0f1ecc753b leaving debug printing and reseting piece position if not placed tonitch 2023-05-11 11:47:16 +02:00
• 334e0ad99b Piece overlap detection tonitch 2023-05-11 11:34:50 +02:00
• a35d823ec4 Adding documentation tonitch 2023-05-10 23:09:03 +02:00
• 4f821b44bc When a piece is placed at a position, check if this space is placable and place it there. tonitch 2023-05-10 22:59:43 +02:00
• 9aa09f8fbd Method to add a piece to a map with it's position tonitch 2023-05-10 22:55:42 +02:00
• 90d6d47cc8 limit piece matrix to their minimum size tonitch 2023-05-10 22:49:29 +02:00
• 8ec5a622d8 isColumn/RowOnlyFalse tonitch 2023-05-10 20:22:20 +02:00
• e7c7065a8d Adding MatrixRemoveRow/Column tonitch 2023-05-10 20:02:10 +02:00
• a472df26ed Merge pull request 'menu' (#43) from menu into master Mat_02 2023-05-09 15:52:13 +02:00
• 24730a1362 Merge branch 'menu' Debucquoy 2023-05-09 13:05:53 +02:00
• af3489d078 change the switchRoot method Mat_02 2023-05-09 12:56:33 +02:00
• 7320fea2f9 Merge pull request 'Game UI' (#38) from gameui into master Mat_02 2023-05-09 12:51:18 +02:00
• 60bf1fa5d0 make white space on detached pieces tonitch 2023-05-05 12:03:40 +02:00
• 7c37c46830 Correct position on draging pieces tonitch 2023-05-05 00:15:38 +02:00
• 6280b39c20 Cleaner code tonitch 2023-05-04 23:24:18 +02:00
• 592780bb73 DownDate to java 11 tonitch 2023-05-04 22:12:13 +02:00
• e3d28b21b4 Positionning on the screen tonitch 2023-05-04 13:14:10 +02:00
• 7b6291bda9 Keep the Shape Size tonitch 2023-05-04 13:12:22 +02:00
• 382af6b541 Piece rotation tonitch 2023-05-03 18:21:54 +02:00
• 15e1745ad1 Adding Gap and texture tonitch 2023-05-03 11:11:16 +02:00
• 4583bbd7e6 set default color of pieces tonitch 2023-05-01 19:48:42 +02:00
• c68e680768 Show Map and pieces shape in gameui tonitch 2023-04-29 19:01:31 +02:00
• a043cb487f Correct all thing say expect the one about switchRoot I didn't understand (Btw add some comment) Mat_02 2023-05-06 21:45:56 +02:00
• 1af5db700e Add the picture of background Mat_02 2023-05-05 12:18:54 +02:00
• 752c722b0c Merge branch 'master' into menu tonitch 2023-05-05 12:11:19 +02:00
• a3ad448fba Finally finish the menu Mat_02 2023-05-05 11:50:17 +02:00
• a7a3e8b36e DownDate to java 11 tonitch 2023-05-04 22:12:13 +02:00
• 8110a93910 Make operational and also organize all the buttons Mat_02 2023-05-04 18:22:23 +02:00
• 53972cd1ef Merge branch 'master' of git.herisson.ovh:undefined_name/School_project Debucquoy 2023-05-04 15:40:31 +02:00
• de146b216d Down to java11 Debucquoy 2023-05-04 15:40:05 +02:00
• f1519ba40c levelMaker (#36) tonitch 2023-05-03 17:29:10 +02:00
• 72dcbcbf4f Adding Color to pieces (#31) tonitch 2023-05-03 17:27:10 +02:00
• a43e3b150a Finish initiate all the button in the gridPane For MenuLevel Mat_02 2023-05-01 20:48:49 +02:00
• 7ac860850c Finish initiate all the button in the gridPane For MenuLevel Mat_02 2023-05-01 20:47:40 +02:00
• a076ca12cb Finish initiate all the button in the gridPane For MenuLevel Mat_02 2023-05-01 20:45:51 +02:00
• dc5da4956a Affichage des boutons pour les levels ok Mat_02 2023-05-01 20:07:44 +02:00
• c6df656381 MapGenerator (#34) tonitch 2023-05-01 18:38:52 +02:00
• 692e22b5b9 Merge pull request 'Adding Array Copy for matrix' (#33) from ArrayDeepCopy into master tonitch 2023-05-01 17:53:54 +02:00
• f21c036b1c Merge pull request 'addition of vectors' (#32) from Vec2Upgrade into master tonitch 2023-05-01 17:53:05 +02:00
• b4b89bcd86 Finishing MenuAcceuil Mat_02 2023-05-01 16:05:59 +02:00
• 644af67a55 Make a package for all the Menu class Mat_02 2023-05-01 12:31:27 +02:00
• ee0350c251 clear CreateLevelMenu2 and all object useless in Controller Mat_02 2023-04-30 13:50:44 +02:00
• d455b7f450 Clear CreateLevel1 to make a new class Mat_02 2023-04-30 13:44:08 +02:00
• 02b4ab8a35 Clear the method CreateMenu to make a new class with the same role Mat_02 2023-04-30 13:07:36 +02:00
• 24a7a73f36 forget to update syntaxe with the array Mat_02 2023-04-28 12:04:22 +02:00