MeigoFried/GameVsJam
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

2
3d Prototyp/Assets/Animations.meta
View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta
guid: dbfdad9da5148a044b3876906e80bd1b
guid: 4e1e71220c1155642be0e1fb57d1a0b5
========
guid: b5a1bf502fb00de4da1ab0b10ff7ca3f
>>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta