Commit Graph

90 Commits

Author SHA1 Message Date
Balthazar SQUINABOL 7d2d708e1a We gona open champain, LoopingBorder Working YAY 2024-05-08 10:27:34 +02:00
Guillaume BONABAU 383a3c1cd7 the commit that gives you a boner 2024-05-08 10:07:43 +02:00
Guillaume BONABAU 19c9688615 Merge remote-tracking branch 'origin/dev_bnb' 2024-05-08 09:55:04 +02:00
Guillaume BONABAU 83d3811a17 le code de gpt mais joli 2024-05-08 09:54:04 +02:00
Guillaume BONABAU d6b7038167 opimised countnear (thx gpt) 2024-05-08 09:52:16 +02:00
Guillaume BONABAU aa7ff4311f made rules + trying to optimise countnear 2024-04-29 17:07:21 +02:00
Balthazar SQUINABOL e968514c70 Clean my shit 2024-04-29 16:46:30 +02:00
Guillaume LE CHARTIER a7fcc0f9a1 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-29 16:42:32 +02:00
Guillaume LE CHARTIER facd751030 Adapted the cell output to match the removal of density 2024-04-29 16:41:08 +02:00
Guillaume LE CHARTIER 214eaffeee Removed density from Cell 2024-04-29 16:32:07 +02:00
Balthazar SQUINABOL bc5dbc477a Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-29 16:29:10 +02:00
Balthazar SQUINABOL ca19544980 Update sympa 2024-04-29 16:27:43 +02:00
Balthazar SQUINABOL 9c325932f5 Cell Density 2024-04-29 16:05:05 +02:00
Guillaume LE CHARTIER ab6949e5bb Added clickActionName 2024-04-29 15:49:51 +02:00
Guillaume BONABAU 25c7bab182 fixed all green error 2024-04-29 15:09:54 +02:00
Guillaume BONABAU 7a0ba91d27 in progress 2024-04-29 08:54:17 +02:00
Guillaume BONABAU 60c428fe64 bunch of things - TOFIX: interface changes it full color for some reason 2024-04-26 10:02:03 +02:00
Guillaume BONABAU 630ab51514 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-25 12:09:27 +02:00
Guillaume BONABAU b69f0e77ea iniatiate empty table, fix getcell and setcell 2024-04-25 12:08:40 +02:00
Balthazar SQUINABOL 2b5ce8fea0 setRandom 2024-04-25 11:43:07 +02:00
Guillaume BONABAU 97b110c76f create empty cell table 2024-04-25 11:35:53 +02:00
Guillaume BONABAU 0d3c62f142 fixing merge errors 2024-04-25 11:16:55 +02:00
Balthazar SQUINABOL 7c4b0bc3b4 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-25 10:42:18 +02:00
Balthazar SQUINABOL ae639fe737 Update 2024-04-25 10:38:03 +02:00
Guillaume BONABAU 73d62fce2b fixed error in simulator 2024-04-10 17:06:30 +02:00
Guillaume BONABAU 5f8a768283 fixed errors in table 2024-04-10 17:05:12 +02:00
Guillaume BONABAU cd3480ad71 Merge branch 'dev_bnb' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_bnb 2024-04-10 16:53:10 +02:00
Guillaume BONABAU 5c721e980e Merge branch 'dev_bnb' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_bnb 2024-04-10 16:51:54 +02:00
Guillaume LE CHARTIER d349fb5567 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 16:51:30 +02:00
Guillaume LE CHARTIER 8d7512000e merge 2024-04-10 16:50:13 +02:00
Guillaume LE CHARTIER 1603461d0a Merge remote-tracking branch 'origin/dev_lch' 2024-04-10 16:50:08 +02:00
Guillaume BONABAU f2bcfcda14 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 16:45:02 +02:00
Guillaume BONABAU 1cc1c39117 Merge branch 'dev_bnb' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_bnb 2024-04-10 16:44:04 +02:00
Guillaume BONABAU a48d32cfbe fixed getCell 2024-04-10 16:44:02 +02:00
Guillaume BONABAU fd3bda1c1f Merge branch 'dev_bnb' 2024-04-10 16:43:46 +02:00
Guillaume BONABAU bbc93ac73c fixed getCell 2024-04-10 16:43:14 +02:00
Guillaume LE CHARTIER dbcef49fa3 Added countNear and setCell functions in Table 2024-04-10 16:43:12 +02:00
Balthazar SQUINABOL 2dc390e3d5 Merge remote-tracking branch 'origin/dev_squ' 2024-04-10 16:38:16 +02:00
Balthazar SQUINABOL ecac61d631 fresh commit 2024-04-10 16:37:36 +02:00
Balthazar SQUINABOL 32937516e3 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 16:32:49 +02:00
Balthazar SQUINABOL a4a9171fdf Merge branch 'dev_squ' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_squ 2024-04-10 16:30:34 +02:00
Balthazar SQUINABOL 37cdcde4c5 s 2024-04-10 16:30:27 +02:00
Balthazar SQUINABOL 2dae9a3251 Actualiser src/backend/Simulator.java 2024-04-10 16:29:57 +02:00
Balthazar SQUINABOL 3598d99e4f Actualiser src/backend/Simulator.java 2024-04-10 16:29:32 +02:00
Balthazar SQUINABOL ff0ad5968c Actualiser src/windowInterface/MyInterface.java 2024-04-10 16:29:05 +02:00
Guillaume BONABAU fd4508b370 Merge pull request 'dev_bnb' (#2) from dev_bnb into main
Reviewed-on: #2
2024-04-10 16:25:50 +02:00
Guillaume BONABAU c478c29673 fixed typos, setCell(), removed countAround in Simulator, commented out getCell() in Simulator and updated clickCell to use the Table getCell.getValue 2024-04-10 16:18:36 +02:00
Balthazar SQUINABOL 5367724a2b YES 2024-04-10 16:08:43 +02:00
Guillaume BONABAU b11eba4039 Merge branch 'dev_bnb' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_bnb 2024-04-10 16:06:29 +02:00
Guillaume BONABAU 20d4ba1a0f worked on step 2024-04-10 16:04:09 +02:00