Commit Graph

135 Commits

Author SHA1 Message Date
Guillaume LE CHARTIER 6bf5f8b659 fixed merge issues 2024-05-29 11:45:15 +02:00
Guillaume LE CHARTIER e87442bc14 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-05-29 11:41:56 +02:00
Guillaume LE CHARTIER 3e7132db4c Merge remote-tracking branch 'origin/dev_lch' 2024-05-29 11:41:47 +02:00
Guillaume LE CHARTIER d591e83bca optimized code for agents 2024-05-29 11:38:13 +02:00
Guillaume BONABAU 375742504b fixed simu not pausing when stopped 2024-05-29 11:36:05 +02:00
Guillaume LE CHARTIER 68ff872248 put back color in simulator 2024-05-29 11:33:42 +02:00
Balthazar SQUINABOL 7b32e502d3 Actualiser README.md 2024-05-29 11:33:42 +02:00
Guillaume BONABAU 54d7b42ebd comrade 2024-05-29 11:33:42 +02:00
Guillaume BONABAU 8bb620c13e gas rules works 2024-05-29 11:30:55 +02:00
Guillaume BONABAU 881f453854 comments 2024-05-29 11:30:04 +02:00
Guillaume BONABAU 263ffa8a79 conway working, gas flickering 2024-05-29 11:30:03 +02:00
Guillaume BONABAU 204fd32ba7 json import 2024-05-29 11:28:02 +02:00
Balthazar SQUINABOL 5e462cfd39 add rules file, creating an object with every attr
ibutes and methods needed to create a rule
2024-05-29 11:28:02 +02:00
Guillaume BONABAU d98bdc2d3f json format 2024-05-29 11:28:02 +02:00
Guillaume BONABAU f3b142c174 init commit dev json 2024-05-29 11:28:02 +02:00
Balthazar SQUINABOL 197abcfc3b // 2024-05-29 11:28:02 +02:00
Guillaume BONABAU 3ceb42614a fixed colorarraylist missing 2024-05-29 11:27:38 +02:00
Guillaume BONABAU 3639e340f9 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-05-29 11:24:25 +02:00
Guillaume LE CHARTIER 1e367b848b put back color in simulator 2024-05-29 11:23:28 +02:00
Guillaume BONABAU 5d408b84e0 stop button & blobrule color 2024-05-29 11:22:42 +02:00
Guillaume LE CHARTIER eaeb33d9c2 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-05-29 11:19:02 +02:00
Guillaume LE CHARTIER a42a6d69ea changed a comment 2024-05-29 11:12:02 +02:00
Guillaume LE CHARTIER 96c202115d functioning adding and removal of agents 2024-05-29 11:10:29 +02:00
Guillaume BONABAU 82d53fcb22 changed path default rule 2024-05-29 10:41:37 +02:00
Guillaume BONABAU 11043e2333 moved rules.json in rule folder 2024-05-29 10:15:34 +02:00
Guillaume LE CHARTIER 184c5bd759 ajout d'un null agent 2024-05-28 14:54:32 +02:00
Guillaume LE CHARTIER 99fb4fdb02 advancement on agents with partial update on clickAgent removal process 2024-05-28 14:09:15 +02:00
Balthazar SQUINABOL 8ea68ad89f Actualiser README.md 2024-05-22 14:06:14 +02:00
Guillaume LE CHARTIER 65fe9efa34 agent implementation in progress 2024-05-22 11:51:28 +02:00
Guillaume BONABAU ce58c1e9f3 Merge remote-tracking branch 'origin/dev_rulejson' 2024-05-22 11:31:58 +02:00
Guillaume BONABAU 7d98ef78ab comrade 2024-05-22 11:27:31 +02:00
Guillaume BONABAU 5aa4513148 gas rules works 2024-05-22 09:51:59 +02:00
Guillaume BONABAU 0e00903a86 comments 2024-05-22 09:03:29 +02:00
Guillaume BONABAU c423981264 conway working, gas flickering 2024-05-16 11:55:54 +02:00
Guillaume BONABAU 30155a1648 json import 2024-05-16 10:35:28 +02:00
Balthazar SQUINABOL 896f8e88d2 add rules file, creating an object with every attr
ibutes and methods needed to create a rule
2024-05-13 21:24:01 +02:00
Balthazar SQUINABOL 0d8c47a0ed // 2024-05-13 21:13:31 +02:00
Guillaume BONABAU e6eb59b08d json format 2024-05-13 11:15:39 +02:00
Guillaume BONABAU b5619ae8a2 init commit dev json 2024-05-13 10:51:27 +02:00
Guillaume LE CHARTIER 7ba8160e2b Merge branch 'dev_lch' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_lch 2024-05-08 11:05:43 +02:00
Guillaume LE CHARTIER 53dd740c03 changed color of sheep 2024-05-08 11:05:31 +02:00
Guillaume LE CHARTIER bf027c18aa changed color of sheep 2024-05-08 11:04:35 +02:00
Balthazar SQUINABOL 24bd3ab6a5 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-05-08 11:03:50 +02:00
Balthazar SQUINABOL e641c40832 Make outbound cells = 0; clean up code 2024-05-08 11:02:41 +02:00
Guillaume LE CHARTIER e59ce9c87e commitoubeh 2024-05-08 10:39:08 +02:00
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