Commit Graph

Select branches

Hide Pull Requests

adamT_branch

adam_branch

mari_branch

master

mikolaj_branch

#1

#10

#11

#12

#13

#14

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 21021ea59a working version that was presented master = 2020-06-15 17:43:52 +0200
• a7d3f0b356 Adam T - Final Projektu s444496 2020-06-15 13:14:46 +0200
• e6363ef448 added readme v2 = 2020-06-14 23:27:46 +0200
• 8897568fa9 added readme = 2020-06-14 23:26:50 +0200
• f895a4b637 added requirements Adam Wojdyła 2020-06-14 20:01:14 +0000
• 07d81b4553 Fix raports Mariia Kuzmenko 2020-06-11 14:58:21 +0300
• 0186ef8e00 Food clasification network Mariia Kuzmenko 2020-06-11 14:54:53 +0300
• f5e403b331 integracja projektu genetycznego generatora stolików s444417 2020-06-09 23:21:04 +0200
• 0bfeeb2486 made relative path to model = 2020-05-20 08:30:30 +0200
• 83b21994b2 delete idea, venv mikolaj_branch s444417 2020-05-20 02:10:50 +0200
• c10e063881 second commit s444417 2020-05-20 01:56:06 +0200
• 592a250491 second commit s444417 2020-05-20 01:55:40 +0200
• 0052d2c36f test commit s444417 2020-05-20 01:52:58 +0200
• 6dbec012a7 added raport and jupyter notebook file. Sleep after passing orders = 2020-05-18 09:49:24 +0200
• 1be0ecff48 removed venv from repo, sleep after collecting orders adam_branch = 2020-05-17 19:34:15 +0200
• 23b85d2549 waiter recognizes images, checks prediction, serves dish with correlated table = 2020-05-17 02:22:51 +0200
• 723568cf31 printing out recognized orders, bug with table thread = 2020-05-16 12:08:02 +0200
• 87483f5838 kitchen prints images, stopping threads = 2020-05-14 23:22:30 +0200
• be49eb4d00 passing and receiving orders from kitchen = 2020-05-13 01:59:34 +0200
• a2e474d520 waiter goes to kitchen after collected orders = 2020-05-12 10:52:56 +0200
• 90a9644a32 kitchenManager and Kitchen class added = 2020-05-11 20:42:17 +0200
• 7b4d017549 Merge branch 'mari_branch' of s444417/ProjektAI into master Mariia Kuzmenko 2020-05-11 15:50:25 +0000
• 2f7c3d87ce My test commit #14 mari_branch s442859 2020-05-11 17:46:21 +0200
• 82dae22676 AdamT - Podprojekt Raport s444496 2020-05-10 19:48:04 +0200
• 172f97bc8c AdamT_Podprojekt_Final s444496 2020-05-10 00:04:33 +0200
• 56689faa23 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI s444496 2020-05-07 19:06:33 +0200
• fbbd929259 AdamT_Podprojekt_v5 s444496 2020-05-07 18:56:32 +0200
• a45ebf5e92 AdamT_Podprojekt_v4 s444496 2020-05-07 18:36:20 +0200
• 79d7b98752 Merge branch 'mikolaj_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-05-06 20:06:06 +0000
• a9797d7599 Drobne poprawki i porządki. #13 s444417 2020-05-06 22:03:23 +0200
• fec0bc2b4c Adam_Podprojekt_v4 adamT_branch s444496 2020-05-06 20:06:58 +0200
• f43ec42bad Adam_Podprojekt_v1 s444496 2020-05-06 19:55:41 +0200
• 5ea5322cbc Merge branch 'mikolaj_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-05-02 23:22:33 +0000
• 840b9e7afc przeniesiono generowanie tooltipów do ImageCache, lepsza synchronizacja pobierania zamówienia od stolika #12 s444417 2020-05-03 01:19:34 +0200
• 7611d2309c Prześlij pliki do '' Mikołaj Krzymiński 2020-04-27 17:49:50 +0000
• 7e00a9de51 Prześlij pliki do '' Adam Toppmayer 2020-04-27 16:07:04 +0000
• 1f167f28cd Merge branch 'mikolaj_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-04-27 10:39:59 +0000
• aa3fb8c414 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI into mikolaj_branch #11 s444417 2020-04-27 12:33:50 +0200
• dba30bae63 Obracanie kelnera (algorytm i grafika). Kilku kelnerów może chodzić równocześnie. Tooltip z ilością zebranych zamówień. s444417 2020-04-27 12:22:19 +0200
• c0f5a8f7f7 added BFS = 2020-04-27 10:49:30 +0200
• 914e9404f0 merged with master, conflicts resolved = 2020-04-27 10:46:59 +0200
• c39818df87 added idea to .gitignore = 2020-04-27 10:43:47 +0200
• f0a116cc9e Rozne pliki z pygame s444496 2020-04-25 11:26:27 +0200
• 2ded95f69c Merge branch 'mikolaj_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-04-21 19:15:08 +0000
• 760f2607e2 Gitignore. #10 s444417 2020-04-20 23:23:28 +0200
• a3a6c95649 Usunięto TaskManager. s444417 2020-04-20 23:21:31 +0200
• 8b39625137 Automatyczne poruszanie, porządki, cache do dodawania obrazków. s444417 2020-04-20 23:19:13 +0200
• 1cdb80aa96 venv s444417 2020-04-20 22:51:16 +0200
• 552a3adf1e venv s444417 2020-04-20 22:48:03 +0200
• 4621853e1b porzadki s444417 2020-04-20 22:45:20 +0200
• 9e6dc4d628 Merge branch 'adamT_branch' of s444417/ProjektAI into master #8 Adam Toppmayer 2020-04-06 16:34:38 +0000
• c45ddd3d19 Tytuł krótki #7 s444496 2020-04-06 18:30:28 +0200
• e9d06336df Tytuł krótki s444496 2020-04-06 18:27:11 +0200
• 785f3cbd31 Merge branch 'miki_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-04-06 14:53:56 +0000
• c8854fda9a Prześlij pliki do '' #6 Mikołaj Krzymiński 2020-04-05 23:49:48 +0000
• 90af9e5f73 Merge branch 'miki_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-04-05 15:35:02 +0000
• 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 #5 s444417 2020-04-05 17:27:11 +0200
• cd4d74b019 Merge branch 'miki_branch' of s444417/ProjektAI into master #4 Mikołaj Krzymiński 2020-04-03 22:13:03 +0000
• 3306461a60 Merge branch 'master' of https://git.wmi.amu.edu.pl/s444417/ProjektAI into miki_branch #3 s444417 2020-04-04 00:07:34 +0200
• 6bc7a65d94 dodano manager rysujący wszystkie obiekty, kelner rozpoznaje kolizje ze stołami s444417 2020-04-03 23:54:29 +0200
• c2413ec4dc Merge branch 'miki_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-03-26 21:45:15 +0000
• 739199710d klasa kelner s444417 2020-03-26 22:20:03 +0100
• f6224703d0 waiter get extreme XY values #2 s444417 2020-03-24 00:27:45 +0100
• b9f720e0c7 test #9 Adam Wojdyla 2020-03-23 23:47:44 +0100
• 20e4e4fcc2 branch test commit s444417 2020-03-23 18:47:02 +0100
• b6dac34e87 Merge remote-tracking branch 'origin/master' s444417 2020-03-22 22:02:45 +0100
• 4cab5af4a6 klasa kelner s444417 2020-03-22 21:58:05 +0100
• 8b19428481 klasa kelner s444417 2020-03-22 21:52:12 +0100
• 2dd3357a2c Merge branch 'adam_branch' of s444417/ProjektAI into master Mikołaj Krzymiński 2020-03-22 17:28:46 +0000
• 42d6989b7a deleted .idea v2 #1 Adam Wojdyla 2020-03-22 18:26:47 +0100
• feb9eec708 deleted .idea/ Adam Wojdyla 2020-03-22 18:19:15 +0100
• 78a4c19601 turned grid and waiter into objects, added gitignore file, modified movement and graphic layer update Adam Wojdyla 2020-03-22 18:10:44 +0100
• a89bac8bd6 klasa kelner s444417 2020-03-22 16:09:04 +0100
• 5fc44db844 first commit s444417 2020-03-22 02:01:57 +0100