Dron/lifeResidence
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
473 Commits 3 Branches 1 Tag
pixelStreaming
Commit Graph

71 Commits

Author SHA1 Message Date
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
PC-G13 c3c946b450 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F01.umap
#	Content/Maps/Interior/Parking/Parking_GP1.umap
#	Content/Maps/Interior/Parking/Parking_GP2.umap
 2023-04-13 01:35:54 +05:00
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
DESKTOP-8J0BKKD\Admin 6427c869f2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:49:14 +05:00
DESKTOP-8J0BKKD\Admin 59543b5fd1 GP2_S02_A05 2023-04-12 19:49:10 +05:00
PC-G04 277afb1de5 GP2_S01_A05 2023-04-12 19:00:45 +05:00
PC-G04 04779d39cc Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F9_S01_A00_Plinth.uasset
 2023-04-12 17:46:33 +05:00
PC-G04 f30f04749f GP2_S01_A05_F09 2023-04-12 17:44:00 +05:00
PC-G12 b6f68b8309 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:34:24 +05:00
PC-G12 f4722cea5e Comeat 2023-04-12 16:34:13 +05:00
DESKTOP-8J0BKKD\Admin 212fffcbe8 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:02:48 +05:00
DESKTOP-8J0BKKD\Admin 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +05:00
PC-G08 d28b184bf4 GP2_S03_A05 2023-04-12 15:10:15 +05:00
Igor 765ff77c1f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 20:17:59 +05:00
Igor ac2f84531d GP2_S02_A05 2023-04-11 20:17:30 +05:00
PC-G12 ac39c45b06 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:55:33 +05:00
PC-G12 2102cd7a23 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:52:00 +05:00
PC-G12 fe9a48b997 RM 2023-04-11 19:51:26 +05:00
DESKTOP-8J0BKKD\Admin 8dd9bb4020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:50:47 +05:00
DESKTOP-8J0BKKD\Admin 2da5c911c6 GP2_S04_A06_F9 2023-04-11 19:50:43 +05:00
PC-G08 36e6c9715d GP02_S03_A04 inta 2023-04-11 18:46:14 +05:00
DESKTOP-8J0BKKD\Admin 6750271f76 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 18:25:59 +05:00
DESKTOP-8J0BKKD\Admin 5b3ff8ba51 GP2_S01_A004 2023-04-11 18:25:56 +05:00
Igor be3e21c1af F_GP2_S04_A00 2023-04-11 14:58:11 +05:00
Igor 0de09016fa Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 19:50:43 +05:00
Igor 43af0e486d F_GP2_S03_A03 _ BF 2023-04-10 19:50:24 +05:00
PC-G12 98e8703d70 Redirections 2023-04-10 13:00:37 +05:00
PC-G12 0151ba39cd Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 12:12:21 +05:00
PC-G12 4f074552ef Come eat 2023-04-10 12:12:14 +05:00
PC-G04 116e1b79e7 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-09 19:56:39 +05:00
PC-G04 e77dd51ec3 GP1_S04_A05 2023-04-09 19:56:32 +05:00
Igor 85841d835d F_GP2_S03_A03 F_GP2_S02_A02 2023-04-09 19:52:36 +05:00
Igor f0dce537b7 F_GP2_S02_A02_F_GP2_S01_A03 2023-04-07 20:02:02 +05:00
PC-G04 9252d1588d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 19:57:44 +05:00
PC-G04 0e6b55cc3d Много интерьеров 2023-04-07 19:57:38 +05:00
PC-G12 a0ef43b911 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 19:38:20 +05:00
PC-G12 16515e0e41 BaseFloors 2023-04-07 19:38:14 +05:00
DESKTOP-8J0BKKD\Admin 94c971d763 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 18:50:45 +05:00
DESKTOP-8J0BKKD\Admin 6537fb63ce GP2_S01_A01/S02_A03/S03_A01/S03_A02/S04_A01 2023-04-07 18:50:41 +05:00
PC-G12 fd2b9a65f0 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-07 14:28:30 +05:00
PC-G12 2cdaa791ec GP2S04A03 2023-04-07 14:28:24 +05:00
PC-G04 b9f33ac728 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A02_Plinth.uasset
 2023-04-07 12:34:16 +05:00
PC-G04 063e7b8cbc F_GP2_S01_A00, F_GP2_S01_A02, F_GP2_S02_A04 2023-04-07 12:15:58 +05:00
PC-G12 05ab5ef850 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 19:36:05 +05:00
PC-G12 805d133826 Col 2023-04-06 19:35:57 +05:00
DESKTOP-8J0BKKD\Admin d81a829723 GP2_S02_A03 2023-04-06 18:21:31 +05:00
DESKTOP-8J0BKKD\Admin 5e35162f61 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 17:04:48 +05:00
DESKTOP-8J0BKKD\Admin 92088f9061 GP2_S01_A01 2023-04-06 17:04:45 +05:00
Igor 1e6b5dd582 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A03_Plinth.uasset
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
 2023-04-06 16:36:12 +05:00