Commit Graph

72 Commits

Author SHA1 Message Date
Guillaume BONABAU dee5805c28 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project 2024-05-29 20:49:02 +02:00
Balthazar SQUINABOL 818e8d2e98 SaveState 2024-05-29 17:02:41 +02:00
Guillaume LE CHARTIER d47255953f functioning wolf 2024-05-29 16:56:14 +02:00
Guillaume LE CHARTIER e501b7feb6 Merge branch 'main' of https://gitarero.ecam.fr/guillaume.bonabau/OOP_F1_Project into dev_lch 2024-05-29 14:30:06 +02:00
Balthazar SQUINABOL 8cd282c8c6 Fix 2024-05-29 14:25:16 +02:00
Guillaume LE CHARTIER 45c9e8ebf8 e 2024-05-29 14:19:15 +02:00
Guillaume BONABAU 2b913f1386 Merge remote-tracking branch 'origin/dev_bnb' 2024-05-29 13:56:13 +02:00
Guillaume BONABAU cafe8800eb agents now makestep 2024-05-29 13:55:02 +02:00
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
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
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 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
Guillaume LE CHARTIER 65fe9efa34 agent implementation in progress 2024-05-22 11:51:28 +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
Guillaume LE CHARTIER e59ce9c87e commitoubeh 2024-05-08 10:39:08 +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 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
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 0d3c62f142 fixing merge errors 2024-04-25 11:16:55 +02:00
Guillaume BONABAU 73d62fce2b fixed error in simulator 2024-04-10 17:06:30 +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