Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,6 +2,6 @@
|
||||
"BuildId": "27405482",
|
||||
"Modules":
|
||||
{
|
||||
"MasharovDev": "UnrealEditor-MasharovDev.dll"
|
||||
"MasharovDev": "UnrealEditor-MasharovDev-0313.dll"
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
[/Script/EngineSettings.GeneralProjectSettings]
|
||||
ProjectID=9EB99AEB4C933EABEE9C4787EE46C5E6
|
||||
ProjectName=Masharov
|
||||
ProjectVersion=1.866
|
||||
ProjectVersion=1.867
|
||||
CompanyName=GraffInteractive
|
||||
Homepage=Graff.tech
|
||||
|
||||
|
||||
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.
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user