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

Merge branch 'UI_implementation' into lighting-updates

Browse Source 
# Conflicts:
#	Content/Levels/Build.umap
This commit is contained in:
MARCEL HARA 2023-03-29 17:08:57 +01:00
commit 95f81d3a10
15 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/TutorialAssets/Lamp.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/Combat_UI.uasset (Stored with Git LFS)
View File

Binary file not shown.

3
Content/Blueprints/Combat_UI/Gun/Book_Open.uasset Normal file
View File

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

BIN
Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/Gun/Book_Open_low_Book_Open_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset Normal file
View File

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

BIN
Content/Blueprints/Combat_UI/Health_bar_empty.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/Health_bar_full.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/material_empty.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/material_full.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Environment/mushrooms/Skinny_Mushroom/M_Skinny_mushrooms.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Environment/mushrooms/Skinny_Mushroom/skinny_mushrooms_uved_lambert1_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Environment/mushrooms/skiny_mushrooms.uasset (Stored with Git LFS)
View File

Binary file not shown.