Commit Graph

105 Commits

Author SHA1 Message Date
countingthedots
5de48e2c3f plants images added 2023-03-28 21:48:52 +02:00
Eikthyrnir
c54a99369e Merge branch 'main' into sandbox 2023-03-28 21:41:01 +02:00
adf4eaee00 Added static plants, fixed cat moving out of the world
Reviewed-on: s473601/Machine_learning_2023#10
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 21:39:59 +02:00
countingthedots
77feab6a4e static plants added 2023-03-28 21:32:07 +02:00
Eikthyrnir
31dcf7b6dc Merge branch 'main' into sandbox 2023-03-28 21:12:47 +02:00
Eikthyrnir
28af8048b9 initial mix of Veronika and Mateusz code 2023-03-28 20:14:23 +02:00
848e23d062 Added a cat that can move around a world
Reviewed-on: s473601/Machine_learning_2023#9
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 20:11:08 +02:00
countingthedots
7358cb73fe unrequired cat image deleted 2023-03-28 19:47:46 +02:00
countingthedots
50a0eda8ef obrazy kota 2023-03-28 19:44:39 +02:00
countingthedots
5818a63e1e moving cat added 2023-03-28 19:36:57 +02:00
ad828cb7d1 Merge pull request 'Create-Array-for-Grid' (#8) from Create-Array-for-Grid into main 2023-03-23 15:35:53 +01:00
Mateusz Dokowicz
667d19084f Merge branch 'main' into Create-Array-for-Grid 2023-03-23 00:59:13 +01:00
Mateusz Dokowicz
586a94e0c0 working arrays and movement 2023-03-23 00:54:05 +01:00
Mateusz Dokowicz
be307ebab5 bugFixes 2023-03-22 23:11:13 +01:00
Mateusz Dokowicz
4933c04bd8 upadte + array_to_window_position 2023-03-22 20:48:02 +01:00
Mateusz Dokowicz
e55dbcccea error correction 2023-03-22 20:47:14 +01:00
Mateusz Dokowicz
7757843da8 formatting requirements 2023-03-22 20:46:05 +01:00
Mateusz Dokowicz
51a629285d Revert "Merge pull request 'Refactor and sprites' (#7) from refactor into main"
This reverts commit a65b07727b, reversing
changes made to 4ec034d548.
2023-03-21 21:15:08 +01:00
a65b07727b Merge pull request 'Refactor and sprites' (#7) from refactor into main
Reviewed-on: s473601/Machine_learning_2023#7
2023-03-21 20:45:49 +01:00
7809879c7c merge 2023-03-21 20:43:10 +01:00
ff3f344fca add sprites and refactor 2023-03-21 20:29:35 +01:00
Mateusz Dokowicz
e37a889e1e Array Grid 2023-03-20 01:14:48 +01:00
Mateusz Dokowicz
101136b0b7 radius Fix 2023-03-19 22:00:10 +01:00
4ec034d548 Merge pull request 'Fixed radius value' (#6) from radiusFixed into main
Reviewed-on: s473601/Machine_learning_2023#6
2023-03-19 20:05:12 +01:00
countingthedots
8d9c4146a4 Fixed radius value 2023-03-19 19:53:54 +01:00
ef2e1a1fb7 Merge pull request 'optimization' (#5) from optimization into main
Reviewed-on: s473601/Machine_learning_2023#5
2023-03-16 22:13:59 +01:00
Mateusz Dokowicz
2200cf15d7 typo 15->20 2023-03-16 22:08:47 +01:00
Mateusz Dokowicz
9b7bb1a62c rename movingCleaner to robot_movement 2023-03-16 21:55:05 +01:00
Mateusz Dokowicz
a5e38a707b calculate radius prep 2023-03-16 21:50:27 +01:00
Mateusz Dokowicz
257f0f7d1d TODO calculate radius 2023-03-16 21:49:06 +01:00
Mateusz Dokowicz
3696636245 Code readability 2023-03-16 21:38:42 +01:00
Mateusz Dokowicz
d080b04763 formatting and comments 2023-03-16 20:33:22 +01:00
9ac833550c Merge pull request 'Refactor' (#4) from Refactor into main
Reviewed-on: s473601/Machine_learning_2023#4
2023-03-12 20:15:06 +01:00
countingthedots
9db0cc3cfd movement as a seperate function 2023-03-12 20:13:00 +01:00
countingthedots
63912b9b24 movement as a seperate function 2023-03-12 20:10:18 +01:00
countingthedots
997bd72a97 Merge branch 'main' of https://git.wmi.amu.edu.pl/s473601/Machine_learning_2023 2023-03-12 19:40:43 +01:00
2ea0e3b27d refactor 1 2023-03-12 19:33:57 +01:00
9c4b811c98 Merge pull request 'Moving-circle' (#3) from Moving-circle into main
Reviewed-on: s473601/Machine_learning_2023#3
2023-03-12 18:22:26 +01:00
countingthedots
edc78b9103 Moving circle added 2023-03-12 18:19:28 +01:00
countingthedots
7eb0a8b7fa Moving circle added 2023-03-12 18:15:15 +01:00
countingthedots
6f31a587b9 Moving circle added 2023-03-12 18:11:31 +01:00
countingthedots
0580148281 Merge branch 'main' of https://git.wmi.amu.edu.pl/s473601/Machine_learning_2023 2023-03-12 17:14:53 +01:00
countingthedots
341e198749 Moving circle added 2023-03-12 17:11:06 +01:00
3aee864b8c Merge pull request 'pygame_wrap_class' (#1) from pygame_wrap_class into main
Reviewed-on: s473601/Machine_learning_2023#1
2023-03-12 16:32:16 +01:00
963f2da849 some changes 2023-03-12 16:22:51 +01:00
8714f2aa8f Merge branch 'main' into pygame_wrap_class 2023-03-12 14:46:26 +01:00
b9f443c424 Merge pull request 'Update Readme.md file' (#2) from s473601-patch-1 into main
Reviewed-on: s473601/Machine_learning_2023#2
2023-03-12 14:41:30 +01:00
58f85007f5 Update Readme 2023-03-12 14:37:33 +01:00
645aa663e3 file naming changes 2023-03-12 14:09:55 +01:00
acce6f6bd1 merge main 2023-03-12 14:06:27 +01:00