|
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 |
|