Commit Graph

82 Commits

Author SHA1 Message Date
Adnovac
949f53b985 Usunieto zbedny print 2019-04-02 09:48:46 +02:00
Adnovac
ac0ca70b35 Naprawiono zbieranie z domkow, dodano mozliwosc oddawania smieci 2019-04-02 09:47:00 +02:00
Michal Starski
e2f76d06a5 Merge branch 'master' of https://git.wmi.amu.edu.pl/s440556/SZI2019SmieciarzWmi 2019-04-01 15:47:12 +02:00
Michal Starski
206a101d17 Dodano zbieranie smieci 2019-04-01 15:45:48 +02:00
Magdalena Wilczyńska
734e3681c9 New images for GC, house, road and grass 2019-04-01 15:36:20 +02:00
Michal Starski
6168a2ed8f removed env 2019-04-01 14:42:17 +02:00
Michal Starski
716420b35b merge into maste 2019-04-01 14:39:08 +02:00
Adnovac
5e7d2e9111 Naprawiono ostatnia mape 2019-04-01 14:37:14 +02:00
Michal Starski
958c7ec271 Added working movement 2019-04-01 14:36:27 +02:00
Adnovac
8542676d15 naprawiono mapy 2019-04-01 14:34:53 +02:00
Konrad Pierzyński
ccb752c751 Poprawiono problem z generowaniem map 2019-04-01 14:32:24 +02:00
Michal Starski
17847fc58a removed trashes added movement added requirements 2019-04-01 14:10:14 +02:00
Konrad Pierzyński
7cf49721a5 Wersja z problemem generowania prostokatnych map 2019-04-01 14:07:27 +02:00
Konrad Pierzyński
e7bede9f5f Czyszczenie repo 2019-04-01 13:32:08 +02:00
Konrad Pierzyński
86fdd1543f Male bugfixy 2019-04-01 13:29:13 +02:00
Magdalena Wilczyńska
7c88f065eb Updated images 2019-04-01 12:52:45 +02:00
Konrad Pierzyński
65b5c8074b Dodano generowanie obiektow na siatce z plikow map 2019-04-01 12:48:11 +02:00
madziara89
316f80387f Added images and fixed maps 2019-04-01 11:14:25 +02:00
Magdalena Wilczyńska
91d34ad043 Add more maps 2019-04-01 10:58:30 +02:00
Magdalena Wilczyńska
0efe92bee1 Add first maps 2019-04-01 10:41:11 +02:00
Konrad Pierzyński
f538b2ffbf Struktura folderow 2019-04-01 10:38:43 +02:00
Konrad Pierzyński
974e5d3e8d Utworzenie struktury folderow 2019-04-01 10:36:41 +02:00
Konrad Pierzyński
e680636923 Inicjalizacja nowej wersji projektu 2019-04-01 10:33:32 +02:00
Magdalena Wilczyńska
04ee4fc1da Added house stats, removed hud display 2019-03-27 10:20:22 +01:00
Magdalena Wilczyńska
5454710e15 Cleaned up, updated report 2019-03-27 08:43:24 +01:00
Magdalena Wilczyńska
adde0b2286 Added importing stats to csv file 2019-03-27 08:37:51 +01:00
f5bc39f5ab fixed bug with collecting garbage 2019-03-27 00:37:54 +01:00
8244372044 Zaktualizuj 'raports/SI_Raport_1.md' 2019-03-26 23:23:52 +00:00
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