Benches_on_walls

Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts: # Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Facade.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S08_09_Mask.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Collision.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Decal.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Facade.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Windows.uasset
2025-09-23 17:51:32 +05:00 · 2025-09-23 16:19:09 +05:00 · 2025-09-23 16:16:21 +05:00 · 2025-09-23 15:32:44 +05:00 · 2025-09-19 16:59:02 +05:00 · 2025-09-19 16:26:47 +05:00
535 changed files with 202 additions and 10 deletions
@@ -3542,6 +3542,10 @@
 			"Path": "$(ProjectDir)/Plugins/JPrinter/JPrinter.uplugin",
 			"Type": "UFS"
 		},
+		{
+			"Path": "$(ProjectDir)/Plugins/antiDublicate/antiDublicate.uplugin",
+			"Type": "UFS"
+		},
 		{
 			"Path": "$(ProjectDir)/Plugins/approximatedSpline/approximatedSpline.uplugin",
 			"Type": "UFS"
@@ -1,6 +1,6 @@
 [/Script/EngineSettings.GameMapsSettings]
 GameDefaultMap=/Game/Maps/starter.starter
-EditorStartupMap=/Game/Maps/MainScene.MainScene
+EditorStartupMap=
 GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C

@@ -192,9 +192,9 @@ DefaultBindPort=1488
 [/Script/DLSS.DLSSSettings]
 bEnableDLSSVulkan=False
 bEnableDLSSD3D11=False
-bEnableDLSSInEditorViewports=True
-bEnableDLSSInPlayInEditorViewports=True
-bShowDLSSSDebugOnScreenMessages=True
+bEnableDLSSInEditorViewports=False
+bEnableDLSSInPlayInEditorViewports=False
+bShowDLSSSDebugOnScreenMessages=False

 [/Script/Engine.GarbageCollectionSettings]
 gc.IncrementalBeginDestroyEnabled=False
@@ -2,7 +2,7 @@

 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=B89CCC284A7D213231762AB505314AAD
-ProjectVersion=2.39
+ProjectVersion=2.42
 ProjectName=Ivazowsky
 CompanyName=GraffInteractive
 Homepage=Graff.tech
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
5hift	0f430f2606	Benches_on_walls	2025-09-23 17:51:32 +05:00
5hift	824a7b9d8a	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky # Conflicts: # Content/Meshes/houses/GP12_13/GP13/S01/SM_GP13_S01_Facade.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S08_09_Mask.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Collision.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Decal.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Facade.uasset # Content/Meshes/houses/GP12_13/GP13/S09/SM_GP13_S09_Windows.uasset	2025-09-23 16:19:09 +05:00
5hift	bf317c1f05	Facade Location fix_add_some new	2025-09-23 16:16:21 +05:00
PanJablonsky	d7582326d3	smth	2025-09-23 15:32:44 +05:00
PC-G13	7c44a75599	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky	2025-09-19 16:59:02 +05:00
PC-G13	541d99f899	mda	2025-09-19 16:26:47 +05:00
Dron	30100643bd	Revert "RenderGraffShots" This reverts commit `0761205f68`. # Conflicts: # Content/Maps/Landscape.umap # Content/Maps/MainScene.umap # Content/Maps/Yard_GP8_GP7_New_2.umap	2025-09-18 19:32:45 +05:00
Dron	fa4bec3d9a	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky # Conflicts: # Content/Maps/Landscape.umap # Content/Maps/MainScene.umap	2025-09-18 18:36:51 +05:00
PC-G13	b8335383cf	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky # Conflicts: # Content/Materials/MFunctions/MF_BaseUV.uasset # Content/Textures/Dummy/T_Dummy_NAC.uasset	2025-09-16 12:36:06 +05:00
PC-G13	ee8b6d9d0f	masters, facades	2025-09-16 12:33:52 +05:00
Maria_B	ed828434b1	maf gp 12-13	2025-09-15 19:05:39 +05:00
Maria_B	af1aeb5885	maf	2025-09-15 18:13:42 +05:00
Maria_B	1369f91dab	textures	2025-09-12 01:38:06 +05:00
Maria_B	3469d7af8d	MAf gp12-13	2025-09-11 22:08:50 +05:00
Maria_B	110e9f4d75	Foliage gp12-13	2025-09-10 14:58:14 +05:00
5hift	000bdf6428	Gp_fixes	2025-09-03 12:21:46 +05:00
5hift	e7b75ea839	Gp_fix_V1	2025-08-29 09:11:52 +05:00
Dmitry	0761205f68	RenderGraffShots	2025-02-24 15:09:52 +05:00
Dron	4610689fbf	dis people	2025-02-06 13:21:02 +05:00
Dron	26c7eaca12	бац	2025-01-28 13:12:03 +05:00
Dron	9fdd776719	green fix	2024-08-19 18:23:41 +05:00
NikitsSysun	8e00eb7ef7	чел и колизии	2024-07-15 19:54:00 +05:00
NikitsSysun	fc3bec2a19	Убрал деревья	2024-07-11 14:49:26 +05:00
NikitsSysun	664fb176d1	Естественно я обосрался с коммитом и вот еще	2024-07-09 21:34:11 +05:00
NikitsSysun	eaca372b7c	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky # Conflicts: # Content/Maps/MainScene.umap # Content/Maps/Yard_GP8_GP7_New_2.umap # Content/Meshes/Exterior/Yard/GP7_GP8_NEW/New_Middle.uasset	2024-07-09 21:16:29 +05:00
NikitsSysun	e9ab6ecba3	Господи пусть больше не будет правок от суки все	2024-07-09 21:14:56 +05:00
Dron	6835d1dc4d	fix elevators, people	2024-07-08 20:04:34 +05:00
NikitsSysun	369ee517ff	фуляга	2024-07-08 13:24:06 +05:00
NikitsSysun	02c2990971	Фуляга	2024-07-08 13:03:13 +05:00
NikitsSysun	b692706923	Мафы	2024-07-08 11:32:37 +05:00
NikitsSysun	b9ef8be333	Grass	2024-07-08 10:49:40 +05:00
NikitsSysun	ba19cbc87c	Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky	2024-07-07 00:23:51 +05:00
NikitsSysun	b2ed4625a5	Надеюсь не обосрался NEWGP	2024-07-07 00:23:35 +05:00