浏览代码
Merge branch '2019.3/marc' into mikesbranch
Merge branch '2019.3/marc' into mikesbranch
# Conflicts: # ProjectSettings/Packages/com.unity.probuilder/Settings.json/demo-artist_tools
Mike Geig
5 年前
当前提交
daf819d7
共有 61 个文件被更改,包括 9811 次插入 和 1623 次删除
-
999Assets/Objects/boats/_BoatBase.prefab
-
980Assets/scenes/main_menu.unity
-
1Packages/manifest.json
-
165ProjectSettings/Packages/com.unity.probuilder/Settings.json
-
200Assets/Objects/boats/BFWC_done.fbx
-
96Assets/Objects/boats/BFWC_done.fbx.meta
-
90Assets/Objects/boats/Base_boat.mat
-
8Assets/Objects/boats/Base_boat.mat.meta
-
91Assets/Objects/boats/Guns/MAPbarrel_heights.tif.meta
-
91Assets/Objects/boats/Guns/MAPbarrel_normals.tif.meta
-
91Assets/Objects/boats/Guns/MAPbarrel_occlusion.tif.meta
-
91Assets/Objects/boats/Guns/NMaprear_heights.tif.meta
-
91Assets/Objects/boats/Guns/NMaprear_normals.tif.meta
-
91Assets/Objects/boats/Guns/NMaprear_occlusion.tif.meta
-
90Assets/Objects/boats/Guns/gunbarrel.mat
-
8Assets/Objects/boats/Guns/gunbarrel.mat.meta
-
90Assets/Objects/boats/Guns/gunbase.mat
-
8Assets/Objects/boats/Guns/gunbase.mat.meta
-
179Assets/Objects/boats/NewBoat.fbx
-
96Assets/Objects/boats/NewBoat.fbx.meta
-
91Assets/Objects/boats/NewBoatMaps2_height.tiff.meta
-
91Assets/Objects/boats/NewBoatMaps2_normal.tiff.meta
-
91Assets/Objects/boats/NewBoatMaps2_occlusion.tiff.meta
-
84Assets/Objects/boats/_BoatHullroot.fbx
-
96Assets/Objects/boats/_BoatHullroot.fbx.meta
-
1001Assets/Objects/boats/_BoatHullroot.prefab
-
7Assets/Objects/boats/_BoatHullroot.prefab.meta
-
1001Assets/Objects/boats/albedo_color_01.png
-
91Assets/Objects/boats/albedo_color_01.png.meta
-
1001Assets/Objects/boats/shark_Decals.png
-
91Assets/Objects/boats/shark_Decals.png.meta
-
802Assets/scenes/testing_01.unity
-
7Assets/scenes/testing_01.unity.meta
-
42ProjectSettings/FbxExportSettings.asset
-
200Maya/data/BFWC_done.fbx
-
179Maya/data/NewBoat.fbx
-
1001Maya/sourceimages/albedo_color_01.png
-
1001Maya/sourceimages/shark_Decals.png
-
1001Maya/sourceimages/shark_print.png
999
Assets/Objects/boats/_BoatBase.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
980
Assets/scenes/main_menu.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
Kaydara FBX Binary & FBXHeaderExtensiont FBXHeaderVersionI� � |
|||
FBXVersionI � EncryptionTypeI ) CreationTimeStamp VersionI� 9 YearI� \ MonthI } DayI � HourI
� MinuteI+ � SecondI MillisecondIN p ' |