Compare commits

base: Maxim/TechnoGrad:9146e65335242797040a0775301105c3b6a8af0e

Branches Tags

Maxim/TechnoGrad:master Maxim/TechnoGrad:Render

...

compare: Maxim/TechnoGrad:302abe463965fe507d5d397ba9d9ccf6b1fa4ecf

Branches Tags

Maxim/TechnoGrad:Render Maxim/TechnoGrad:master

3 Commits

9146e65335 ... 302abe4639

Author	SHA1	Message	Date
Maxim	302abe4639	Merge branch 'master' of http://192.168.1.163:3000/Maxim/TechnoGrad ... # Conflicts: # Content/Levels/Business2.umap # Content/Levels/Business2_BuiltData.uasset # Content/Levels/Lights.umap # Content/Levels/Lights_BuiltData.uasset	2019-04-22 13:12:01 +05:00
Maxim	90cbad14fc	доп	2019-04-22 13:11:17 +05:00
Maxim	b017809abc	Правки второго этажа павильона "Бизнес"	2019-04-22 13:10:27 +05:00

12 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Content/Environment/Materials/M_WallBeach.uasset

BIN

Binary file not shown.

Content/Environment/Materials/M_white_wall.uasset

BIN

Binary file not shown.

Content/Levels/Business2.umap

BIN

Binary file not shown.

Content/Levels/Business2_BuiltData.uasset

BIN

Binary file not shown.

Content/Levels/Lights.umap

BIN

Binary file not shown.

Content/Levels/Lights_BuiltData.uasset

BIN

Binary file not shown.

Content/Materials/MI_FurnitureBrown.uasset

BIN

Binary file not shown.

Content/Meshes/Business1/Level2_wall_13.uasset

BIN

Binary file not shown.

Content/Meshes/Level1_door42.uasset

BIN

Binary file not shown.

Content/Meshes/furniture/SM_StylP.uasset

BIN

Binary file not shown.

Content/Meshes/furniture/SM_TableP.uasset

BIN

Binary file not shown.

Content/Textures/T_Wallbeach.uasset

BIN

Binary file not shown.