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 |
|
jankaminski1
|
2eb1d07da3
|
Merge branch 'main' of https://gitfrieds.nackenbox.xyz/MeigoFried/GameVsJam
|
2024-04-07 15:02:10 +02:00 |
|
jankaminski1
|
2b7bd7a0d9
|
Toilette und Kaffee schon ein bisschen (mit t und c drücken))
|
2024-04-07 15:00:56 +02:00 |