Commit Graph

5 Commits (79f3d731d06c93ae230ea8e92d8a61cc2face5b5)

Author SHA1 Message Date
Simon Lübeß f405a0ef9f Irgendjemand musste es ja machen... 2024-04-09 01:17:44 +02:00
Simon Lübeß 543b35567a Click und Anfang der Prefabisierung 2024-04-07 17:30:22 +02:00
Simon Lübeß 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
jankaminski1 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
Simon Lübeß 0cc9ddba16 Kaffee 2024-04-07 15:46:17 +02:00