marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/NewStory' into NewStory

Browse Source 
# Conflicts:
#	Assets/Animations/Stalker.meta
#	Assets/Animations/Stalker/Stalker_Armor_2D_View.jpg.meta
#	Assets/Animations/Stalker/Stalker_Armor_2D_View.png.meta
#	Assets/Animations/Stalker/Stalker_Cloth_2D_View.jpg.meta
#	Assets/Animations/Stalker/Stalker_Cloth_2D_View.png.meta
This commit is contained in:
szczuras4
2026-01-12 12:09:01 +01:00
parent 94793f53cb c3657f6fda
commit 8d523b2334
33 changed files with 2878 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Animations/Stalker/Stalker_Armor_2D_View.png.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 62901bed1f9ee7b4492c09b9de48aad1
=======
guid: 1b10924a4e6f95c4f8a251ccc1a26058
>>>>>>> origin/NewStory
TextureImporter:
internalIDToNameTable: []
externalObjects: {}