Commit Graph

77 Commits

Author SHA1 Message Date
c6cbb587cd Merge pull request 'add decision tree model to trashbins, which are generated on map' (#25) from decision_tree_trashbins into master
Reviewed-on: #25
2022-05-13 12:16:09 +02:00
aliaksei-kudravets
ed19e41bc6 add decision tree model to trashbins, which are generated on map 2022-05-13 08:31:40 +02:00
trzmielewskiR
7add741845 Repaired prediction, changed dataset 2022-05-12 09:39:25 +02:00
42d09e21f8 Merge pull request 'Dodanie drzewa decyzjnego v1' (#24) from decisionTree into master
Reviewed-on: #24
2022-05-10 12:14:51 +02:00
8d563da40d Merge pull request 'trashbin-rendering' (#23) from trashbin-rendering into master
Reviewed-on: #23
2022-05-10 12:08:34 +02:00
czorekk
45a3ff6711 [trashbin-rendering] deleted unused file 'camera', little change in a* about tiles processing 2022-05-10 01:06:39 +02:00
czorekk
1971d4104d [trashbin-rendering] added trash bin rendering, added patterns, sprite group and part in map generator 2022-05-10 01:05:34 +02:00
czorekk
36b804a7f0 [trashbin-rendering] added trash bin sprites 2022-05-10 01:03:53 +02:00
trzmielewskiR
8e331a8803 Dodanie drzewa decyzjnego v1 2022-05-09 19:18:24 +02:00
0f090f9a85 Merge pull request 'integrate_a_star_and_movement' (#22) from integrate_a_star_and_movement into master
Reviewed-on: #22
2022-05-06 13:10:06 +02:00
aliaksei-kudravets
29a11547f4 a star1.0 2022-05-06 12:27:18 +02:00
czorekk
37375d4f1d [integrate_a_star_and_movement] little fixes 2022-04-29 11:01:16 +02:00
czorekk
e6448b61cd [integrate_a_star_and_movement] added camera position fix 2022-04-28 21:28:03 +02:00
czorekk
ffffa3a308 init 2022-04-28 20:12:46 +02:00
ab4b404ba4 delete angle property 2022-04-28 18:43:15 +02:00
eec3b64849 integrate movement and a* 2022-04-28 17:21:35 +02:00
6d07658c47 Merge pull request 'AM_actual_master' (#21) from AM_actual_master into master
Reviewed-on: #21
2022-04-28 16:40:35 +02:00
aliaksei-kudravets
9089c068e7 actual requirements.txt 2022-04-28 09:16:49 +02:00
aliaksei-kudravets
4e2268835c tmp 2022-04-27 21:51:09 +02:00
aliaksei-kudravets
300edcb889 add automovement to actual master branch 2022-04-27 21:49:17 +02:00
e3eacaaa01 Merge pull request '[files_review] removed some old unused files' (#20) from files_review into master
Reviewed-on: #20
2022-04-24 19:09:12 +02:00
czorekk
db4c46011d [files_review] removed some old unused files 2022-04-24 19:08:35 +02:00
9b2c661d1f Merge pull request '[a_star_search_with_heap] added a_star_search and heap data structure, moved bfs algorithm to folder' (#19) from a_star_search_with_heap into master
Reviewed-on: #19
2022-04-24 19:06:49 +02:00
czorekk
929377af27 [a_star_search_with_heap] added a_star_search and heap data structure, moved bfs algorithm to folder 2022-04-24 19:05:48 +02:00
5691ef09df Merge pull request 'map_gen_refactor' (#18) from map_gen_refactor into master
Reviewed-on: #18
2022-04-23 19:30:50 +02:00
czorekk
a088678c33 [map_gen_refactor] apply new map generation system, huge code refactor 2022-04-23 19:30:06 +02:00
czorekk
dec091652c [map_gen_refactor] apply new map generation system, huge code refactor 2022-04-23 19:14:23 +02:00
e0c6ba7a95 Merge pull request 'map_gen_refactor' (#17) from map_gen_refactor into master
Reviewed-on: #17
2022-04-08 11:17:33 +02:00
15a6934dd7 [map_gen_refactor] main conflicts fix 2022-04-08 11:17:00 +02:00
d1f4424e09 [map_gen_refactor] added extract mapArray to main for bfs 2022-04-08 11:08:17 +02:00
e55ae78366 Merge pull request 'bfsAlgorithm' (#14) from bfsAlgorithm into master
Reviewed-on: #14
2022-04-08 11:00:34 +02:00
4be74737e0 [bfsAlgorithm] merge fix 2022-04-08 10:58:43 +02:00
d857622071 [bfsAlgorithm] added master node history 2022-04-08 10:51:10 +02:00
czorekk
924e7b46ca camera can adjust to map size now, added test map generator 2022-04-08 02:17:02 +02:00
czorekk
e51a2aed3a initial init, moved rendering and generating tiles to /map_new 2022-04-08 01:34:11 +02:00
trzmielewskiR
50258414f7 bfs third try, repaired, need to print the path from start to goal 2022-04-07 23:04:25 +02:00
trzmielewskiR
3044a71592 bfs second try, adjacency matrix added, need to check if everything is correct 2022-04-07 21:37:51 +02:00
ea8ae08414 Merge pull request 'get coords on mouse click' (#12) from get_coords_on_click_event into master
Reviewed-on: #12
2022-04-07 20:16:54 +02:00
happy531
3a8b3b39ab get coords on mouse click 2022-04-07 20:06:09 +02:00
trzmielewskiR
f41cf7e02b bfs search first try, self movement for agent added 2022-04-07 19:43:53 +02:00
trzmielewskiR
6571733882 bfs first try, self movement added 2022-04-07 19:40:39 +02:00
10cca50e63 Merge pull request 'mapa2' (#11) from mapa2 into master
Reviewed-on: #11
2022-04-04 12:20:19 +02:00
Kacper
c121b586cd camera, mapa, textures, BIG refactor 2022-04-04 11:40:18 +02:00
Kacper
c55a6ebd35 Merge branch 'master' of https://git.wmi.amu.edu.pl/s462072/WALL-E 2022-04-03 15:47:41 +02:00
aliaksei-kudravets
3b5181fab5 add map class without conflicts 2022-03-25 11:54:32 +01:00
12d2962501 Merge pull request 'add trash class' (#9) from trash_class into master
Reviewed-on: #9
2022-03-25 11:51:03 +01:00
fe527e9fb1 Merge pull request 'dump class' (#10) from dump_class into master
Reviewed-on: #10
2022-03-25 11:50:53 +01:00
aliaksei-kudravets
b4c9ef4447 add dump class 2022-03-25 11:50:26 +01:00
5e43215c3f Merge pull request 'trashbin_class' (#7) from trashbin_class into master
Reviewed-on: #7
2022-03-25 11:50:13 +01:00
70071dd000 Merge branch 'master' into dump_class 2022-03-25 11:49:29 +01:00