Commit Graph

71 Commits

Author SHA1 Message Date
e972dcfd83 Merge pull request 'Vacuum_cleaning-ability' (#16) from Vacuum_cleaning-ability into main
Reviewed-on: s473601/Machine_learning_2023#16
Reviewed-by: Nastassia Zhuravel <naszhu@st.amu.edu.pl>
2023-04-14 13:54:02 +02:00
Pavel
7dd2190c76 Added maximum mount of container_filling value, it's 100% - one pell it's 25%. 2023-04-14 00:25:35 +02:00
Pavel
029bcb1986 Added the Vacuum Doc Station, which can refresh vacuum container_filling level + add sprite of Doc Station + display Doc Station on screen(files) 2023-04-13 19:25:04 +02:00
Pavel
8ef3da8df0 Added the Vacuum Doc Station, which can refresh vacuum container_filling level + add sprite of Doc Station + display Doc Station on screen 2023-04-13 19:04:57 +02:00
Pavel
3b761e41ab Added the cleaning ability to vacuum and container_filling status now is visible. 2023-04-10 18:43:16 +02:00
2929495348 Merge pull request 'added some properties' (#15) from Add-Properties into main
Reviewed-on: s473601/Machine_learning_2023#15
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-30 19:26:53 +02:00
Mateusz Dokowicz
959ed6bfda added some properties 2023-03-30 18:45:52 +02:00
2c9500c2bf Merge pull request 'Redesigned project architecture to be a little bit more modular' (#12) from sandbox into main
Reviewed-on: s473601/Machine_learning_2023#12
2023-03-30 18:29:26 +02:00
Mateusz Dokowicz
f7b97c5f74 auto formatting 2023-03-30 18:27:51 +02:00
Mateusz Dokowicz
291e028a8a resolve endregion problem 2023-03-30 18:24:41 +02:00
Mateusz Dokowicz
047ef87bab Delete import non existing file 2023-03-30 18:18:46 +02:00
Eikthyrnir
83ef0fecad deleted old code 2023-03-29 12:22:05 +02:00
Eikthyrnir
03ece1218b refactoring 2023-03-29 11:27:59 +02:00
Eikthyrnir
a0fe606c23 added cat and plants 2023-03-29 07:13:08 +02:00
Eikthyrnir
5b85d415e4 Merge branch 'main' into sandbox 2023-03-28 22:02:25 +02:00
40a8322852 plants images added
Reviewed-on: s473601/Machine_learning_2023#11
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-03-28 21:57:34 +02:00
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