Merge branch 'dev' into houes-modles

This commit is contained in:
Philip W 2023-04-27 23:52:54 +01:00
commit 3a672fb52e
567 changed files with 2336 additions and 566 deletions

BIN
ALICIA/NEW/GoatAttack.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/GoatWalking.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/SM_Goat.FBX (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/SECONDUNREAL.FBX (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/ScienceUnreal.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
CivilianCharacter/Merchant_low_Civilian_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
CivilianCharacter/Merchant_low_Civilian_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

View File

@ -140,3 +140,11 @@ CategorySlot8=Eight
CategorySlot9=Nine CategorySlot9=Nine
CategorySlot0=Zero CategorySlot0=Zero
[/Script/Engine.RendererSettings]
r.ReflectionMethod=1
r.GenerateMeshDistanceFields=True
r.DynamicGlobalIlluminationMethod=1
r.Lumen.TraceMeshSDFs=0
r.SkinCache.CompileShaders=True
r.RayTracing=True

View File

@ -3,7 +3,7 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=F2B2881E401D78B424BDDF9BBE633AFD ProjectID=F2B2881E401D78B424BDDF9BBE633AFD
ProjectVersion=0.2.0 ProjectVersion=0.2.0
CompanyName=Team 2:13 CompanyName=Cave In Studios
ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "The Twilight Abyss") ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "Azure Abyss")
ProjectName=The Twilight Abyss ProjectName=Azure Abyss

View File

@ -81,7 +81,7 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
+ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
+ActionMappings=(ActionName="RightClick",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) +ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
+ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl) +ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl)
+AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY)
+AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY)

BIN
Content/Animations/GoatAttack/GoatAttack.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatAttack/GoatAttack_Anim.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatAttack/lambert2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/GoatWalking.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/GoatWalking_Anim.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/GoatWalking/GoatWalking_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/lambert2.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/Characters/Goat_Enemy/SM_Goat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/SM_Merchant.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.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

BIN
Content/Assets/Objects/Loose_Rope/Rope_1/Rope1_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.

BIN
Content/Assets/Objects/Loose_Rope/Rope_1/m_rope1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Loose_Rope/Rope_2/Rope2_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.

BIN
Content/Assets/Objects/Loose_Rope/Rope_2/m_rope2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Loose_Rope/Rope_3/Rope3_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.

BIN
Content/Assets/Objects/Loose_Rope/Rope_3/m_rope3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Objects/Loose_Rope/lambert1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More