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

Merge branch 'main' of https://gitfrieds.nackenbox.xyz/MeigoFried/GameVsJam

Browse Source
This commit is contained in:
jankaminski1
2024-04-07 15:02:10 +02:00
parent 2b7bd7a0d9 561a11e6d0
commit 2eb1d07da3
41 changed files with 1843 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<<< HEAD:3d Prototyp/Assets/Animations.meta
guid: dbfdad9da5148a044b3876906e80bd1b
========
guid: b5a1bf502fb00de4da1ab0b10ff7ca3f
>>>>>>>> 561a11e6d01bf2df9669da9e53bbf93264bb5dcb:3d Prototyp/Assets/Models/Consumables/Bottle.meta
folderAsset: yes
DefaultImporter:
externalObjects: {}