Commit Graph

111 Commits

Author SHA1 Message Date
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
8c66a60196 Merge pull request 'add house class and simple test with draw it on field' (#8) from house_class into master
Reviewed-on: #8
2022-03-25 11:48:50 +01:00
aliaksei-kudravets
f81b6c38d0 add house class and simple test with draw it on field 2022-03-24 21:20:07 +01:00
aliaksei-kudravets
74fa5435b9 fix garbagetruck path 2022-03-24 20:35:06 +01:00
happy531
de18a3ae75 trashbin dimensions depends on its type 2022-03-24 17:59:30 +01:00
happy531
286623398f add trash class 2022-03-24 17:37:05 +01:00
happy531
fdce554007 add trashbin type 2022-03-24 17:33:54 +01:00
happy531
5bf26e7207 bug fix initial coords 2022-03-24 17:31:12 +01:00
happy531
4661566f75 add trashbin class 2022-03-24 17:30:28 +01:00
2194e848fc Merge pull request 'textures' (#5) from textures into master 2022-03-22 22:17:18 +01:00
Kacper
b03680a360 textures refactor 2022-03-22 22:10:25 +01:00
a91f924a48 Merge pull request 'move agent_movement to agent class' (#4) from movement into master
Reviewed-on: #4
2022-03-22 11:55:53 +01:00
eb153ce928 move agent_movement to agent class 2022-03-22 11:55:01 +01:00
b8cfbcf322 dodanie textur i spriteów 2022-03-22 11:01:08 +01:00
18b92c4e3d Merge pull request 'refactor_agent2' (#3) from refactor_agent2 into master
Reviewed-on: #3
2022-03-11 13:02:04 +01:00
Kacper Kalinowski
039ea1d188 refactor_agent2 2022-03-11 13:00:11 +01:00
049cc5126f Merge pull request 'refactoring_1.0' (#2) from refactoring_1.0 into master
Reviewed-on: #2
2022-03-11 12:56:05 +01:00