Kaffee

Browse Source

(cherry picked from commit 0cc9ddba16)

# Conflicts:
#	3d Prototyp/Assets/Models/Consumables/Bottle.meta
#	3d Prototyp/Assets/Scenes/GameJamScene.unity

...

This commit is contained in:

Simon Lübeß

2024-04-07 15:46:17 +02:00

parent 5fb4c2d282

commit 0606b1936d

32 changed files with 2657 additions and 440 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1510

3d Prototyp/Assets/Scenes/GameJamScene.unity

File diff suppressed because it is too large Load Diff