Level 2
This commit is contained in:
parent
58cedb423a
commit
1004ed503d
@ -59,7 +59,7 @@ r.MSAACount=4
|
|||||||
r.DefaultFeature.LensFlare=False
|
r.DefaultFeature.LensFlare=False
|
||||||
r.ReflectionCaptureResolution=128
|
r.ReflectionCaptureResolution=128
|
||||||
r.ReflectionEnvironmentLightmapMixBasedOnRoughness=True
|
r.ReflectionEnvironmentLightmapMixBasedOnRoughness=True
|
||||||
r.AllowGlobalClipPlane=False
|
r.AllowGlobalClipPlane=True
|
||||||
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=False
|
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=False
|
||||||
r.Lumen.TraceMeshSDFs=1
|
r.Lumen.TraceMeshSDFs=1
|
||||||
r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True
|
r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True
|
||||||
|
@ -117,7 +117,6 @@ bSkipMovies=False
|
|||||||
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Reverbs")
|
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Reverbs")
|
||||||
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Snapshots")
|
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Snapshots")
|
||||||
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/VCAs")
|
+DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/VCAs")
|
||||||
+DirectoriesToAlwaysStageAsNonUFS=(Path="")
|
|
||||||
+DirectoriesToAlwaysStageAsNonUFS=(Path="Audio/FMOD/Desktop")
|
+DirectoriesToAlwaysStageAsNonUFS=(Path="Audio/FMOD/Desktop")
|
||||||
bRetainStagedDirectory=False
|
bRetainStagedDirectory=False
|
||||||
CustomStageCopyHandler=
|
CustomStageCopyHandler=
|
||||||
|
BIN
Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Blueprints/SM_Level4_CrossyRoad.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/L_Level2.umap
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/L_Level2.umap
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/L_Level2_BuiltData.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/L_Level2_BuiltData.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_DirtL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_DirtL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_GrassL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_GrassL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_GrassLowL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_GrassLowL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_PathL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_PathL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_RockL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_RockL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_SnowL2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/LandLayers/LL_SnowL2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/MI_WindowCurtainLevel2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_BadPillow2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_BadPillow2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2B.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2B.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2C.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet2C.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet3.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet3.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet4.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseCarpet4.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseDoorstep.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseDoorstep.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseFloor1.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseFloor1.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseFloor2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseFloor2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseFloor2B.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseFloor2B.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseRoof2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseRoof2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseRoofBig2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseStairs.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseStairs.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_HouseWall2.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_HouseWall2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/M_RoofInside.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/M_RoofInside.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Materials/PurpleMetal.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Materials/PurpleMetal.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_CarolRun.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_FromField.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_MortisDoor.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Sequencers/Seq_Level2_menu.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Grass64_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Grass64_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Grass64_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Grass64_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Grass_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Grass_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Grass_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Grass_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Road64_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Road64_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Road64_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Road64_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock2_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock2_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock2_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock2_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock512_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock512_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock512_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock512_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock512_v2_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock512_v2_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock64_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock64_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock64_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock64_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock_D.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock_D.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Level_2/Textures/T_Rock_N.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Level_2/Textures/T_Rock_N.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Test/Actors/BP_Test_StartGame.uasset
(Stored with Git LFS)
Normal file
BIN
Content/Levels/Test/Actors/BP_Test_StartGame.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Content/Levels/Test/L_Test.umap
(Stored with Git LFS)
BIN
Content/Levels/Test/L_Test.umap
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Models/Characters/Human/BPA_HumanJump.uasset
(Stored with Git LFS)
BIN
Content/Models/Characters/Human/BPA_HumanJump.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Models/Nature/Trees/SM_BigOldTree.uasset
(Stored with Git LFS)
BIN
Content/Models/Nature/Trees/SM_BigOldTree.uasset
(Stored with Git LFS)
Binary file not shown.
@ -188,11 +188,13 @@ void APlayerBase::SwitchToCameraPawn()
|
|||||||
|
|
||||||
void APlayerBase::SwitchToView(AActor* target)
|
void APlayerBase::SwitchToView(AActor* target)
|
||||||
{
|
{
|
||||||
|
camera->Deactivate();
|
||||||
((APlayerController*)Controller)->SetViewTargetWithBlend(target, 0.3f);
|
((APlayerController*)Controller)->SetViewTargetWithBlend(target, 0.3f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void APlayerBase::ReturnPlayerView()
|
void APlayerBase::ReturnPlayerView()
|
||||||
{
|
{
|
||||||
|
camera->Activate(false);
|
||||||
((APlayerController*)Controller)->SetViewTargetWithBlend(this, 0.3f);
|
((APlayerController*)Controller)->SetViewTargetWithBlend(this, 0.3f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ void UQuickTimeEventWidgetManager::UpdateAnimation(UWidget* widget, float newSpe
|
|||||||
{
|
{
|
||||||
for(auto player : eventWidget->ActiveSequencePlayers)
|
for(auto player : eventWidget->ActiveSequencePlayers)
|
||||||
{
|
{
|
||||||
if(player->GetAnimation()->GetDisplayLabel() != TEXT("eventAnimation"))
|
if(!player->GetAnimation()->GetName().Contains(TEXT("eventAnimation")))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
newSpeed *= player->GetAnimation()->GetEndTime() / eventWidget->duration;
|
newSpeed *= player->GetAnimation()->GetEndTime() / eventWidget->duration;
|
||||||
|
Loading…
Reference in New Issue
Block a user