 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 |
|
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 |