Commit Graph

163 Commits

Author SHA1 Message Date
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
Guillaume BONABAU 5d3f8c8ab0 starting step 2024-04-10 15:46:23 +02:00
Guillaume BONABAU 343c71dc31 starting step 2024-04-10 15:46:01 +02:00
Balthazar SQUINABOL fc8e8a44d8 Merge branch 'dev_squ' 2024-04-10 15:45:31 +02:00
Balthazar SQUINABOL 523bf7d0cb Actualiser src/backend/Simulator.java 2024-04-10 15:42:12 +02:00
Balthazar SQUINABOL 0a534715b8 Actualiser src/windowInterface/MyInterface.java 2024-04-10 15:41:45 +02:00
Guillaume BONABAU 043237c0ad table constructor and instructions 2024-04-10 15:41:44 +02:00
Guillaume LE CHARTIER 06afc4eb10 added cell for value and density 2024-04-10 15:41:43 +02:00
Balthazar SQUINABOL fce6baef3a Add Cell.java 2024-04-10 15:41:43 +02:00
Guillaume BONABAU d21cb1b21e created Table 2024-04-10 15:41:43 +02:00
Guillaume BONABAU 88a11b26bc fixes and canva link 2024-04-10 15:41:43 +02:00
Guillaume LE CHARTIER ea3134bc5c Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 15:40:01 +02:00
Guillaume LE CHARTIER 9e3d1163af added cell for value and density 2024-04-10 15:39:00 +02:00
Guillaume BONABAU f67ee0bfc0 table constructor and instructions 2024-04-10 15:32:17 +02:00
Guillaume BONABAU 6e501bfb3f Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 15:03:44 +02:00
Guillaume BONABAU 22a7955248 created Table 2024-04-10 15:03:21 +02:00
Balthazar SQUINABOL c7bbab6e9b Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-04-10 15:02:35 +02:00
Balthazar SQUINABOL 9796d1a7c8 Merge branch 'dev_squ' 2024-04-10 15:02:31 +02:00
Balthazar SQUINABOL 62738f82c5 Add Cell.java 2024-04-10 15:01:45 +02:00
Guillaume BONABAU dba0d96dac fixes and canva link 2024-04-10 14:20:34 +02:00
Guillaume LE CHARTIER ac5c120ba2 OUI 2024-04-10 14:10:15 +02:00
Balthazar SQUINABOL ae63a9cf5b Merge branch 'dev_squ' 2024-04-10 13:56:45 +02:00
Guillaume BONABAU dc8b2d2a73 Merge branch 'dev_bal' 2024-04-10 13:48:04 +02:00
Balthazar SQUINABOL 40a88fe15e nothing special 2024-04-03 18:33:01 +02:00
Balthazar SQUINABOL 4f2cb09640 add logs 2024-04-03 18:19:28 +02:00
Balthazar SQUINABOL 3c05da825f clickActionFlag add to clickCell
add setLoopDelay
add toggleClickAction
2024-04-03 18:12:42 +02:00
Balthazar SQUINABOL b27ef8ffe0 clickCell 2024-04-03 17:42:11 +02:00
Balthazar SQUINABOL d05f4211f1 togglePause 2024-04-03 17:38:04 +02:00