mark/sota
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Compare commits

base: mark:795cbe7a1887ef57ea161c0beda2de64db4c7207
Branches Tags
mark:main
mark:vfinal
..
compare: mark:165369d4c24b3c298d2238a6624361eb27729d27
Branches Tags
mark:main
mark:vfinal

No commits in common. "795cbe7a1887ef57ea161c0beda2de64db4c7207" and "165369d4c24b3c298d2238a6624361eb27729d27" have entirely different histories.
795cbe7a18 ... 165369d4c2

18 changed files with 12 additions and 36 deletions
Show stats Expand all files Collapse all files

BIN
Modelling/Exports/Assets/bedroomPropDeskSetup.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/bedroomPropLamp.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/kitchenPropDiningChair.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/kitchenPropDiningTable.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/kitchenPropPan.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/kitchenPropPot.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/livingRoomPropCouch.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Assets/livingRoomPropCouchside.fbx (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_master_assets/trimsheet_modular_assets_standardSurface1_AlbedoTransparency.1001_sRGB_ACEScg.png.tx
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_master_assets/trimsheet_modular_assets_standardSurface1_MetallicSmoothness.1001_Raw_ACEScg.png.tx
View file

Binary file not shown.

BIN
Modelling/Exports/Trimsheets/trimsheet_for_master_assets/trimsheet_modular_assets_standardSurface1_Normal.1001_Raw_ACEScg.png.tx
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/.mayaSwatches/lamp.ma.swatches
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/AlexDrawer.ma (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/Couch.ma (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/Dining table and chair.ma (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/Pots and pans.ma (Stored with Git LFS)
View file

Binary file not shown.

BIN
Modelling/Sources/Maya/scenes/lamp.ma (Stored with Git LFS)
View file

Binary file not shown.

4
RunningLateGame/ProjectSettings/Packages/com.unity.probuilder/Settings.json
View file

@ -99,7 +99,7 @@
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "ShapeBuilder.ActiveShapeIndex",
"value": "{\"m_Value\":6}"
"value": "{\"m_Value\":1}"
},
{
"type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@ -119,7 +119,7 @@
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize",
"value": "{\"m_Value\":{\"x\":-1.2044639587402344,\"y\":1.0023797750473023,\"z\":1.2235469818115235}}"
"value": "{\"m_Value\":{\"x\":183.86538696289063,\"y\":0.0,\"z\":-161.46841430664063}}"
},
{
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",