EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
246 Commits 4 Branches 2 Tags
developer
Commit Graph

38 Commits

Author SHA1 Message Date
GRAFF e193db95cf еще цитферки 2022-07-11 14:56:49 +05:00
JohnnyHatchet dfcb766a19 Свет во дворах 2022-07-11 12:58:25 +05:00
JohnnyHatchet 3bc6dcaaa0 Ночное освещение 2022-07-11 11:36:38 +05:00
GRAFF fb77d65acb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset
 2022-07-10 12:46:37 +05:00
GRAFF 2f0730d3a8 еще пачка изменений, циферки, лифт, пиздюки, коллизии 2022-07-10 12:44:24 +05:00
PC-G12 bd4c5283ec Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Meshes/Interior/GP2/MOP/HallDoor/SM_Door_Outer.uasset
 2022-07-08 19:10:31 +05:00
PC-G12 37d50e3fce Mops 2022-07-08 19:07:58 +05:00
GRAFF f4cff46e92 baker 2022-07-08 18:13:30 +05:00
PC-G12 28c9d15314 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 20:09:15 +05:00
PC-G12 0c55ced6ec Mopz 2022-07-07 20:08:50 +05:00
GRAFF 1e4d6298c0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-07 19:49:57 +05:00
GRAFF 27decfd074 подшаманил немного 2022-07-07 19:42:47 +05:00
GRAFF cc25272b39 ma baker 2022-07-07 14:31:47 +05:00
GRAFF fda80f0b65 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Config/DefaultGame.ini
#	Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset
#	Content/Blueprints/Lamp/BP_streetLamp.uasset
#	Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MathAndConvertFns.uasset
#	Content/Blueprints/Player/MyPawn.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/Player/myGM.uasset
#	Content/Blueprints/UI/Actors/InfraPoint.uasset
#	Content/Blueprints/UI/Actors/KPmaker.uasset
#	Content/Blueprints/UI/Others/FlatData.uasset
#	Content/Blueprints/UI/Others/clientData.uasset
#	Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/WBPS/KPWidget.uasset
#	Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset
#	Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset
#	Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset
#	Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset
#	Content/Blueprints/UI/WBPS/Menu/saveData.uasset
#	Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset
#	Content/Blueprints/UI/WBPS/filter/Filter.uasset
#	Content/Blueprints/UI/WBPS/filter/FlatCard.uasset
#	Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset
#	Content/Blueprints/UI/WBPS/widgetActions.uasset
#	Content/Maps/Interior/GP2/S02A17.umap
#	Content/Maps/Interior/GP2/S02F02.umap
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/Interior/GP2/S02F13-16.umap
#	Content/Maps/Interior/GP2/S02F17-18.umap
#	Content/Maps/Interior/GP2/S02F19.umap
#	Content/Maps/Interior/GP2/S02F20.umap
#	Content/Maps/Interior/L_Test_Room.umap
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
#	Content/Maps/test1.umap
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_2_Mash.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_Mash.uasset
#	Content/Meshes/Exterior/Main/SM_Masharov_GP3_pos.uasset
#	Content/Meshes/Interior/Furniture/Kitchen/Modular/SM_Down_Locker_With_Sink.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset
#	Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset
#	Content/Meshes/Interior/Furniture/Other/SM_Door_Invis.uasset
#	Masharov.uproject
 2022-07-07 12:23:47 +05:00
GRAFF 7edddefceb всякие правки 2022-07-07 12:11:07 +05:00
GRAFF b3f52b0654 baking_mops 2022-07-06 19:18:33 +05:00
GRAFF d2bce4cf59 mops_baking 2022-07-06 12:26:16 +05:00
GRAFF 65fdaaa4f9 lightbps_testbake_windowsreimport 2022-07-04 13:08:46 +05:00
GRAFF 3026e10ae1 IES_Cat_gpulightmass_someinteriorlightBpchanges_someinteriormatschanges_ 2022-07-01 14:36:31 +05:00
PC-G06 43aac680f0 Interior_SM_S02A17_Part_5_BP_Lamp_Mesh_337 2022-06-28 15:45:34 +05:00
GRAFF ab908f7ff5 версия 0.8 уехала в тюмень, дохуя всякого по ии, хаты, уи 2022-06-24 13:21:43 +05:00
GRAFF b4fa513a22 версия 0.8 поехала 2022-06-24 13:06:52 +05:00
GRAFF 071a6968e7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_cars.umap
#	Content/Maps/mainScene.umap
 2022-06-23 23:11:53 +05:00
GRAFF e47016785e дохуя переделок по уи 2022-06-23 23:11:12 +05:00
JohnnyHatchet d634179fcb Немного освещения + ГП1-2 стилобат 2022-06-23 13:38:44 +05:00
GRAFF 2268443ed8 куча всякого 2022-06-23 01:04:26 +05:00
GRAFF 1d46299019 много интерфейса 2022-06-21 20:40:42 +05:00
GRAFF 18aec2e485 ИИ тачек 2022-06-16 12:12:19 +05:00
GRAFF ea85a1992e гора всякого 2022-06-10 12:05:24 +05:00
GRAFF 709eb46d0c куча всякого, дом скрываемый 2022-05-26 22:37:34 +05:00
GRAFF 3e7ff77933 over9000 интерфейса и этажи 2022-05-26 11:55:51 +05:00
GRAFF b561f44001 интерфейс 2022-05-21 18:25:11 +05:00
GRAFF b30adc59a0 уф 2022-05-05 15:33:39 +05:00
GRAFF 9b01120d9c ну давай отправляйся 2022-05-04 12:02:48 +05:00
GRAFF dceff7a67a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-05-03 22:56:28 +05:00
GRAFF ec18596f6d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-05-03 12:39:26 +05:00
GRAFF 471d187aec тьма всякого барахла 2022-04-28 14:15:01 +05:00
GRAFF 10b1587c32 1 2022-03-31 15:20:23 +05:00