Commit Graph

53 Commits

Author SHA1 Message Date
Laure BEL d866f7c6f1 click action name the start 2024-05-29 13:15:19 +02:00
timeo a16b1691d3 created classes rules and world and moved things there, and resolved pb
with rand and density rand
2024-05-28 23:18:44 +02:00
timeo 024cbf7191 put hardwired rule in comment 2024-05-28 18:35:43 +02:00
Timéo a461769f93 debut rules implementation
pc deconne je finirai a la maison
2024-05-28 16:13:31 +02:00
Timéo ae82901690 rien 2024-05-28 13:19:13 +02:00
Timéo 8ac8a92d0e # WARNING: head commit changed in the meantime
Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
2024-05-28 11:27:10 +02:00
Timéo 6fa6f61526 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-28 10:54:07 +02:00
Timéo 228f908ade took out the rules in makestep 2024-05-28 10:44:50 +02:00
Laure BEL 744857cb1e push 2024-05-28 10:41:59 +02:00
Laure BEL 730c3cce78 reset/stop works !!!! 2024-05-28 09:57:53 +02:00
benoi ac78093dfc load rule 2024-05-28 09:37:48 +02:00
Timéo 83f59d1e15 build in baseworld 2024-05-27 18:44:43 +02:00
Laure BEL 20433d9782 Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
2024-05-27 18:23:28 +02:00
Laure BEL e927096d22 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 18:23:05 +02:00
Timéo 844f948cd2 delete test and test2 2024-05-27 18:23:14 +02:00
Laure BEL d3f694af53 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 18:21:20 +02:00
Laure BEL 7789e53f82 play a bit with button stop 2024-05-27 18:21:07 +02:00
Timéo b3cf5914d7 add baseworld 2024-05-27 18:21:06 +02:00
Timéo c3c07f8db2 created baseworld 2024-05-27 18:20:53 +02:00
Laure BEL 5c61effc36 creation of the reset method + start working on clicButtonStop (cannot
restart a simulation after pressed)
2024-05-27 16:09:15 +02:00
benoi 63ea7a1b4d get rule finally 2024-05-27 13:18:05 +02:00
benoi 5bda7e3619 Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
2024-05-27 13:17:20 +02:00
benoi 739d7c7dd3 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 13:16:34 +02:00
benoi 967004a3b2 retest for getRule 2024-05-27 13:14:46 +02:00
benoi 853f578a7d test 2024-05-27 13:13:21 +02:00
Laure BEL 4f29c74958 creation of the button stop (but doesn't do the action) 2024-05-27 13:12:08 +02:00
benoi 84d0a890b7 Get Rule done ig 2024-05-27 13:08:42 +02:00
Timéo fc9bd5ed71 Merge branch 'master' of
https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
2024-05-27 13:00:08 +02:00
Timéo a3e8ab56dd Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 12:59:47 +02:00
Timéo 5b087feac5 did getSaveState 2024-05-27 12:59:29 +02:00
Laure BEL c5e5feecca generateRandom done 2024-05-27 12:42:59 +02:00
Timéo 91f6f870de // 2024-05-27 12:31:59 +02:00
Timéo c675915726 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 12:25:45 +02:00
Timéo 24f366aa24 testing to debug pull 2024-05-27 12:24:27 +02:00
Laure BEL d39bdfb0b7 redo of setLoopDelay 2024-05-27 12:21:09 +02:00
Laure BEL 7f34410068 delete setLoopDelay 2024-05-27 12:20:37 +02:00
Laure BEL 410a3be1f6 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-27 12:16:07 +02:00
Laure BEL 66a1a537c5 setLoopDelay done 2024-05-27 11:34:41 +02:00
Timéo 3d5057a959 played a bit with the rules but no result and did the get saveState but
it deconne it loads it but at 90 degrees
2024-05-27 11:18:53 +02:00
timeo be88fc0918 tried making the glider work 2024-05-26 14:28:51 +02:00
timeo 5663bc5030 made it work, got the world that appears and can place life
still have a pb on the rules because when i create a glider it does like
3 gen and becomes a block
2024-05-26 14:10:31 +02:00
t.leclapart-jublot ce36dc5e09 revert 94fd880575
revert updated Simulator and MyInterface
2024-05-26 13:03:24 +02:00
timeo 94fd880575 updated Simulator and MyInterface 2024-05-24 22:08:48 +02:00
timeo 447e9f74bc finished gridCreation and started nextGen 2024-05-09 18:10:24 +02:00
Timéo aca09f1bc8 fix initiat errors 2024-05-07 17:30:09 +02:00
Timéo 3ae384ea29 Merge branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git 2024-05-07 17:27:38 +02:00
Timéo a5e35fdf31 did isLoopingBorder and toggleLoopingBorder, started gridCreation but
gotta finish
2024-05-07 17:26:16 +02:00
benoi f5345ab987 I changed stuff about togglePause 2024-05-07 17:21:07 +02:00
Laure BEL 5ad318256d update of MyInterface.java (By the teacher) 2024-04-10 17:13:25 +02:00
Laure BEL 015af22129 getHeight and getWidth done 2024-04-10 17:08:41 +02:00