diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 856425d..d549e60 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -59,7 +59,7 @@ r.MSAACount=4 r.DefaultFeature.LensFlare=False r.ReflectionCaptureResolution=128 r.ReflectionEnvironmentLightmapMixBasedOnRoughness=True -r.AllowGlobalClipPlane=False +r.AllowGlobalClipPlane=True r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=False r.Lumen.TraceMeshSDFs=1 r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 57609cb..e77086e 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -117,7 +117,6 @@ bSkipMovies=False +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Reverbs") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Snapshots") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/VCAs") -+DirectoriesToAlwaysStageAsNonUFS=(Path="") +DirectoriesToAlwaysStageAsNonUFS=(Path="Audio/FMOD/Desktop") bRetainStagedDirectory=False CustomStageCopyHandler= diff --git a/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset index 72aed6b..8acc85c 100644 --- a/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset +++ b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113d1e52f6d9aeebb1a082226fdbbfd7cc0f096f2ab26d87c2b2de4f4133bbf3 -size 140049 +oid sha256:5c5dd18920d8f0e17a1a1e5c5351ed1b31c6aaee324b74882b8c826ec256e26b +size 162842 diff --git a/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset b/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset new file mode 100644 index 0000000..b3ec20f --- /dev/null +++ b/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325894a616e56d222a7a0780aabfc759d297a571343980b4e71026679db03b6e +size 39775 diff --git a/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset b/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset new file mode 100644 index 0000000..810ff4b --- /dev/null +++ b/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88417c8d2e4441ee72f025489a39dc1d2a2056164afd18ce7524648e3ae05b5c +size 40188 diff --git a/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset b/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset new file mode 100644 index 0000000..ea8d756 --- /dev/null +++ b/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92a53e8ca0d092295a2c54447aa723a10a918c028e49487517b48decb8b0d03e +size 39918 diff --git a/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset b/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset new file mode 100644 index 0000000..7b6f960 --- /dev/null +++ b/Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eb8570aec2192cd748fd4a9ed044c126f8bf43b03f46953ceae44e8fee58d07 +size 39944 diff --git a/Content/Levels/Level_2/L_Level2.umap b/Content/Levels/Level_2/L_Level2.umap new file mode 100644 index 0000000..d412783 --- /dev/null +++ b/Content/Levels/Level_2/L_Level2.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f06be145ad81dc049587677dc1ec36c8ae005298c81af1ef8b41c024a089c66 +size 79017144 diff --git a/Content/Levels/Level_2/L_Level2_BuiltData.uasset b/Content/Levels/Level_2/L_Level2_BuiltData.uasset new file mode 100644 index 0000000..688cb81 --- /dev/null +++ b/Content/Levels/Level_2/L_Level2_BuiltData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aac6bfa4ce635de35affda8063abd8dd442e6e6cbcee65388844680fa996eb36 +size 2775337 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_DirtL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_DirtL2.uasset new file mode 100644 index 0000000..5f180b9 --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_DirtL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67adec1228caaa41a80e89352d76af80009039612765ac21048b033d532a5638 +size 1587 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_GrassL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_GrassL2.uasset new file mode 100644 index 0000000..726f07e --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_GrassL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cd42d71713f11b789442e6d7b3c73ce0759b01509beaeace990a30171f0afa6 +size 1594 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_GrassLowL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_GrassLowL2.uasset new file mode 100644 index 0000000..7d0831a --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_GrassLowL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b7a15ed0f1d1eb6ba4de33314458970623164eaea836b10035a4e46ea4ce2ce +size 1617 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_PathL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_PathL2.uasset new file mode 100644 index 0000000..cb958e1 --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_PathL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c90090d0c54c8bdf5541226558df8d308a02a135b14b44b818d71d7a6e302671 +size 1587 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_RockL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_RockL2.uasset new file mode 100644 index 0000000..9ec3dbd --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_RockL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772e22ed3a7e9a05573caf1cb3cafb82ff737de049cb511dd76209053aea1e6d +size 1587 diff --git a/Content/Levels/Level_2/Materials/LandLayers/LL_SnowL2.uasset b/Content/Levels/Level_2/Materials/LandLayers/LL_SnowL2.uasset new file mode 100644 index 0000000..7518654 --- /dev/null +++ b/Content/Levels/Level_2/Materials/LandLayers/LL_SnowL2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9f0800b29dea043f4574d7de069d963875cf23471ce41f3b4fd716d680a7c04 +size 1587 diff --git a/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset b/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset new file mode 100644 index 0000000..2e04d0d --- /dev/null +++ b/Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0172a482e70372fe16dd12f08f575259659588bc3da8de993f28ef8ef93eaffc +size 97191 diff --git a/Content/Levels/Level_2/Materials/M_BadPillow2.uasset b/Content/Levels/Level_2/Materials/M_BadPillow2.uasset new file mode 100644 index 0000000..5dacb77 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_BadPillow2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c0b08df96801bc0e639be156555a64b92a1feeacf7497c68abdecc1370618af +size 94315 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet1.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet1.uasset new file mode 100644 index 0000000..1ee9cad --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08985ad5698e0fecd48aa83b54f3c3d3ba3df23c8dbe5d62de5d674dc86710af +size 17488 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet2.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet2.uasset new file mode 100644 index 0000000..909a80c --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:031bb2fc56a4e815fcf0be22a29c90a6273ae346eec1e8b842e4ed0cbfa25260 +size 14582 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet2B.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet2B.uasset new file mode 100644 index 0000000..46b410b --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet2B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f28f825321de4d4bf840c55eea15476aa6df8abfd6005e50e2d965d52c1ee245 +size 15435 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet2C.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet2C.uasset new file mode 100644 index 0000000..b830c81 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet2C.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a07c08f4bff668016eaa09e8ccaa07725c5a68246369799c4d0f69285785ff13 +size 15078 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet3.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet3.uasset new file mode 100644 index 0000000..706eba7 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec300afc60106ec8f2f573dd2e3a30fc26e171ab3f4ec81aacfa98f1d37b73c4 +size 16646 diff --git a/Content/Levels/Level_2/Materials/M_HouseCarpet4.uasset b/Content/Levels/Level_2/Materials/M_HouseCarpet4.uasset new file mode 100644 index 0000000..802b379 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseCarpet4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1112f75545013552d47a2efa8d650e9b683ea329c9c3cc769173ab7fe582bcd +size 16968 diff --git a/Content/Levels/Level_2/Materials/M_HouseDoorstep.uasset b/Content/Levels/Level_2/Materials/M_HouseDoorstep.uasset new file mode 100644 index 0000000..70b3ff5 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseDoorstep.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:295bb3fa02653828e3a52368484d891311e619791b6454ef7eec1a3fc59a4912 +size 113043 diff --git a/Content/Levels/Level_2/Materials/M_HouseFloor1.uasset b/Content/Levels/Level_2/Materials/M_HouseFloor1.uasset new file mode 100644 index 0000000..0a3847c --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseFloor1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070eb80cea71fee1365211f2e4215e3e002eb1e181ce47650a625da4af022c4d +size 111115 diff --git a/Content/Levels/Level_2/Materials/M_HouseFloor2.uasset b/Content/Levels/Level_2/Materials/M_HouseFloor2.uasset new file mode 100644 index 0000000..c3fd386 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseFloor2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:424b03261cbd8d270764af9e90b94d2082e0d70afbb1557dd836701c9df2f4b7 +size 96501 diff --git a/Content/Levels/Level_2/Materials/M_HouseFloor2B.uasset b/Content/Levels/Level_2/Materials/M_HouseFloor2B.uasset new file mode 100644 index 0000000..615d3d5 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseFloor2B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47aa01b779897533c47b0ad04f84dc74b61765c9e0fffd0c43cfef2556678cd8 +size 15791 diff --git a/Content/Levels/Level_2/Materials/M_HouseRoof2.uasset b/Content/Levels/Level_2/Materials/M_HouseRoof2.uasset new file mode 100644 index 0000000..18496a4 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseRoof2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd39a64fb33947966f86f6cb1184d6b1d60328811f603d01725dda038867d25b +size 102312 diff --git a/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset b/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset new file mode 100644 index 0000000..34e6660 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:850b1d4e7eb80ca0784c8f600fb33e6ef357bc8395e0c36b019f125073cae747 +size 15624 diff --git a/Content/Levels/Level_2/Materials/M_HouseStairs.uasset b/Content/Levels/Level_2/Materials/M_HouseStairs.uasset new file mode 100644 index 0000000..0de4cad --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseStairs.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9ec10fb16c53880f44a3ecac72aba277479632f34f9d3f4800340ee2391a832 +size 107553 diff --git a/Content/Levels/Level_2/Materials/M_HouseWall2.uasset b/Content/Levels/Level_2/Materials/M_HouseWall2.uasset new file mode 100644 index 0000000..4ab9d22 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_HouseWall2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:260073a9991685912564e23e9b604d463c7bc9f48e91c63c103ded05e02086f6 +size 16485 diff --git a/Content/Levels/Level_2/Materials/M_RoofInside.uasset b/Content/Levels/Level_2/Materials/M_RoofInside.uasset new file mode 100644 index 0000000..edc9a21 --- /dev/null +++ b/Content/Levels/Level_2/Materials/M_RoofInside.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e042911b39de9e81710256e5256d569b28d7d328d97210ad3891b67d558b117 +size 90778 diff --git a/Content/Levels/Level_2/Materials/PurpleMetal.uasset b/Content/Levels/Level_2/Materials/PurpleMetal.uasset new file mode 100644 index 0000000..b9d0d22 --- /dev/null +++ b/Content/Levels/Level_2/Materials/PurpleMetal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7178f2815615584c0af83939f7ae3e3dc467eed7970a5ea150fb2b196336804f +size 127868 diff --git a/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset b/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset new file mode 100644 index 0000000..8a84320 --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac33c94b4d95a148eef58c88f71dea3d546e2a64abfb3fe7d9e908d07a576c5 +size 124708 diff --git a/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset b/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset new file mode 100644 index 0000000..8287d72 --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:475a6ab757f62db8bede39d573a3f130e561b59f11653b688d86348534b92364 +size 137395 diff --git a/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset b/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset new file mode 100644 index 0000000..6d16984 --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2e568a6f1d590920191ef9863a034c4c98ad38d05fdf1ad8a1082d520fc7465 +size 142617 diff --git a/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset b/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset new file mode 100644 index 0000000..1ab87a8 --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1aef6a94af801105c6fa5cec896d75bd2947dc54f3f82f9888233e9b342f0e28 +size 90505 diff --git a/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset b/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset new file mode 100644 index 0000000..a22272d --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f38da3cbb533d75b113b0c1a5784f5b5268fa67a8849fb0515cb52b3ce874d45 +size 79671 diff --git a/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset b/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset new file mode 100644 index 0000000..c2fb31c --- /dev/null +++ b/Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edc3cd0ddb9afbab7d5e3d9a1fc61a0f891d59958068716f8025229146e6ab7d +size 93075 diff --git a/Content/Levels/Level_2/Textures/T_Grass64_D.uasset b/Content/Levels/Level_2/Textures/T_Grass64_D.uasset new file mode 100644 index 0000000..138542a --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Grass64_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7ec99414341eba6683de364144ac62c8f707155953ba6e4bbc2c41bf0554010 +size 13780 diff --git a/Content/Levels/Level_2/Textures/T_Grass64_N.uasset b/Content/Levels/Level_2/Textures/T_Grass64_N.uasset new file mode 100644 index 0000000..6393b69 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Grass64_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad16e1152930e6fcad7258e8c2645d9e387ada46745797943acb16e6eb9090f7 +size 15212 diff --git a/Content/Levels/Level_2/Textures/T_Grass_D.uasset b/Content/Levels/Level_2/Textures/T_Grass_D.uasset new file mode 100644 index 0000000..a1dcd84 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Grass_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f0bd6e424255a9625a872fedd0df5aa0259a64f40b559f42f4eb90125a45f9 +size 2172695 diff --git a/Content/Levels/Level_2/Textures/T_Grass_N.uasset b/Content/Levels/Level_2/Textures/T_Grass_N.uasset new file mode 100644 index 0000000..06e7feb --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Grass_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cb7ef3a86e41487bdf66732989d4a0d1afbe049b262fb8d3ccf876201953929 +size 2537133 diff --git a/Content/Levels/Level_2/Textures/T_Road64_D.uasset b/Content/Levels/Level_2/Textures/T_Road64_D.uasset new file mode 100644 index 0000000..c860e25 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Road64_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:906906822e2487daf0e58177c9516768bc4c319fdbeec4a098a03a6eeabe7983 +size 15295 diff --git a/Content/Levels/Level_2/Textures/T_Road64_N.uasset b/Content/Levels/Level_2/Textures/T_Road64_N.uasset new file mode 100644 index 0000000..097caa0 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Road64_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5485dcc0b80b10927363c981e405b9c42b5d98420ad04cc6be37227c3b4f90e2 +size 18973 diff --git a/Content/Levels/Level_2/Textures/T_Rock2_D.uasset b/Content/Levels/Level_2/Textures/T_Rock2_D.uasset new file mode 100644 index 0000000..2519a62 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock2_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aef34911bde2ffd37225541e56579abd3dbf412ecbf2ae37b43b098a252b8fcd +size 295314 diff --git a/Content/Levels/Level_2/Textures/T_Rock2_N.uasset b/Content/Levels/Level_2/Textures/T_Rock2_N.uasset new file mode 100644 index 0000000..958dc16 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock2_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7e0c4cd0ecd8d5960af79d2cf544c6ad58f8df39c39b6221459da541b84a9b6 +size 1554342 diff --git a/Content/Levels/Level_2/Textures/T_Rock512_D.uasset b/Content/Levels/Level_2/Textures/T_Rock512_D.uasset new file mode 100644 index 0000000..1a857d5 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock512_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fa60ee8a9cd26b8b40b87438196c9b98bf6f3d8057226db0083cf08331cf64a +size 5583 diff --git a/Content/Levels/Level_2/Textures/T_Rock512_N.uasset b/Content/Levels/Level_2/Textures/T_Rock512_N.uasset new file mode 100644 index 0000000..9a1ef5f --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock512_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc7a15cf4c88950b0bf0d2265266e70c48c1a31b85c90d3013e2437189c91bf +size 111513 diff --git a/Content/Levels/Level_2/Textures/T_Rock512_v2_N.uasset b/Content/Levels/Level_2/Textures/T_Rock512_v2_N.uasset new file mode 100644 index 0000000..fc70088 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock512_v2_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac84ce36fcaf27d9471de97519b37faac137cd7bc15b988a9f17a9c377f9d568 +size 104486 diff --git a/Content/Levels/Level_2/Textures/T_Rock64_D.uasset b/Content/Levels/Level_2/Textures/T_Rock64_D.uasset new file mode 100644 index 0000000..5798e59 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock64_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1462bb82cf178482b15a14358d66d8254be1bfe3b486d83e37f16fb79c09752e +size 14733 diff --git a/Content/Levels/Level_2/Textures/T_Rock64_N.uasset b/Content/Levels/Level_2/Textures/T_Rock64_N.uasset new file mode 100644 index 0000000..a4a55a2 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock64_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd98d111c94ea8c80ae7530ea40495adc797a3594600dcc39dabcdfc9114f0a +size 20020 diff --git a/Content/Levels/Level_2/Textures/T_Rock_D.uasset b/Content/Levels/Level_2/Textures/T_Rock_D.uasset new file mode 100644 index 0000000..e9743ab --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:151a45bcc4f96e8e40d5e3d9bc4522dddf834932c0f9e9362f402c841a99cf2a +size 332419 diff --git a/Content/Levels/Level_2/Textures/T_Rock_N.uasset b/Content/Levels/Level_2/Textures/T_Rock_N.uasset new file mode 100644 index 0000000..6643b77 --- /dev/null +++ b/Content/Levels/Level_2/Textures/T_Rock_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4a604c037fa814ddc9d5eb00073283f7fb2e9c2e41c411e8ce5cdf656d1ec5d +size 805853 diff --git a/Content/Levels/Test/Actors/BP_Test_StartGame.uasset b/Content/Levels/Test/Actors/BP_Test_StartGame.uasset new file mode 100644 index 0000000..5124d11 --- /dev/null +++ b/Content/Levels/Test/Actors/BP_Test_StartGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f20c1d740785e3f6ae0329a209a8099b17a5f8c7569a3cda21fff02d6293612 +size 34685 diff --git a/Content/Levels/Test/L_Test.umap b/Content/Levels/Test/L_Test.umap index 4c263d1..90f2678 100644 --- a/Content/Levels/Test/L_Test.umap +++ b/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32b529a688497fb905320d7415fb5723f585eb0cd18469f113ecae2c3d12e046 -size 2253739 +oid sha256:517227541cd118fc0c58a1ccaebb377531a4b888a9ee45394fe2531cbc3e434d +size 2257413 diff --git a/Content/Models/Characters/Human/BPA_HumanJump.uasset b/Content/Models/Characters/Human/BPA_HumanJump.uasset index e7cb83c..d9c084b 100644 --- a/Content/Models/Characters/Human/BPA_HumanJump.uasset +++ b/Content/Models/Characters/Human/BPA_HumanJump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a5ef90a9e17a272a98970f10d15c65fcf725c50e9736a8509237c8e5c0e537 -size 207482 +oid sha256:9e3d78e9447999bdd3d573e3e35f8e96df89bb7f0f2b455ad77ce37e9ecf39ee +size 196770 diff --git a/Content/Models/Nature/Trees/SM_BigOldTree.uasset b/Content/Models/Nature/Trees/SM_BigOldTree.uasset index a024d3e..ef03c31 100644 --- a/Content/Models/Nature/Trees/SM_BigOldTree.uasset +++ b/Content/Models/Nature/Trees/SM_BigOldTree.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c55c29533e714da09f569690541d97d0bb186756824417635022830155b36bdf -size 121781 +oid sha256:1553f5c27243b5c9f6abfb2dc3aac3635a759dfe9c9d2f356527bf8f11c64e98 +size 35091 diff --git a/Source/Lost_Edge/Private/PlayerBase.cpp b/Source/Lost_Edge/Private/PlayerBase.cpp index d46bbb3..b3ef5f2 100644 --- a/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/Source/Lost_Edge/Private/PlayerBase.cpp @@ -188,11 +188,13 @@ void APlayerBase::SwitchToCameraPawn() void APlayerBase::SwitchToView(AActor* target) { + camera->Deactivate(); ((APlayerController*)Controller)->SetViewTargetWithBlend(target, 0.3f); } void APlayerBase::ReturnPlayerView() { + camera->Activate(false); ((APlayerController*)Controller)->SetViewTargetWithBlend(this, 0.3f); } diff --git a/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.cpp b/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.cpp index 9316c7a..dfce74d 100644 --- a/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.cpp +++ b/Source/Lost_Edge/Private/Widgets/QuickTimeEventWidgetManager.cpp @@ -63,7 +63,7 @@ void UQuickTimeEventWidgetManager::UpdateAnimation(UWidget* widget, float newSpe { for(auto player : eventWidget->ActiveSequencePlayers) { - if(player->GetAnimation()->GetDisplayLabel() != TEXT("eventAnimation")) + if(!player->GetAnimation()->GetName().Contains(TEXT("eventAnimation"))) continue; newSpeed *= player->GetAnimation()->GetEndTime() / eventWidget->duration;