Commit Graph

54 Commits

Author SHA1 Message Date
3603ee088b Update 'raports/SI_Raport_1.md' 2019-03-26 23:13:05 +00:00
42a825be42 Merge branch 'raports' of s440556/SZI2019SmieciarzWmi into master 2019-03-26 23:12:03 +00:00
Michal Starski
fd77412a68 replaced missing file 2019-03-27 00:11:04 +01:00
6e7ef092cb Merge branch 'raports' of s440556/SZI2019SmieciarzWmi into master 2019-03-26 23:09:42 +00:00
Michal Starski
97f0dd7522 added Makefile and the first raport 2019-03-27 00:08:06 +01:00
Magdalena Wilczyńska
5c12f8acdc Logs, interaction and bug
Improved logs *stats are displayed every 2 seconds, *debug logs are visible; Added interaction between GC, house and landfill; Collecting trash bug;
2019-03-26 23:13:34 +01:00
Konrad
8d5febd918 Zmiejszono ilosc copy-paste ifow 2019-03-26 21:26:20 +01:00
Magdalena Wilczyńska
9ee0cf1f5c Fixed syntax 2019-03-25 17:47:04 +01:00
eb4d87e6f3 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-25 17:43:13 +01:00
d6df436085 added additional condition for generating houses 2019-03-25 17:43:08 +01:00
Magdalena Wilczyńska
d2423de745 Added basic methods for collecting garbage 2019-03-25 17:41:24 +01:00
Magdalena Wilczyńska
84d375e5dd Fixed conflicts 2019-03-25 16:36:08 +01:00
4d807fe0c9 cleaning time 2019-03-25 16:19:24 +01:00
43d91e178d Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-25 16:10:53 +01:00
84f33fd118 tmp 2019-03-25 16:10:51 +01:00
Magdalena Wilczyńska
a55be72342 Added statistics utils 2019-03-25 16:03:25 +01:00
af1f91c4f0 refactor, optymalizacja 2019-03-25 16:00:01 +01:00
Magdalena Wilczyńska
04927589c2 Added window icon 2019-03-25 14:45:47 +01:00
d59468d1bc bug repaired 2019-03-25 14:16:19 +01:00
Magdalena Wilczyńska
4aa0e7280d Removed print 2019-03-25 14:15:59 +01:00
Magdalena Wilczyńska
0ffc5fa187 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-25 14:12:50 +01:00
Magdalena Wilczyńska
f18f6dcbb2 Enabled multiple images for house 2019-03-25 14:11:25 +01:00
c2149f9a9d 3/4 repaired map-generating 2019-03-25 14:07:25 +01:00
7d13d98757 Half repaired map-generating 2019-03-25 13:44:16 +01:00
dd6a57c701 Added out of map cells as obstacles 2019-03-25 12:58:06 +01:00
Michał Starski
c537d6c581 formatted file to pep8 and changed readme 2019-03-21 01:25:19 +01:00
Michał Starski
59f9eaae36 changed fps count to 60 2019-03-21 01:13:36 +01:00
Konrad Pierzyński
ee58257d54 Dodano podzial projektu na pliki + plik configuracyjnu 2019-03-20 23:33:22 +01:00
Konrad Pierzyński
ebab21363d Poprawiono kod + oskryptowano poruszanie sie smieciarza 2019-03-20 22:36:40 +01:00
b43fd1f878 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-20 11:20:18 +01:00
50bda0aff9 added garbage collector 2019-03-20 11:20:10 +01:00
madziara89
808b154d63 Renamed house images 2019-03-20 10:47:13 +01:00
madziara89
52e8cc1cb6 Added remaining house images 2019-03-20 10:43:10 +01:00
madziara89
08b529761b Added collector image 2019-03-20 10:36:20 +01:00
7040b6b8c3 Update 'README.md' 2019-03-19 18:13:00 +00:00
27fc313acb Displaying landfields + generating thrashes 2019-03-19 19:11:25 +01:00
e2cb089ca9 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-19 18:45:01 +01:00
713cc07525 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-19 18:44:47 +01:00
5356a8dbc2 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-03-19 18:44:00 +01:00
7392c8d3c4 mend 2019-03-19 18:43:42 +01:00
3347e7cf68 mend 2019-03-19 18:40:52 +01:00
219f523dac another merge 2019-03-19 18:37:48 +01:00
Konrad Pierzyński
942852fe5c Small changes 2019-03-19 18:34:10 +01:00
3441168974 merge into master 2019-03-19 18:30:42 +01:00
af54b7283f added landfill class 2019-03-19 18:29:18 +01:00
Konrad Pierzyński
7608e79f26 Dodano metode do generowania smieci przez domku 2019-03-19 18:10:04 +01:00
35fa5f5558 added dynamic home-count setting via command-line 2019-03-19 18:04:43 +01:00
cb9d553a27 added readme 2019-03-19 17:26:28 +01:00
Konrad Pierzyński
0680234e50 Dodano sprawdzenie, czy pole na domek jest typu Grass 2019-03-19 17:21:54 +01:00
Adnovac
45148b1694 Added to-do list 2019-03-19 11:55:48 +01:00