Merge remote-tracking branch 'origin/dev' into side-area-2nd-gig

# Conflicts:
#	Content/Levels/Build.umap
This commit is contained in:
Rowland Rowland 2023-05-04 18:01:54 +01:00
commit 8008000522
87 changed files with 251 additions and 18 deletions

View File

@ -15,6 +15,7 @@ ManualIPAddress=
[/Script/Engine.Engine] [/Script/Engine.Engine]
+ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
UseStaticMeshMinLODPerQualityLevels=False
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Levels/Build.Build EditorStartupMap=/Game/Levels/Build.Build
@ -147,4 +148,5 @@ r.DynamicGlobalIlluminationMethod=1
r.Lumen.TraceMeshSDFs=0 r.Lumen.TraceMeshSDFs=0
r.SkinCache.CompileShaders=True r.SkinCache.CompileShaders=True
r.RayTracing=True r.RayTracing=True
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=True

BIN
Content/Assets/Characters/Boss/Boss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Boss/M_Boss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Azos/Azos.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Azos/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Azos/m_Azos.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Eis/Crystal_lambert1_Height.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Eis/Crystal_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Eis/Crystal_lambert1_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Eis/Eis.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Eis/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Eis/m_Eis.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Iroquid/Iroquid_1/m_Iroquid_1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Iroquid/Iroquid_2/m_Iroquid_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Iroquid/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Elements/Probertium/Probertium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Probertium/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Elements/Probertium/m_Probertium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Objects/General_Dressing/M_Statue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/General_Dressing/Statue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/General_Dressing/Statue_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Images/play_icon.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Images/quit_button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Images/settings_button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Levels/Testing/MainMenuLevel.umap (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
UI designs/Settings_UI/play_icon.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
UI designs/Settings_UI/playborder_icon.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
UI designs/Settings_UI/quit_button.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
UI designs/Settings_UI/quitborder_button.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
UI designs/Settings_UI/settings_button.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
UI designs/Settings_UI/settingsborder_button.png (Stored with Git LFS) Normal file

Binary file not shown.