7 Commits

Author SHA1 Message Date
AndreyCrusader 4e9e675963 for testing 2020-11-23 16:02:07 +05:00
GRAFF 9ce1237e65 на 28.10 рабочая версия, даже без лага на выборе этажа 2020-10-28 17:20:26 +05:00
GRAFF abfdc40bc3 тупое говн отупого говна (фикс вылета с ошибкой) 2020-10-21 15:42:58 +05:00
GRAFF 4de5fd7fcc ну вроде работает.. 2020-10-20 02:35:20 +05:00
GRAFF e5263e68ae осталось окошко с вводом 2020-10-16 21:50:57 +05:00
GRAFF 1a7cdf6856 Merge branch 'cpp'
# Conflicts:
#	Content/Blueprints/UI/Wbps/Filter.uasset
#	Content/Blueprints/UI/Wbps/FlatCard.uasset
#	Content/Blueprints/UI/Wbps/Menu.uasset
2020-08-28 15:08:36 +05:00
GRAFF 3c280e8112 мелкие коррективы 2020-07-29 16:35:45 +05:00
55 changed files with 29 additions and 11 deletions
+2
View File
@@ -71,3 +71,5 @@ Intermediate/*
DerivedDataCache/* DerivedDataCache/*
Content/Movies/Tour.mp4 Content/Movies/Tour.mp4
Releases/*
+16 -4
View File
@@ -23,7 +23,7 @@ r.MinScreenRadiusForDepthPrepass=0.100000
r.EarlyZPassOnlyMaterialMasking=False r.EarlyZPassOnlyMaterialMasking=False
r.GBufferFormat=1 r.GBufferFormat=1
r.DefaultFeature.MotionBlur=False r.DefaultFeature.MotionBlur=False
r.ClearSceneMethod=0 r.ClearSceneMethod=1
r.AllowGlobalClipPlane=True r.AllowGlobalClipPlane=True
r.GPUSkin.Limit2BoneInfluences=False r.GPUSkin.Limit2BoneInfluences=False
@@ -39,12 +39,12 @@ Compiler=VisualStudio2017
OcclusionPlugin=Built-in Occlusion OcclusionPlugin=Built-in Occlusion
ReverbPlugin=Built-in Reverb ReverbPlugin=Built-in Reverb
SpatializationPlugin=Built-in Spatialization SpatializationPlugin=Built-in Spatialization
AudioSampleRate=48000 AudioSampleRate=44100
AutoStreamingThreshold=10.000000 AutoStreamingThreshold=10.000000
CacheSizeKB=256000 CacheSizeKB=256000
[/Script/Engine.UserInterfaceSettings] [/Script/Engine.UserInterfaceSettings]
UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000)),PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=CurveFloat'"/Game/Blueprints/UI/Normal.Normal"') UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None)
[/Script/Engine.Engine] [/Script/Engine.Engine]
NearClipPlane=1.000000 NearClipPlane=1.000000
@@ -131,7 +131,7 @@ BlueprintComponentDataCookingMethod=AllBlueprints
[/Script/Engine.GarbageCollectionSettings] [/Script/Engine.GarbageCollectionSettings]
gc.MultithreadedDestructionEnabled=True gc.MultithreadedDestructionEnabled=True
gc.IncrementalBeginDestroyEnabled=True gc.IncrementalBeginDestroyEnabled=True
gc.AllowParallelGC=True gc.AllowParallelGC=False
gc.CreateGCClusters=False gc.CreateGCClusters=False
gc.NumRetriesBeforeForcingGC=0 gc.NumRetriesBeforeForcingGC=0
gc.TimeBetweenPurgingPendingKillObjects=60.000000 gc.TimeBetweenPurgingPendingKillObjects=60.000000
@@ -175,3 +175,15 @@ bEnableLegacyReverb=True
+CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic")
+CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle")
+CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
[/Script/AndroidRuntimeSettings.AndroidRuntimeSettings]
AudioNumBuffersToEnqueue=4
[/Script/Engine.StreamingSettings]
s.AsyncLoadingUseFullTimeLimit=False
s.AsyncLoadingTimeLimit=1.000000
s.PriorityAsyncLoadingExtraTime=5.000000
s.LevelStreamingActorsUpdateTimeLimit=1.000000
s.PriorityLevelStreamingActorsUpdateExtraTime=5.000000
s.LevelStreamingComponentsUnregistrationGranularity=1
s.UseBackgroundLevelStreaming=True
Binary file not shown.
+3 -3
View File
@@ -2,15 +2,15 @@
"source": "UE", "source": "UE",
"applications": [ "applications": [
{ {
"app_key": "application.generated.ue.ЖК-Уральский-11100242.ue4editor.exe", "app_key": "application.generated.ue.ЖК-Уральский-11590370.ue4editor.exe",
"launch_type": "url", "launch_type": "url",
"url": "steam://launch/", "url": "steam://launch/",
"action_manifest_path": "C:/Projects/Uralsky/Config/SteamVRBindings/steamvr_manifest.json", "action_manifest_path": "C:/Projects/uralsky/Config/SteamVRBindings/steamvr_manifest.json",
"strings": "strings":
{ {
"en_us": "en_us":
{ {
"name": "ЖК Уральский-11100242 [UE Editor]" "name": "ЖК Уральский-11590370 [UE Editor]"
} }
} }
} }
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.
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.
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.
+3 -3
View File
@@ -5,13 +5,13 @@
#include "Misc/FileHelper.h" #include "Misc/FileHelper.h"
#include "Misc/Paths.h" #include "Misc/Paths.h"
bool UJsonSaver::SaveJson(FString Savetext) bool UJsonSaver::SaveJson(FString Savetext, FString name1)
{ {
// get path game directory // get path game directory
// name file "DeviceID.txt" // name file "DeviceID.txt"
FString path = FPaths::ConvertRelativePathToFull(FPaths::GameDir()) + "..\\stats.json"; FString path = FPaths::ConvertRelativePathToFull(FPaths::GameDir()) + "..\\stats.json";
FString path1 = FPaths::ConvertRelativePathToFull(FPaths::GameDir()) + "..\\"+name1+".json";
FFileHelper::SaveStringToFile(Savetext, *path1);
return FFileHelper::SaveStringToFile(Savetext, *path); return FFileHelper::SaveStringToFile(Savetext, *path);
} }
+1 -1
View File
@@ -16,6 +16,6 @@ class URA_API UJsonSaver : public UBlueprintFunctionLibrary
public: public:
UFUNCTION(BlueprintCallable, Category = "save") UFUNCTION(BlueprintCallable, Category = "save")
// create a txt file and write to it device id // create a txt file and write to it device id
static bool SaveJson(FString Savetext); static bool SaveJson(FString Savetext,FString name1);
}; };
+4
View File
@@ -157,6 +157,10 @@
"Name": "BlueprintJson", "Name": "BlueprintJson",
"Enabled": true, "Enabled": true,
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/f837e4835fbc434a853fe1ead2410b84" "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/f837e4835fbc434a853fe1ead2410b84"
},
{
"Name": "HoudiniEngine",
"Enabled": false
} }
], ],
"TargetPlatforms": [ "TargetPlatforms": [