diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-0313.dll b/Binaries/Win64/UnrealEditor-MasharovDev-0313.dll new file mode 100644 index 000000000..32038359a Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-0313.dll differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-0313.pdb b/Binaries/Win64/UnrealEditor-MasharovDev-0313.pdb new file mode 100644 index 000000000..f8a03c37b Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-0313.pdb differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-1347.dll b/Binaries/Win64/UnrealEditor-MasharovDev-1347.dll new file mode 100644 index 000000000..a4aff7beb Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-1347.dll differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-1347.pdb b/Binaries/Win64/UnrealEditor-MasharovDev-1347.pdb new file mode 100644 index 000000000..86406e93a Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-1347.pdb differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-7328.dll b/Binaries/Win64/UnrealEditor-MasharovDev-7328.dll new file mode 100644 index 000000000..8da3f1a21 Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-7328.dll differ diff --git a/Binaries/Win64/UnrealEditor-MasharovDev-7328.pdb b/Binaries/Win64/UnrealEditor-MasharovDev-7328.pdb new file mode 100644 index 000000000..bf4f0beca Binary files /dev/null and b/Binaries/Win64/UnrealEditor-MasharovDev-7328.pdb differ diff --git a/Binaries/Win64/UnrealEditor.modules b/Binaries/Win64/UnrealEditor.modules index bea0f00eb..346e11168 100644 --- a/Binaries/Win64/UnrealEditor.modules +++ b/Binaries/Win64/UnrealEditor.modules @@ -2,6 +2,6 @@ "BuildId": "27405482", "Modules": { - "MasharovDev": "UnrealEditor-MasharovDev.dll" + "MasharovDev": "UnrealEditor-MasharovDev-0313.dll" } } \ No newline at end of file diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 5b713e750..f94f1002b 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -3,7 +3,7 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=9EB99AEB4C933EABEE9C4787EE46C5E6 ProjectName=Masharov -ProjectVersion=1.866 +ProjectVersion=1.867 CompanyName=GraffInteractive Homepage=Graff.tech diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index 11493c7ec..652e86508 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/UI/Actors/walkPointer.uasset b/Content/Blueprints/UI/Actors/walkPointer.uasset index ca861651b..0cd5ff778 100644 Binary files a/Content/Blueprints/UI/Actors/walkPointer.uasset and b/Content/Blueprints/UI/Actors/walkPointer.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 7fb65b58f..119485c32 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/videotourPanel.uasset b/Content/Blueprints/UI/WBPS/Menu/videotourPanel.uasset index 4c381be11..e4350ab85 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/videotourPanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/videotourPanel.uasset differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index b6532b8c8..969ff6b69 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Sequence/tour.uasset b/Content/Sequence/tour.uasset index 5a488facc..8da9c3221 100644 Binary files a/Content/Sequence/tour.uasset and b/Content/Sequence/tour.uasset differ diff --git a/Source/MasharovDev/cppGI.cpp b/Source/MasharovDev/cppGI.cpp index 79f10a8ff..af32a30b3 100644 --- a/Source/MasharovDev/cppGI.cpp +++ b/Source/MasharovDev/cppGI.cpp @@ -55,7 +55,7 @@ void UcppGI::cppLvlManage(UObject* WorldContextObject, Fcppcoords currentCoords, if ( ( ((ceq[0] || !is3DTour || lvl.coords.flat == -1) && ceq[5]) - || (is3DTour ? lvl.anotherLvl >= 1 && lvl.anotherLvl == crd.flat : lvl.anotherLvl >= 1 && (crd.flat >= 0 ? lvl.anotherLvl == crd.flat : true) && lvl.coords.floor < crd.floor) + || (is3DTour ? lvl.anotherLvl >= 1 && lvl.anotherLvl == crd.flat : lvl.anotherLvl >= 1 && (crd.flat >= 0 ? lvl.anotherLvl == crd.flat : currentCoords.floor < 90/*or 2-floor flat will be loaded anyway*/) && lvl.coords.floor < crd.floor) ) && ceq[3] && ceq[4] ) loadthis = true; //load all on floor and under 2-floor flat, and full 2-floor flat in 3d tour