57 Commits

Author SHA1 Message Date
Dron 1f40e3ed0a mda 2026-03-13 20:07:31 +05:00
Plyasun_Pavel 350cdb7df3 наноправки поинты и flatData 2026-03-12 16:29:49 +05:00
Plyasun_Pavel 3c8a993b21 минус легендарные (несуществующие) метры 2026-03-04 14:00:09 +05:00
Plyasun_Pavel 4aeb0ddd03 minor bug fixes n stuff 2026-03-02 18:03:44 +05:00
Dron 8cfb6aba56 poeben 2026-02-26 20:45:29 +05:00
Dron ecef28e094 skolko mojno 2026-02-19 00:55:15 +05:00
PC-G13 9cef48ff54 а 2026-02-18 14:34:08 +05:00
PC-G13 767a57b428 213 2026-02-18 14:02:48 +05:00
PC-G13 684033198a Ну я это уже видел всё 2026-02-18 13:15:21 +05:00
PC-G13 e21821f0f6 инф 2026-02-18 12:45:53 +05:00
PC-G13 44ba8307c2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A14_F08-09.umap
2026-02-16 19:20:32 +05:00
PC-G13 e4a7004608 4em dolshe vglyaduvaeshsya v aivaz tem bol'she pravok 2026-02-16 19:19:59 +05:00
Dron 33486b2bd4 added flat 2026-02-12 21:28:32 +05:00
Dron 570dd9dfb0 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-02-12 19:02:01 +05:00
Dron de3c74c411 да скольк можно
fix tags and bugs
2026-02-12 19:01:51 +05:00
PC-G13 095f006e07 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-02-12 18:41:50 +05:00
PC-G13 481e5264be mops, flats fixes, some facades 2026-02-12 18:41:30 +05:00
Dron 3de665ef33 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A00_F02-03.umap
2026-02-06 17:56:03 +05:00
Dron fac4b63c27 hueta 2026-02-06 17:55:00 +05:00
polina.marfuta 46d394c52b Закончила секции МОПЫ GP12-S01,S02 и GP13-S01,S05 2026-02-04 11:55:27 +05:00
polina.marfuta 730570ba33 Исправила ошибки в МОПАХ GP12-S03, GP13-S02, S03 2026-01-23 18:06:02 +05:00
polina.marfuta d0386adc8d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP13/S02/SM_GP13_S02_Facade.uasset
2026-01-23 17:45:32 +05:00
polina.marfuta e0da68c96c Загрузила и собрала МОПЫ GP12-S03, GP13-S02, S03 2026-01-23 17:38:13 +05:00
PC-G13 3fd8a8b232 fixes 2026-01-22 17:39:08 +05:00
polina.marfuta dbe395b506 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-16 18:35:12 +05:00
polina.marfuta 8bc18e1edc Правки GP12-S04, S05,S06 и GP13-S04 2026-01-16 18:35:05 +05:00
PC-G13 f3acbc6045 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP13/S03/Interior/GP13_S03_A06_F10.umap
2026-01-16 15:05:26 +05:00
PC-G13 74c8d54de6 fixes int 2026-01-16 15:04:52 +05:00
Victoria 94926a9a0f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-15 13:07:31 +05:00
Victoria 34eb61f284 Правки 2026-01-15 13:07:26 +05:00
polina.marfuta 2f06d8be7b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Cubemap.uasset
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Facade.uasset
2026-01-15 12:41:01 +05:00
polina.marfuta 94996786c8 Загрузила и собрала секции G12-S05/S06 и GP13-S0
Окончательно загрузила и собрала мопы первого этажа в секциях G12-S05-MOP-F01, G12-S06-MOP-F01 и G13-S04-MOP-F01
2026-01-15 12:04:27 +05:00
Victoria d631077bcc Правки 2026-01-14 17:44:44 +05:00
Victoria 5bac695948 Правки 2026-01-14 11:42:49 +05:00
Victoria bf247fa94d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2026-01-13 19:57:44 +05:00
Victoria 8d970047ff Правки 2026-01-13 19:57:38 +05:00
polina.marfuta 5c3f88608a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Cubemap.uasset
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Facade.uasset
#	Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Facade.uasset
2026-01-13 19:30:32 +05:00
polina.marfuta 8a33d927ed Дополнительные файлы для секций GP12_S06_MOP_F01 и GP12_S05_MOP_F01 2026-01-13 19:23:39 +05:00
polina.marfuta 5ed15e0562 Добавила GP12_S06_MOP_F01 и GP12_S05_MOP_F01 2026-01-13 19:21:51 +05:00
Victoria 360ff70d28 Правки 2026-01-12 19:56:37 +05:00
Victoria 78177fcaae Правки 2025-12-30 18:23:40 +05:00
Victoria 3e95ca96c2 Merge branches 'master' and 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 20:57:19 +05:00
Victoria 7ba41bbd20 Правки GP13 2025-12-29 20:56:55 +05:00
polina.marfuta b4d662d1c5 Удалила дубликат неба и доназначила материалы в GP12_S04_F01_MOP 2025-12-29 17:55:52 +05:00
polina.marfuta 6a59400aa9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 17:26:15 +05:00
polina.marfuta 1f70b87038 Поправила ошибки в секции GP12_S04_F01_MOP 2025-12-29 17:26:04 +05:00
Victoria 0fc8163b55 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2025-12-29 16:54:16 +05:00
Victoria eefc5e64c7 Правки GP12 2025-12-29 16:54:12 +05:00
Dmitry a39b9672d6 fixVT 2025-12-29 15:50:40 +05:00
PC-G13 fd83b64221 mops mats 2025-12-25 18:29:48 +05:00
polina.marfuta 9b9e9db738 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/GP12_GP13.umap
2025-12-25 16:54:13 +05:00
polina.marfuta f7db7bfec7 Добавила GP12_S04_F01 2025-12-25 16:53:11 +05:00
Dron 3ba090c961 HUUUI 2025-12-24 21:18:09 +05:00
Dron 954be20666 da ept 2025-12-24 20:58:21 +05:00
Dron c044ebbf10 AAAAAAAAA 2025-12-24 18:25:00 +05:00
Dron b66992801c da ebanye dveri 2025-12-24 17:16:54 +05:00
Dron 7eff4a5c95 doors 2025-12-24 16:53:48 +05:00
1048 changed files with 1 additions and 117 deletions
-104
View File
@@ -28,14 +28,6 @@
"Path": "$(ProjectDir)/Binaries/Win64/D3D12/d3d12SDKLayers.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.Debug.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/Ivazowsky.exe",
"Type": "Executable"
@@ -90,10 +82,6 @@
"Path": "$(EngineDir)/Binaries/ThirdParty/MsQuic/v220/win64/msquic.dll",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/NVIDIA/GPUDirect/Win64/dvp.dll",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Binaries/ThirdParty/NVIDIA/NVaftermath/Win64/GFSDK_Aftermath_Lib.x64.dll",
"Type": "NonUFS"
@@ -2906,18 +2894,6 @@
"Path": "$(EngineDir)/Plugins/Bridge/Bridge.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Compositing/Composure/Composure.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Compositing/OpenCVLensDistortion/OpenCVLensDistortion.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Compositing/OpenColorIO/OpenColorIO.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Developer/AnimationSharing/AnimationSharing.uplugin",
"Type": "UFS"
@@ -3086,22 +3062,6 @@
"Path": "$(EngineDir)/Plugins/Experimental/LocalizableMessage/LocalizableMessage.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeORTCpu/NNERuntimeORTCpu.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeORTGpu/NNERuntimeORTGpu.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NNERuntimeRDG/NNERuntimeRDG.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/NNE/NNE.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/OpenImageDenoise/OpenImageDenoise.uplugin",
"Type": "UFS"
@@ -3114,10 +3074,6 @@
"Path": "$(EngineDir)/Plugins/Experimental/PlatformCrypto/PlatformCrypto.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/ProxyLODPlugin/ProxyLODPlugin.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Experimental/PythonScriptPlugin/PythonScriptPlugin.uplugin",
"Type": "UFS"
@@ -3154,14 +3110,6 @@
"Path": "$(EngineDir)/Plugins/Interchange/Runtime/Interchange.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/BlueprintJson/BlueprintJson.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/MetaHuman/MetaHuman.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Marketplace/NVIDIA/DLSS/Binaries/ThirdParty/Win64/Development/nvngx_dlss.dll",
"Type": "DebugNonUFS"
@@ -3234,30 +3182,10 @@
"Path": "$(EngineDir)/Plugins/Marketplace/VaRestPlugin/VaRest.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/ImgMedia/ImgMedia.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/MediaCompositing/MediaCompositing.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/MediaFrameworkUtilities/MediaFrameworkUtilities.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/MediaIOFramework/MediaIOFramework.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/MediaPlate/MediaPlate.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/MediaPlayerEditor/MediaPlayerEditor.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Media/PixelCapture/PixelCapture.uplugin",
"Type": "UFS"
@@ -3390,10 +3318,6 @@
"Path": "$(EngineDir)/Plugins/Runtime/InputDebugging/InputDebugging.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/MeshModelingToolset/MeshModelingToolset.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/Metasound/Metasound.uplugin",
"Type": "UFS"
@@ -3402,18 +3326,6 @@
"Path": "$(EngineDir)/Plugins/Runtime/MsQuic/MsQuic.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OSC/OSC.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenCV/Binaries/ThirdParty/Win64/opencv_world455.dll",
"Type": "NonUFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenCV/OpenCV.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/Runtime/OpenXR/OpenXR.uplugin",
"Type": "UFS"
@@ -3466,14 +3378,6 @@
"Path": "$(EngineDir)/Plugins/TraceUtilities/TraceUtilities.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/VirtualProduction/CameraCalibrationCore/CameraCalibrationCore.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/VirtualProduction/CameraCalibration/CameraCalibration.uplugin",
"Type": "UFS"
},
{
"Path": "$(EngineDir)/Plugins/VirtualProduction/RemoteControlInterception/RemoteControlInterception.uplugin",
"Type": "UFS"
@@ -3494,14 +3398,6 @@
"Path": "$(ProjectDir)/Binaries/Win64/D3D12/d3d12SDKLayers.dll",
"Type": "NonUFS"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.Debug.dll",
"Type": "NonUFS"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/DML/DirectML.dll",
"Type": "NonUFS"
},
{
"Path": "$(ProjectDir)/Binaries/Win64/NvmlWrapper.dll",
"Type": "NonUFS"
+1 -1
View File
@@ -2,7 +2,7 @@
[/Script/EngineSettings.GeneralProjectSettings]
ProjectID=B89CCC284A7D213231762AB505314AAD
ProjectVersion=3.4
ProjectVersion=3.471
ProjectName=Ivazowsky
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.
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.

Some files were not shown because too many files have changed in this diff Show More