diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 0897174..91d8297 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -50,6 +50,7 @@ r.Shadow.Virtual.Enable=1 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.DefaultFeature.MotionBlur=False r.CustomDepth=3 +r.DefaultFeature.AutoExposure=False [/Script/WorldPartitionEditor.WorldPartitionEditorSettings] CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet' diff --git a/Content/Blueprints/Characters/BP_Player.uasset b/Content/Blueprints/Characters/BP_Player.uasset index c0e1b59..81f6837 100644 Binary files a/Content/Blueprints/Characters/BP_Player.uasset and b/Content/Blueprints/Characters/BP_Player.uasset differ diff --git a/Content/Blueprints/Items/BP_BookOfFear.uasset b/Content/Blueprints/Items/BP_BookOfFear.uasset new file mode 100644 index 0000000..1931982 Binary files /dev/null and b/Content/Blueprints/Items/BP_BookOfFear.uasset differ diff --git a/Content/Foliages/F_Grass.uasset b/Content/Foliages/F_Grass.uasset new file mode 100644 index 0000000..284fe25 --- /dev/null +++ b/Content/Foliages/F_Grass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68033bc2bc7d78aa60b55679ff3b806a478ac539ee37baf8369dc3e3809f977e +size 100012 diff --git a/Content/Foliages/F_GrassMultiLevel1.uasset b/Content/Foliages/F_GrassMultiLevel1.uasset new file mode 100644 index 0000000..4bacb4b --- /dev/null +++ b/Content/Foliages/F_GrassMultiLevel1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f4f242e6260f98b912688ab5ca9a552b4e0a15f01ad2aed801b7a1bee07cef +size 10405 diff --git a/Content/Foliages/F_GrassMultiLevel2.uasset b/Content/Foliages/F_GrassMultiLevel2.uasset new file mode 100644 index 0000000..da99daa --- /dev/null +++ b/Content/Foliages/F_GrassMultiLevel2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210ec03c54a3bbfc48dd4505d35730366561a4b5b7d3a5c414031c3c1636bc7a +size 102223 diff --git a/Content/Foliages/F_GrassMultiTest.uasset b/Content/Foliages/F_GrassMultiTest.uasset new file mode 100644 index 0000000..85e6304 --- /dev/null +++ b/Content/Foliages/F_GrassMultiTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ac828067ec2a7e42cd91b35fa0b1e99906b450bfe0a1d926a51cae1b58819c3 +size 99005 diff --git a/Content/Foliages/F_Lily.uasset b/Content/Foliages/F_Lily.uasset new file mode 100644 index 0000000..9c2fca0 --- /dev/null +++ b/Content/Foliages/F_Lily.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97946e0504b2fe6c2bd1709870543d801490a4b2fac6ce1b83d49d2965f5666e +size 9704 diff --git a/Content/Foliages/F_OakA.uasset b/Content/Foliages/F_OakA.uasset new file mode 100644 index 0000000..4567e8a --- /dev/null +++ b/Content/Foliages/F_OakA.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d1ef843003be177c473ba652dcf5b3e15e86b45dfd66dcd5e8b67486372b1ab +size 93605 diff --git a/Content/Foliages/F_OakB.uasset b/Content/Foliages/F_OakB.uasset new file mode 100644 index 0000000..51ea81d --- /dev/null +++ b/Content/Foliages/F_OakB.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de3596d991be876c5d367cb2e63f3d8b017fbad6e063b66392439f2a7d49368a +size 97673 diff --git a/Content/Foliages/F_SpruceA.uasset b/Content/Foliages/F_SpruceA.uasset new file mode 100644 index 0000000..9723b65 --- /dev/null +++ b/Content/Foliages/F_SpruceA.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b5b5d0f1db2bd034303a88449e3dbd8cab7ff2e3ef40fc4be1711b57d6e882 +size 98943 diff --git a/Content/Foliages/F_SpruceB.uasset b/Content/Foliages/F_SpruceB.uasset new file mode 100644 index 0000000..e0f4d81 --- /dev/null +++ b/Content/Foliages/F_SpruceB.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:690786da722e9d3da2229069e0a32cf7ef3cf4a97bf2785dad39b88f171cffe1 +size 97302 diff --git a/Content/Foliages/F_Sunflower.uasset b/Content/Foliages/F_Sunflower.uasset new file mode 100644 index 0000000..c2e75a4 --- /dev/null +++ b/Content/Foliages/F_Sunflower.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1125ee0142bf0521a5a2e1b95283786c21bee74c16eed3b42f3fce5ada94a07 +size 95999 diff --git a/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset b/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset new file mode 100644 index 0000000..aeb62e3 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_Level1Restart.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_Saw.uasset b/Content/Levels/Level_1/Blueprints/BP_Saw.uasset new file mode 100644 index 0000000..50aa214 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_Saw.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3ToWall.uasset b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3ToWall.uasset new file mode 100644 index 0000000..9638607 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene3ToWall.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4Shadow.uasset b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4Shadow.uasset new file mode 100644 index 0000000..14db688 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4Shadow.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset new file mode 100644 index 0000000..c7065c4 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_TriggerBoxScene4_End.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_candle.uasset b/Content/Levels/Level_1/Blueprints/BP_candle.uasset new file mode 100644 index 0000000..730cd52 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_candle.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_doorS.uasset b/Content/Levels/Level_1/Blueprints/BP_doorS.uasset new file mode 100644 index 0000000..82a909e Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_doorS.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/BP_wallBack.uasset b/Content/Levels/Level_1/Blueprints/BP_wallBack.uasset new file mode 100644 index 0000000..74a58c7 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/BP_wallBack.uasset differ diff --git a/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset b/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset new file mode 100644 index 0000000..7a245c7 Binary files /dev/null and b/Content/Levels/Level_1/Blueprints/Lights/BP_LightFlickering.uasset differ diff --git a/Content/Levels/Level_1/L_Level1.umap b/Content/Levels/Level_1/L_Level1.umap new file mode 100644 index 0000000..bd88259 Binary files /dev/null and b/Content/Levels/Level_1/L_Level1.umap differ diff --git a/Content/Levels/Level_1/L_Level1_BuiltData.uasset b/Content/Levels/Level_1/L_Level1_BuiltData.uasset new file mode 100644 index 0000000..479aa49 Binary files /dev/null and b/Content/Levels/Level_1/L_Level1_BuiltData.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_BoolSpecial.uasset b/Content/Levels/Level_1/Materials/MI_BoolSpecial.uasset new file mode 100644 index 0000000..eadb062 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_BoolSpecial.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset new file mode 100644 index 0000000..3cee317 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD0Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset new file mode 100644 index 0000000..4ec02ca Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD1Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset new file mode 100644 index 0000000..a779d85 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD2Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset new file mode 100644 index 0000000..2a13ffb Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD3Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset new file mode 100644 index 0000000..c5bb1b9 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD4Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset b/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset new file mode 100644 index 0000000..bdd52df Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_GrassLOD5Level1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsColorWindyLevel1.uasset new file mode 100644 index 0000000..1e6e130 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsLevel1.uasset new file mode 100644 index 0000000..25da1d0 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyFilamentPistilsLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenColorWindyLevel1.uasset new file mode 100644 index 0000000..ffccf04 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenLevel1.uasset new file mode 100644 index 0000000..a05c3be Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyFilamentStamenLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyLeafALevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyLeafALevel1.uasset new file mode 100644 index 0000000..8efd82b Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyLeafALevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyLeafBLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyLeafBLevel1.uasset new file mode 100644 index 0000000..4f84b19 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyLeafBLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyLeafsColorLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyLeafsColorLevel1.uasset new file mode 100644 index 0000000..a8ca434 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyLeafsColorLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyLeafsColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyLeafsColorWindyLevel1.uasset new file mode 100644 index 0000000..ac5620c Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyLeafsColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyPistilsColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyPistilsColorWindyLevel1.uasset new file mode 100644 index 0000000..24d8fcb Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyPistilsColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyPistilsLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyPistilsLevel1.uasset new file mode 100644 index 0000000..43fbbdd Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyPistilsLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyStamenColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyStamenColorWindyLevel1.uasset new file mode 100644 index 0000000..e901916 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyStamenColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyStamenLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyStamenLevel1.uasset new file mode 100644 index 0000000..4fabed1 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyStamenLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyStemColorLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyStemColorLevel1.uasset new file mode 100644 index 0000000..0468e2a Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyStemColorLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyStemColorWindyLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyStemColorWindyLevel1.uasset new file mode 100644 index 0000000..3120f69 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyStemColorWindyLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/MI_LilyStemLevel1.uasset b/Content/Levels/Level_1/Materials/MI_LilyStemLevel1.uasset new file mode 100644 index 0000000..023d4f0 Binary files /dev/null and b/Content/Levels/Level_1/Materials/MI_LilyStemLevel1.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_BookSpecial.uasset b/Content/Levels/Level_1/Materials/M_BookSpecial.uasset new file mode 100644 index 0000000..2b0d662 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_BookSpecial.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_Environment.uasset b/Content/Levels/Level_1/Materials/M_Environment.uasset new file mode 100644 index 0000000..94cdbdb Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_Environment.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentDark.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentDark.uasset new file mode 100644 index 0000000..acec7ce Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentDark.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentDark_2.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentDark_2.uasset new file mode 100644 index 0000000..bdf1f19 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentDark_2.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentDark_3.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentDark_3.uasset new file mode 100644 index 0000000..747881b Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentDark_3.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentDark_4.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentDark_4.uasset new file mode 100644 index 0000000..0457dec Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentDark_4.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentLight.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentLight.uasset new file mode 100644 index 0000000..4ab9ba6 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentLight.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_EnvironmentLightGreen.uasset b/Content/Levels/Level_1/Materials/M_EnvironmentLightGreen.uasset new file mode 100644 index 0000000..001e9cd Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_EnvironmentLightGreen.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_Furniture.uasset b/Content/Levels/Level_1/Materials/M_Furniture.uasset new file mode 100644 index 0000000..1473193 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_Furniture.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_GraveInColor.uasset b/Content/Levels/Level_1/Materials/M_GraveInColor.uasset new file mode 100644 index 0000000..d7882eb Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_GraveInColor.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_LilySpecial.uasset b/Content/Levels/Level_1/Materials/M_LilySpecial.uasset new file mode 100644 index 0000000..ad46342 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_LilySpecial.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_LilySpecialFilament.uasset b/Content/Levels/Level_1/Materials/M_LilySpecialFilament.uasset new file mode 100644 index 0000000..17e8144 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_LilySpecialFilament.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset b/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset new file mode 100644 index 0000000..272a211 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_MonsterRedLevel1Scene4.uasset b/Content/Levels/Level_1/Materials/M_MonsterRedLevel1Scene4.uasset new file mode 100644 index 0000000..116cf76 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_MonsterRedLevel1Scene4.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_MortisBodyLevel1Scene2.uasset b/Content/Levels/Level_1/Materials/M_MortisBodyLevel1Scene2.uasset new file mode 100644 index 0000000..182b2cd Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_MortisBodyLevel1Scene2.uasset differ diff --git a/Content/Levels/Level_1/Materials/M_MortisWireframeLevel1Scene2.uasset b/Content/Levels/Level_1/Materials/M_MortisWireframeLevel1Scene2.uasset new file mode 100644 index 0000000..02569d9 Binary files /dev/null and b/Content/Levels/Level_1/Materials/M_MortisWireframeLevel1Scene2.uasset differ diff --git a/Content/Levels/Level_1/Other/BPA_MonsterLevel1Scene4.uasset b/Content/Levels/Level_1/Other/BPA_MonsterLevel1Scene4.uasset new file mode 100644 index 0000000..0fbf8f4 Binary files /dev/null and b/Content/Levels/Level_1/Other/BPA_MonsterLevel1Scene4.uasset differ diff --git a/Content/Levels/Level_1/Other/BPA_ShadowLevel1Scene2.uasset b/Content/Levels/Level_1/Other/BPA_ShadowLevel1Scene2.uasset new file mode 100644 index 0000000..8624d85 Binary files /dev/null and b/Content/Levels/Level_1/Other/BPA_ShadowLevel1Scene2.uasset differ diff --git a/Content/Levels/Level_1/Other/SM_LilySpecial.uasset b/Content/Levels/Level_1/Other/SM_LilySpecial.uasset new file mode 100644 index 0000000..f0fabcc Binary files /dev/null and b/Content/Levels/Level_1/Other/SM_LilySpecial.uasset differ diff --git a/Content/Levels/Level_1/Sequencers/OnBeginPlay/Seq_Level1_Lamp.uasset b/Content/Levels/Level_1/Sequencers/OnBeginPlay/Seq_Level1_Lamp.uasset new file mode 100644 index 0000000..54e203d Binary files /dev/null and b/Content/Levels/Level_1/Sequencers/OnBeginPlay/Seq_Level1_Lamp.uasset differ diff --git a/Content/Levels/Level_1/Sequencers/Seq_Level1_Begin.uasset b/Content/Levels/Level_1/Sequencers/Seq_Level1_Begin.uasset new file mode 100644 index 0000000..7d5ba4b Binary files /dev/null and b/Content/Levels/Level_1/Sequencers/Seq_Level1_Begin.uasset differ diff --git a/Content/Levels/Level_1/Sequencers/Seq_Level1_Review.uasset b/Content/Levels/Level_1/Sequencers/Seq_Level1_Review.uasset new file mode 100644 index 0000000..f7470d3 Binary files /dev/null and b/Content/Levels/Level_1/Sequencers/Seq_Level1_Review.uasset differ diff --git a/Content/Levels/Level_1/Sequencers/Seq_Level1_Shadow.uasset b/Content/Levels/Level_1/Sequencers/Seq_Level1_Shadow.uasset new file mode 100644 index 0000000..795c8ca Binary files /dev/null and b/Content/Levels/Level_1/Sequencers/Seq_Level1_Shadow.uasset differ diff --git a/Content/Levels/Level_1/Sequencers/Seq_Level1_gateUp.uasset b/Content/Levels/Level_1/Sequencers/Seq_Level1_gateUp.uasset new file mode 100644 index 0000000..0508b9d Binary files /dev/null and b/Content/Levels/Level_1/Sequencers/Seq_Level1_gateUp.uasset differ diff --git a/Content/Levels/Test/Actors/InteractablesTest/BP_Test_InteractablEdit.uasset b/Content/Levels/Test/Actors/InteractablesTest/BP_Test_InteractablEdit.uasset deleted file mode 100644 index 85fcb37..0000000 Binary files a/Content/Levels/Test/Actors/InteractablesTest/BP_Test_InteractablEdit.uasset and /dev/null differ diff --git a/Content/Levels/Test/L_Test.umap b/Content/Levels/Test/L_Test.umap index a080b8a..8612627 100644 Binary files a/Content/Levels/Test/L_Test.umap and b/Content/Levels/Test/L_Test.umap differ diff --git a/Content/MaterialsLibrary/Functions/MF_DistanceOpacity.uasset b/Content/MaterialsLibrary/Functions/MF_DistanceOpacity.uasset new file mode 100644 index 0000000..96a3367 Binary files /dev/null and b/Content/MaterialsLibrary/Functions/MF_DistanceOpacity.uasset differ diff --git a/Content/MaterialsLibrary/Functions/MF_RotateToCamera.uasset b/Content/MaterialsLibrary/Functions/MF_RotateToCamera.uasset new file mode 100644 index 0000000..1ad0ad4 Binary files /dev/null and b/Content/MaterialsLibrary/Functions/MF_RotateToCamera.uasset differ diff --git a/Content/MaterialsLibrary/Functions/MF_Scale.uasset b/Content/MaterialsLibrary/Functions/MF_Scale.uasset new file mode 100644 index 0000000..c4ba6d3 Binary files /dev/null and b/Content/MaterialsLibrary/Functions/MF_Scale.uasset differ diff --git a/Content/MaterialsLibrary/Functions/MF_ScaleDownByDistance.uasset b/Content/MaterialsLibrary/Functions/MF_ScaleDownByDistance.uasset new file mode 100644 index 0000000..5fddc05 Binary files /dev/null and b/Content/MaterialsLibrary/Functions/MF_ScaleDownByDistance.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Dirt.uasset b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Dirt.uasset new file mode 100644 index 0000000..2a45b4e Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Dirt.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset new file mode 100644 index 0000000..7706c8f Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Grass.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Road.uasset b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Road.uasset new file mode 100644 index 0000000..d357db3 Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Road.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Rocks.uasset b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Rocks.uasset new file mode 100644 index 0000000..7c9dc0f Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Rocks.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Snow.uasset b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Snow.uasset new file mode 100644 index 0000000..1c8a3ac Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/LandLayers/LL_Snow.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/MI_Landscape.uasset b/Content/MaterialsLibrary/Landscapes/MI_Landscape.uasset new file mode 100644 index 0000000..0bc3236 Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/MI_Landscape.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset b/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset new file mode 100644 index 0000000..3e20d49 Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/M_Landscape.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassDiffuse2048.uasset b/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassDiffuse2048.uasset new file mode 100644 index 0000000..2260687 Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassDiffuse2048.uasset differ diff --git a/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassNormal2048.uasset b/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassNormal2048.uasset new file mode 100644 index 0000000..ff05fe8 Binary files /dev/null and b/Content/MaterialsLibrary/Landscapes/Textures/T_LandscapeGrassNormal2048.uasset differ diff --git a/Content/MaterialsLibrary/MI_Bool.uasset b/Content/MaterialsLibrary/MI_Bool.uasset new file mode 100644 index 0000000..7a2805f Binary files /dev/null and b/Content/MaterialsLibrary/MI_Bool.uasset differ diff --git a/Content/MaterialsLibrary/MI_RedGlow.uasset b/Content/MaterialsLibrary/MI_RedGlow.uasset new file mode 100644 index 0000000..6be6bad Binary files /dev/null and b/Content/MaterialsLibrary/MI_RedGlow.uasset differ diff --git a/Content/MaterialsLibrary/MI_SphereOfCloud.uasset b/Content/MaterialsLibrary/MI_SphereOfCloud.uasset new file mode 100644 index 0000000..0e8462f Binary files /dev/null and b/Content/MaterialsLibrary/MI_SphereOfCloud.uasset differ diff --git a/Content/MaterialsLibrary/M_Body.uasset b/Content/MaterialsLibrary/M_Body.uasset new file mode 100644 index 0000000..c2ce3c9 Binary files /dev/null and b/Content/MaterialsLibrary/M_Body.uasset differ diff --git a/Content/MaterialsLibrary/M_CompanionCube.uasset b/Content/MaterialsLibrary/M_CompanionCube.uasset new file mode 100644 index 0000000..31d0d9d Binary files /dev/null and b/Content/MaterialsLibrary/M_CompanionCube.uasset differ diff --git a/Content/MaterialsLibrary/M_Emission.uasset b/Content/MaterialsLibrary/M_Emission.uasset new file mode 100644 index 0000000..d5bc3d6 Binary files /dev/null and b/Content/MaterialsLibrary/M_Emission.uasset differ diff --git a/Content/MaterialsLibrary/M_Glass.uasset b/Content/MaterialsLibrary/M_Glass.uasset new file mode 100644 index 0000000..c9dea7c Binary files /dev/null and b/Content/MaterialsLibrary/M_Glass.uasset differ diff --git a/Content/MaterialsLibrary/M_Pointer.uasset b/Content/MaterialsLibrary/M_Pointer.uasset new file mode 100644 index 0000000..9a809c0 Binary files /dev/null and b/Content/MaterialsLibrary/M_Pointer.uasset differ diff --git a/Content/MaterialsLibrary/M_SphereOfCloud.uasset b/Content/MaterialsLibrary/M_SphereOfCloud.uasset new file mode 100644 index 0000000..521dcd6 Binary files /dev/null and b/Content/MaterialsLibrary/M_SphereOfCloud.uasset differ diff --git a/Content/MaterialsLibrary/M_Wireframe.uasset b/Content/MaterialsLibrary/M_Wireframe.uasset new file mode 100644 index 0000000..781919b Binary files /dev/null and b/Content/MaterialsLibrary/M_Wireframe.uasset differ diff --git a/Content/MaterialsLibrary/Particles/P_SphereOfCloud.uasset b/Content/MaterialsLibrary/Particles/P_SphereOfCloud.uasset new file mode 100644 index 0000000..6665021 Binary files /dev/null and b/Content/MaterialsLibrary/Particles/P_SphereOfCloud.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDiffuse.uasset b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDiffuse.uasset new file mode 100644 index 0000000..f69e48d Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDiffuse.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDisplacement.uasset b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDisplacement.uasset new file mode 100644 index 0000000..7fbe72a Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeDisplacement.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeEmission.uasset b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeEmission.uasset new file mode 100644 index 0000000..0b71926 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeEmission.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeNormals.uasset b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeNormals.uasset new file mode 100644 index 0000000..9646735 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/CompanionCube/T_CompanionCubeNormals.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_D.uasset b/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_D.uasset new file mode 100644 index 0000000..b322be3 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_D.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_N.uasset b/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_N.uasset new file mode 100644 index 0000000..5305897 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_Ground_Gravel_N.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_MacroVariation.uasset b/Content/MaterialsLibrary/TexturesS/T_MacroVariation.uasset new file mode 100644 index 0000000..4d2f587 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_MacroVariation.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PictureHouse.uasset b/Content/MaterialsLibrary/TexturesS/T_PictureHouse.uasset new file mode 100644 index 0000000..b23e710 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PictureHouse.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PictureHouse_Mat.uasset b/Content/MaterialsLibrary/TexturesS/T_PictureHouse_Mat.uasset new file mode 100644 index 0000000..8428e55 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PictureHouse_Mat.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PictureMonster.uasset b/Content/MaterialsLibrary/TexturesS/T_PictureMonster.uasset new file mode 100644 index 0000000..962ee3b Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PictureMonster.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PictureMonster_Mat.uasset b/Content/MaterialsLibrary/TexturesS/T_PictureMonster_Mat.uasset new file mode 100644 index 0000000..a7d1f3c Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PictureMonster_Mat.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PicturePack.uasset b/Content/MaterialsLibrary/TexturesS/T_PicturePack.uasset new file mode 100644 index 0000000..be44b3e Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PicturePack.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_PicturePack_Mat.uasset b/Content/MaterialsLibrary/TexturesS/T_PicturePack_Mat.uasset new file mode 100644 index 0000000..74f0bc0 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_PicturePack_Mat.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceAntsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceAntsNormal.uasset new file mode 100644 index 0000000..7a67606 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceAntsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceArrowsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceArrowsNormal.uasset new file mode 100644 index 0000000..16e7b68 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceArrowsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceDiamondsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceDiamondsNormal.uasset new file mode 100644 index 0000000..c07e687 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceDiamondsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceDonutsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceDonutsNormal.uasset new file mode 100644 index 0000000..0b9f30a Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceDonutsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceDotsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceDotsNormal.uasset new file mode 100644 index 0000000..67ab5e8 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceDotsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceLeechsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceLeechsNormal.uasset new file mode 100644 index 0000000..6d39885 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceLeechsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceLineNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceLineNormal.uasset new file mode 100644 index 0000000..91b0034 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceLineNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/T_SurfaceRowsNormal.uasset b/Content/MaterialsLibrary/TexturesS/T_SurfaceRowsNormal.uasset new file mode 100644 index 0000000..2090776 Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/T_SurfaceRowsNormal.uasset differ diff --git a/Content/MaterialsLibrary/TexturesS/loop.uasset b/Content/MaterialsLibrary/TexturesS/loop.uasset new file mode 100644 index 0000000..4c6a49f Binary files /dev/null and b/Content/MaterialsLibrary/TexturesS/loop.uasset differ diff --git a/Content/Models/Characters/Human/BPA_HumanPlayer.uasset b/Content/Models/Characters/Human/BPA_HumanPlayer.uasset index 6cf2923..7b0139f 100644 --- a/Content/Models/Characters/Human/BPA_HumanPlayer.uasset +++ b/Content/Models/Characters/Human/BPA_HumanPlayer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:368386f1aedf8fc2beaad8ac765857290ea3dc0ab27249297e7e7cf45bb30511 -size 1212543 +oid sha256:67b06536b5eff9a0160c8629420599696e924d919b4870890a15d7e6ad7d0680 +size 1211899 diff --git a/Content/Models/Characters/Shadow/BP_Shadow.uasset b/Content/Models/Characters/Shadow/BP_Shadow.uasset index 2e0f1b9..307b6fb 100644 --- a/Content/Models/Characters/Shadow/BP_Shadow.uasset +++ b/Content/Models/Characters/Shadow/BP_Shadow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f291c70f6bbbfef2b06de965d5e738195a2a995cfd92841e174c516189de4142 -size 64760 +oid sha256:49764a451af241198255819f6ad46d8870dee884da1c04b32e8a5d2ca23062e6 +size 62536 diff --git a/Content/Models/GrayBoxes/SM_WallDoor.uasset b/Content/Models/GrayBoxes/SM_WallDoor.uasset index 0baa0ee..d58af76 100644 --- a/Content/Models/GrayBoxes/SM_WallDoor.uasset +++ b/Content/Models/GrayBoxes/SM_WallDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b31019701006edba43f5268772829227d63435371349e69e0b53a9047987765 -size 17909 +oid sha256:880f8cfd823593bfcb597a856783087e400e07025fb86b265a83ba29680007ca +size 18789 diff --git a/Content/UI/Materials/MM_Words.uasset b/Content/UI/Materials/MM_Words.uasset deleted file mode 100644 index d89942a..0000000 Binary files a/Content/UI/Materials/MM_Words.uasset and /dev/null differ diff --git a/Lost_Edge.uproject b/Lost_Edge.uproject index cae4d3a..4534c52 100644 --- a/Lost_Edge.uproject +++ b/Lost_Edge.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.4", + "EngineAssociation": "{42CC8720-4DDD-EF11-BECE-CEBF292119D8}", "Category": "", "Description": "", "Modules": [ diff --git a/Source/Lost_Edge/Private/CommonFunctions.cpp b/Source/Lost_Edge/Private/CommonFunctions.cpp index d89d537..811f74c 100644 --- a/Source/Lost_Edge/Private/CommonFunctions.cpp +++ b/Source/Lost_Edge/Private/CommonFunctions.cpp @@ -2,11 +2,12 @@ #include "CommonFunctions.h" +#include "GameFramework/Actor.h" #include "InputCoreTypes.h" #include "UObject/Object.h" -bool CommonFunctions::IsNonGameObject(UObject* object) +bool UCommonFunctions::IsNonGameObject(UObject* object) { if(object->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject)) return true; @@ -14,7 +15,7 @@ bool CommonFunctions::IsNonGameObject(UObject* object) return false; } -FText CommonFunctions::GetKeyDisplayName(FKey key) +FText UCommonFunctions::GetKeyDisplayName(FKey key) { if(key == EKeys::MouseWheelAxis) { @@ -23,3 +24,13 @@ FText CommonFunctions::GetKeyDisplayName(FKey key) return key.GetDisplayName(false); } + +void UCommonFunctions::DestroyActorRecursively(AActor* actor) +{ + TArray childs; + actor->GetAttachedActors(childs, true, true); + + for(auto child : childs) + child->Destroy(); + actor->Destroy(); +} diff --git a/Source/Lost_Edge/Private/CommonFunctions.h b/Source/Lost_Edge/Private/CommonFunctions.h index 7cd0671..07edd46 100644 --- a/Source/Lost_Edge/Private/CommonFunctions.h +++ b/Source/Lost_Edge/Private/CommonFunctions.h @@ -2,9 +2,19 @@ #pragma once -class CommonFunctions +#include "Kismet/BlueprintFunctionLibrary.h" + +#include "CommonFunctions.generated.h" + +UCLASS() +class UCommonFunctions : public UBlueprintFunctionLibrary { + GENERATED_BODY() + public: static bool IsNonGameObject(class UObject* object); static FText GetKeyDisplayName(struct FKey key); + + UFUNCTION(BlueprintCallable, Category = Actor) + static void DestroyActorRecursively(class AActor* actor); }; diff --git a/Source/Lost_Edge/Private/CustomGameInstanceBase.h b/Source/Lost_Edge/Private/CustomGameInstanceBase.h index fb46e84..a0adb28 100644 --- a/Source/Lost_Edge/Private/CustomGameInstanceBase.h +++ b/Source/Lost_Edge/Private/CustomGameInstanceBase.h @@ -7,6 +7,8 @@ #include "CustomGameInstanceBase.generated.h" +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FLevelBeginnedDelegate, FName, levelName); + UCLASS() class UCustomGameInstanceBase : public UGameInstance { @@ -20,6 +22,8 @@ public: void AppendInteractableModificatorClass(TSubclassOf modificator); + FLevelBeginnedDelegate OnLevelBeginned; + UPROPERTY(EditDefaultsOnly) TSet> interactionsActivators; TSet> interactionsModificators; diff --git a/Source/Lost_Edge/Private/Interactable/Activators/InCameraInteractableActivator.cpp b/Source/Lost_Edge/Private/Interactable/Activators/InCameraInteractableActivator.cpp index b0d0312..30108f9 100644 --- a/Source/Lost_Edge/Private/Interactable/Activators/InCameraInteractableActivator.cpp +++ b/Source/Lost_Edge/Private/Interactable/Activators/InCameraInteractableActivator.cpp @@ -9,7 +9,7 @@ UInCameraInteractableActivator::UInCameraInteractableActivator(const FObjectInitializer& ObjectInitializer) : UInteractableActivator(ObjectInitializer) { - if(CommonFunctions::IsNonGameObject(this)) + if(UCommonFunctions::IsNonGameObject(this)) return; if(!world || !player) diff --git a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp index a3a9632..d520aaa 100644 --- a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp +++ b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp @@ -24,7 +24,7 @@ constexpr float textureHeight = 720 / 2; UInteractableScreenCapturer::UInteractableScreenCapturer(const FObjectInitializer& ObjectInitializer) : USceneCaptureComponent2D(ObjectInitializer) { - if(CommonFunctions::IsNonGameObject(this)) + if(UCommonFunctions::IsNonGameObject(this)) return; PrimaryComponentTick.bCanEverTick = false; @@ -283,6 +283,6 @@ void UInteractableScreenCapturer::Process() #endif // INTERACTABLE_ACTIVATOR_DEBUG running = false; } - ); + ); } } \ No newline at end of file diff --git a/Source/Lost_Edge/Private/Interactable/Interactable.h b/Source/Lost_Edge/Private/Interactable/Interactable.h index 5f48267..b5fe094 100644 --- a/Source/Lost_Edge/Private/Interactable/Interactable.h +++ b/Source/Lost_Edge/Private/Interactable/Interactable.h @@ -25,7 +25,7 @@ enum class EActivatorType : uint8 Custom5 = 1 << 7 UMETA(DisplayName = "Custom 5") }; -ENUM_CLASS_FLAGS(EActivatorType) +ENUM_CLASS_FLAGS(EActivatorType); UCLASS(Abstract, MinimalAPI, Blueprintable, BlueprintType) class AInteractable : public AActor diff --git a/Source/Lost_Edge/Private/Levels/Level1.cpp b/Source/Lost_Edge/Private/Levels/Level1.cpp new file mode 100644 index 0000000..52037e9 --- /dev/null +++ b/Source/Lost_Edge/Private/Levels/Level1.cpp @@ -0,0 +1,37 @@ +// Oleg Petruny proprietary. + + +#include "Level1.h" + +#include "Atmosphere/AtmosphericFog.h" +#include "Components/LightComponent.h" +#include "Engine/DirectionalLight.h" +#include "Engine/SkyLight.h" +#include "LevelSequencePlayer.h" + +#include "CutsceneManager.h" +#include "MainGameModeBase.h" + +void ALevel1::BeginPlay() +{ + AMainGameModeBase::leadLevel = this; + + ALevelBase::BeginPlay(); + + TurnLight(false); + TurnFog(false); + + CallNextState(); +} + +void ALevel1::TurnLight(bool show) +{ + if(directLight->GetLightComponent()->IsVisible() != show) + directLight->GetLightComponent()->SetVisibility(show); +} + +void ALevel1::TurnFog(bool show) +{ + if(fog->IsHidden() == show) + fog->SetActorHiddenInGame(!show); +} diff --git a/Source/Lost_Edge/Private/Levels/Level1.h b/Source/Lost_Edge/Private/Levels/Level1.h new file mode 100644 index 0000000..67b3297 --- /dev/null +++ b/Source/Lost_Edge/Private/Levels/Level1.h @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "LevelBase.h" + +#include "Level1.generated.h" + +UCLASS(BlueprintType) +class ALevel1 : public ALevelBase +{ + GENERATED_BODY() + +protected: + virtual void BeginPlay() override; + + UFUNCTION(BlueprintCallable) + void TurnLight(bool show); + UFUNCTION(BlueprintCallable) + void TurnFog(bool show); + + UPROPERTY(EditDefaultsOnly) + TSoftObjectPtr directLight; + UPROPERTY(EditDefaultsOnly) + TSoftObjectPtr fog; + +}; diff --git a/Source/Lost_Edge/Private/Levels/LevelBase.cpp b/Source/Lost_Edge/Private/Levels/LevelBase.cpp new file mode 100644 index 0000000..bbd4457 --- /dev/null +++ b/Source/Lost_Edge/Private/Levels/LevelBase.cpp @@ -0,0 +1,32 @@ +// Oleg Petruny proprietary. + + +#include "LevelBase.h" + +#include "LevelSequencePlayer.h" + +#include "CustomGameInstanceBase.h" + +void ALevelBase::BeginPlay() +{ + ALevelScriptActor::BeginPlay(); + + //=== broadcast new level begin play + if(auto GI = Cast(GetWorld()->GetGameInstance())) + GI->OnLevelBeginned.Broadcast(GetFName()); + + //=== start level animations + FMovieSceneSequencePlaybackSettings playbackSettings; + playbackSettings.bAutoPlay = true; + FMovieSceneSequenceLoopCount playbackLoopCount; + playbackLoopCount.Value = -1; + playbackSettings.LoopCount = playbackLoopCount; + for(auto& sequence : onBeginPlaySequences) + { + ALevelSequenceActor* sequenceActor; + auto sequencePlayer = ULevelSequencePlayer::CreateLevelSequencePlayer(GetWorld(), sequence.LoadSynchronous(), playbackSettings, sequenceActor); + onBeginPlaySequencesActors.Add(sequenceActor); + } + + +} diff --git a/Source/Lost_Edge/Private/Levels/LevelBase.h b/Source/Lost_Edge/Private/Levels/LevelBase.h new file mode 100644 index 0000000..7ef3045 --- /dev/null +++ b/Source/Lost_Edge/Private/Levels/LevelBase.h @@ -0,0 +1,32 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Engine/LevelScriptActor.h" + +#include "LevelBase.generated.h" + +UCLASS(BlueprintType) +class ALevelBase : public ALevelScriptActor +{ + GENERATED_BODY() + +public: + UFUNCTION(BlueprintCallable) + inline void CallNextState() { ++state; NextState(); } + +protected: + virtual void BeginPlay() override; + + UFUNCTION(BlueprintImplementableEvent) + void NextState(); + + UPROPERTY(EditDefaultsOnly) + TArray> onBeginPlaySequences; + TArray onBeginPlaySequencesActors; + + UPROPERTY(BlueprintReadOnly) + int32 state = -1; + UPROPERTY(EditDefaultsOnly) + TArray> stateSequences; +}; diff --git a/Source/Lost_Edge/Private/MainGameModeBase.cpp b/Source/Lost_Edge/Private/MainGameModeBase.cpp index 9ab1061..fd01f94 100644 --- a/Source/Lost_Edge/Private/MainGameModeBase.cpp +++ b/Source/Lost_Edge/Private/MainGameModeBase.cpp @@ -10,10 +10,12 @@ #include "CustomGameInstanceBase.h" #include "CutsceneManager.h" +#include "Levels/LevelBase.h" #include "Widgets/WidgetsManager.h" UWidgetsManager* AMainGameModeBase::_widgetsManager = nullptr; UCutsceneManager* AMainGameModeBase::_cutsceneManager = nullptr; +ALevelBase* AMainGameModeBase::leadLevel = nullptr; void AMainGameModeBase::StartPlay() { @@ -57,6 +59,12 @@ UCutsceneManager* AMainGameModeBase::GetCutsceneManager() return _cutsceneManager; } +void AMainGameModeBase::CallNextLevelState() +{ + if(leadLevel) + leadLevel->CallNextState(); +} + void AMainGameModeBase::SwitchCameraMode() { static TWeakObjectPtr _playerPawn = nullptr; diff --git a/Source/Lost_Edge/Private/MainGameModeBase.h b/Source/Lost_Edge/Private/MainGameModeBase.h index 28287f2..ad59888 100644 --- a/Source/Lost_Edge/Private/MainGameModeBase.h +++ b/Source/Lost_Edge/Private/MainGameModeBase.h @@ -19,11 +19,16 @@ public: void SwitchCameraMode(); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintPure) static class UWidgetsManager* GetWidgetsManager(); - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintPure) static class UCutsceneManager* GetCutsceneManager(); + UFUNCTION(BlueprintCallable) + static void CallNextLevelState(); + + static class ALevelBase* leadLevel; + protected: UPROPERTY(EditDefaultsOnly) TSubclassOf widgetManagerClass; diff --git a/Source/Lost_Edge/Private/PlayerBase.cpp b/Source/Lost_Edge/Private/PlayerBase.cpp index cc37fa7..e97f21d 100644 --- a/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/Source/Lost_Edge/Private/PlayerBase.cpp @@ -45,7 +45,7 @@ void APlayerBase::Tick(float DeltaTime) // update isMoving flag auto loc = GetActorLocation(); - isMoving = (loc != oldLocation); + bIsMoving = (loc != oldLocation); oldLocation = std::move(loc); rotationInput = FRotator::ZeroRotator; @@ -100,6 +100,16 @@ void APlayerBase::BeginPlay() LoadInteractablesActivators(); } +bool APlayerBase::IsMoving() +{ + return bIsMoving; +} + +bool APlayerBase::IsRunning() +{ + return GetCharacterMovement()->MaxWalkSpeed > moveSpeed; +} + void APlayerBase::LockPlayer(FPlayerLock lock) { walkLocked += lock.walk; diff --git a/Source/Lost_Edge/Private/PlayerBase.h b/Source/Lost_Edge/Private/PlayerBase.h index 1470046..4d46e87 100644 --- a/Source/Lost_Edge/Private/PlayerBase.h +++ b/Source/Lost_Edge/Private/PlayerBase.h @@ -34,9 +34,13 @@ public: virtual void Tick(float DeltaTime) override; virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; + UFUNCTION(BlueprintPure) + bool IsMoving(); + UFUNCTION(BlueprintPure) + bool IsRunning(); + FVector GetCameraLocation(); FVector GetCameraDirection(); - bool IsMoving() { return isMoving; } void LockPlayer(const FPlayerLock lock); void UnlockPlayer(const FPlayerLock lock); @@ -106,8 +110,7 @@ protected: UPROPERTY(EditDefaultsOnly, BlueprintReadOnly) float maxPitch = 65; - UPROPERTY(BlueprintReadOnly) - bool isMoving = false; + bool bIsMoving = false; class AInteractable* lastInteractable = nullptr; class USpringArmComponent* cameraSpringArm; diff --git a/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp b/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp index f53f1e0..7c31b18 100644 --- a/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp +++ b/Source/Lost_Edge/Private/Widgets/InteractableHintWidgetManager.cpp @@ -45,7 +45,7 @@ void UInteractableHintWidgetManager::Append(const UInteractableModificator* modi } auto hint = Cast(hints->GetChildAt(count++)); - hint->keyText->SetText(CommonFunctions::GetKeyDisplayName(mappings[i].Key)); + hint->keyText->SetText(UCommonFunctions::GetKeyDisplayName(mappings[i].Key)); hint->descriptionText->SetText(mappings[i].Action->ActionDescription); hint->SetVisibility(ESlateVisibility::Visible); }