Commit graph

23 commits

Author SHA1 Message Date
AKP
dae609288a
Code formatting 2025-03-23 18:49:40 +00:00
AKP
30a927f69c Merge branch 'display' 2025-03-23 11:59:18 +00:00
Joe Penny
6b0cef4929 toppings 2025-03-23 11:59:03 +00:00
AKP
f732d664ac
Merge branch 'display' into interaction 2025-03-23 11:53:57 +00:00
AKP
f5849c6a09 Alter 6 files
Update __main__.py
Update gameplay.py
Update menu.py
Update resources.py
Add game-over.txt
Add character_glasses_5.png
2025-03-23 11:52:31 +00:00
Joe Penny
f4b87d2d5b toppings 2025-03-23 11:49:54 +00:00
Joe Penny
4d528d3441 toppings 2025-03-23 11:45:59 +00:00
Joe Penny
3735581cfe toppings 2025-03-23 11:41:27 +00:00
Joe Penny
a4acdbae43 fix prepare 2025-03-23 11:36:12 +00:00
AKP
6a8cc761a7 Merge branch 'display' into interaction 2025-03-23 11:24:31 +00:00
AKP
549f220081
Make people say something 2025-03-23 11:20:17 +00:00
Joe Penny
b11ab75d45 merging 2025-03-23 10:48:12 +00:00
Joe Penny
cb5ffdc3ae merging 2025-03-23 10:46:44 +00:00
AKP
edfd07c946 Delete joe.jpg 2025-03-23 10:44:18 +00:00
AKP
9f863cd1f2 Alter 9 files
Update components.py
Update gameplay.py
Update resources.py
Add character_head_1.png
Add character_head_2.png
Add character_head_3.png
Add character_torso_1.png
Add character_torso_2.png
Add character_torso_3.png

# Conflicts:
#	game/gameplay.py
#	game/resources.py
2025-03-23 10:42:39 +00:00
Joe Penny
7d4a9e8d02 tidying 2025-03-23 01:51:28 +00:00
Joe Penny
85535c171e Making sandwich and checking if correct 2025-03-22 23:10:47 +00:00
Joe Penny
09ba5f8edf Food buttons 2025-03-22 18:08:42 +00:00
AKP
732d4873e5 Alter 4 files
Update __main__.py
Update components.py
Update menu.py
Update resources.py
2025-03-22 17:55:53 +00:00
AKP
2bab33b413
Alter 3 files
Update components.py
Update menu.py
Update resources.py
2025-03-22 17:02:34 +00:00
AKP
0e263ac7df
Alter 6 files
Update __main__.py
Update components.py
Update menu.py
Update resources.py
Add splash.png
Add util.py
2025-03-22 15:56:49 +00:00
AKP
b1a005dbbc
Alter 2 files
Update __main__.py
Update resources.py
2025-03-22 15:14:03 +00:00
AKP
dfb94d1ae5
Alter 2 files
Update __main__.py
Add resources.py
2025-03-22 13:48:32 +00:00