|
|
56689faa23
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI
|
2020-05-07 19:06:33 +02:00 |
|
|
|
fbbd929259
|
AdamT_Podprojekt_v5
|
2020-05-07 18:56:32 +02:00 |
|
|
|
a45ebf5e92
|
AdamT_Podprojekt_v4
|
2020-05-07 18:36:20 +02:00 |
|
|
|
79d7b98752
|
Merge branch 'mikolaj_branch' of s444417/ProjektAI into master
|
2020-05-06 20:06:06 +00:00 |
|
|
|
a9797d7599
|
Drobne poprawki i porządki.
|
2020-05-06 22:03:23 +02:00 |
|
|
|
5ea5322cbc
|
Merge branch 'mikolaj_branch' of s444417/ProjektAI into master
|
2020-05-02 23:22:33 +00:00 |
|
|
|
840b9e7afc
|
przeniesiono generowanie tooltipów do ImageCache, lepsza synchronizacja pobierania zamówienia od stolika
|
2020-05-03 01:19:34 +02:00 |
|
|
|
7611d2309c
|
Prześlij pliki do ''
|
2020-04-27 17:49:50 +00:00 |
|
|
|
1f167f28cd
|
Merge branch 'mikolaj_branch' of s444417/ProjektAI into master
|
2020-04-27 10:39:59 +00:00 |
|
|
|
aa3fb8c414
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI into mikolaj_branch
Conflicts:
.idea/ProjektAI.iml
.idea/misc.xml
kelner/src/managers/WaiterManager.py
|
2020-04-27 12:33:50 +02:00 |
|
|
|
dba30bae63
|
Obracanie kelnera (algorytm i grafika). Kilku kelnerów może chodzić równocześnie. Tooltip z ilością zebranych zamówień.
|
2020-04-27 12:22:19 +02:00 |
|
=
|
c0f5a8f7f7
|
added BFS
|
2020-04-27 10:49:30 +02:00 |
|
=
|
914e9404f0
|
merged with master, conflicts resolved
|
2020-04-27 10:46:59 +02:00 |
|
=
|
c39818df87
|
added idea to .gitignore
|
2020-04-27 10:43:47 +02:00 |
|
|
|
2ded95f69c
|
Merge branch 'mikolaj_branch' of s444417/ProjektAI into master
|
2020-04-21 19:15:08 +00:00 |
|
|
|
760f2607e2
|
Gitignore.
|
2020-04-20 23:23:28 +02:00 |
|
|
|
a3a6c95649
|
Usunięto TaskManager.
|
2020-04-20 23:21:31 +02:00 |
|
|
|
8b39625137
|
Automatyczne poruszanie, porządki, cache do dodawania obrazków.
|
2020-04-20 23:19:13 +02:00 |
|
|
|
1cdb80aa96
|
venv
|
2020-04-20 22:51:16 +02:00 |
|
|
|
552a3adf1e
|
venv
|
2020-04-20 22:48:03 +02:00 |
|
|
|
4621853e1b
|
porzadki
|
2020-04-20 22:45:20 +02:00 |
|
|
|
9e6dc4d628
|
Merge branch 'adamT_branch' of s444417/ProjektAI into master
|
2020-04-06 16:34:38 +00:00 |
|
|
|
c45ddd3d19
|
Tytuł krótki
|
2020-04-06 18:30:28 +02:00 |
|
|
|
e9d06336df
|
Tytuł krótki
|
2020-04-06 18:27:11 +02:00 |
|
|
|
785f3cbd31
|
Merge branch 'miki_branch' of s444417/ProjektAI into master
|
2020-04-06 14:53:56 +00:00 |
|
|
|
c8854fda9a
|
Prześlij pliki do ''
|
2020-04-05 23:49:48 +00:00 |
|
|
|
90af9e5f73
|
Merge branch 'miki_branch' of s444417/ProjektAI into master
|
2020-04-05 15:35:02 +00:00 |
|
|
|
81a2f7db60
|
stoły mają 4 stany. Status gotowy do złożenia zamówienia ustawiany jest w nowym wątku w klasie TaskManager co 3 sekundy dla jednego stolika, kelner moze odbierać zamówienia od stolików gotowych do ich złożenia
|
2020-04-05 17:27:11 +02:00 |
|
|
|
cd4d74b019
|
Merge branch 'miki_branch' of s444417/ProjektAI into master
|
2020-04-03 22:13:03 +00:00 |
|
|
|
3306461a60
|
Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI into miki_branch
|
2020-04-04 00:07:34 +02:00 |
|
|
|
6bc7a65d94
|
dodano manager rysujący wszystkie obiekty, kelner rozpoznaje kolizje ze stołami
|
2020-04-03 23:54:29 +02:00 |
|
|
|
c2413ec4dc
|
Merge branch 'miki_branch' of s444417/ProjektAI into master
|
2020-03-26 21:45:15 +00:00 |
|
|
|
739199710d
|
klasa kelner
|
2020-03-26 22:20:03 +01:00 |
|
|
|
f6224703d0
|
waiter get extreme XY values
|
2020-03-24 00:27:45 +01:00 |
|
Adam Wojdyla
|
b9f720e0c7
|
test
|
2020-03-23 23:47:44 +01:00 |
|
|
|
20e4e4fcc2
|
branch test commit
|
2020-03-23 18:47:02 +01:00 |
|
|
|
b6dac34e87
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# kelner/.idea/workspace.xml
# kelner/main.py
|
2020-03-22 22:02:45 +01:00 |
|
|
|
4cab5af4a6
|
klasa kelner
|
2020-03-22 21:58:05 +01:00 |
|
|
|
8b19428481
|
klasa kelner
|
2020-03-22 21:52:12 +01:00 |
|
|
|
2dd3357a2c
|
Merge branch 'adam_branch' of s444417/ProjektAI into master
|
2020-03-22 17:28:46 +00:00 |
|
Adam Wojdyla
|
42d6989b7a
|
deleted .idea v2
|
2020-03-22 18:26:47 +01:00 |
|
Adam Wojdyla
|
feb9eec708
|
deleted .idea/
|
2020-03-22 18:19:15 +01:00 |
|
Adam Wojdyla
|
78a4c19601
|
turned grid and waiter into objects, added gitignore file, modified movement and graphic layer update
|
2020-03-22 18:10:44 +01:00 |
|
|
|
a89bac8bd6
|
klasa kelner
|
2020-03-22 16:09:04 +01:00 |
|
|
|
5fc44db844
|
first commit
|
2020-03-22 02:01:57 +01:00 |
|
