Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'MergingBlockout' into BackupBuild

Browse Source 
# Conflicts:
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
This commit is contained in:
Rafal Swierczek 2023-10-13 13:37:40 +01:00
commit 5e322d35e1
6 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EndlessVendetta/Content/LevelPrototyping/Materials/M_Concrete.uasset Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f229b163290b8a6981b8cc09dd3e1ab594b5cf5dcb73c549bb6480d094f893fa
size 13874

BIN
EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
EndlessVendetta/Content/LevelPrototyping/Materials/Panel_Concrete_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
EndlessVendetta/Content/LevelPrototyping/Scenes/TutorialHit.umap Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6803883c719b379495a997464dc8de768c0d39bdc4b88309709d1b0e61a8d294
size 264200

BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)
View File

Binary file not shown.