Commit Graph

7 Commits

Author SHA1 Message Date
145a45e066 Pömpel angefangen 2024-04-07 18:28:23 +02:00
0606b1936d Kaffee
(cherry picked from commit 0cc9ddba16)

# Conflicts:
#	3d Prototyp/Assets/Models/Consumables/Bottle.meta
#	3d Prototyp/Assets/Scenes/GameJamScene.unity
2024-04-07 16:59:55 +02:00
a27478b727 Revert "Merge branch 'main' of https://gitfrieds.nackenbox.xyz/MeigoFried/GameVsJam"
This reverts commit 7a477817fe, reversing
changes made to 7c127ac68e.
2024-04-07 15:57:24 +02:00
0cc9ddba16 Kaffee 2024-04-07 15:46:17 +02:00
8501bf3aa9 Kühlschrank und Mate 2024-04-07 13:18:54 +02:00
feb82edcd1 Food in Ärsche schieben 2024-04-07 12:39:05 +02:00
dfe1451d3b Interaktionen 2.0 2024-04-07 00:09:59 +02:00