Commit Graph

87 Commits

Author SHA1 Message Date
Polevara Veronika
b7dfc33086 change cvs 2023-05-18 23:33:04 +02:00
Polevara Veronika
ef7aa77470 changes 2023-05-18 23:18:07 +02:00
ddb69cc1ec Merge pull request 'a-star-implementation' (#22) from a-star-implementation into main
Reviewed-on: #22
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-05-14 14:27:45 +02:00
Maciej
246fda4e8a conflict merge 2023-05-14 10:15:09 +02:00
Maciej
236f608830 a-star-implementation 2023-05-14 10:09:52 +02:00
Maciej
a4f822ad93 Merge branch 'main' of https://git.wmi.amu.edu.pl/s473601/Machine_learning_2023 into a-star-implementation 2023-05-14 09:51:58 +02:00
Maciej
423e7e858c astar imlpementation 2023-05-14 09:10:31 +02:00
3283eaa46d Merge pull request 'Add decision tree' (#20) from decision_tree into main
Reviewed-on: #20
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-05-12 22:23:28 +02:00
8a05edf925 add decision tree 2023-05-11 19:34:08 +02:00
f20ac56cc0 Merge pull request 'Added BFS algorithm to search path using 3 actions: turn left/right, go straight' (#19) from rotation_actions into main
Reviewed-on: #19
Reviewed-by: Maciej Wiklandt <macwik@st.amu.edu.pl>
2023-05-04 21:32:51 +02:00
Eikthyrnir
2d4cc41157 refactoring 2023-05-02 00:02:00 +02:00
Eikthyrnir
f4ad111371 refactoring 2023-05-01 23:59:15 +02:00
Eikthyrnir
afdcac8b56 now the vacuum can only go straight and rotate left/right to change direction 2023-04-21 13:11:52 +02:00
c95ce82ac4 Merge pull request 'Next increment - AI movement' (#18) from Automatic-robot-movement into main
Reviewed-on: #18
Reviewed-by: Tim Barvenov <timbar@st.amu.edu.pl>
2023-04-21 10:14:31 +02:00
Mateusz Dokowicz
ccefc6afbc AI move from position A to B 2023-04-20 03:38:55 +02:00
Mateusz Dokowicz
f5003e93fe Config for cat 2023-04-20 00:15:00 +02:00
e972dcfd83 Merge pull request 'Vacuum_cleaning-ability' (#16) from Vacuum_cleaning-ability into main
Reviewed-on: #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: #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: #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: #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: #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: #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