Skip to content

Commit

Permalink
[Joana] disabling functions which don't work for the HMI
Browse files Browse the repository at this point in the history
  • Loading branch information
missxa committed Apr 20, 2018
1 parent 4c565f6 commit 11c6e46
Show file tree
Hide file tree
Showing 19 changed files with 1,920 additions and 565 deletions.
10 changes: 10 additions & 0 deletions Assets/ExternalTools/__pycache__.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Materials/mat_camerafeed.mat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Material:
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 0.5, y: -0.49999994}
m_Scale: {x: 0.5, y: -0.5}
m_Offset: {x: 0.25, y: 0.75}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
Expand Down
10 changes: 10 additions & 0 deletions Assets/Prefabs/SimulationModels/BeRoboy_Complete.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Prefabs/Tools/GUIControllerBeRoboy.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1033388514373148
GameObject:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -118,7 +118,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1067178629910622
GameObject:
m_ObjectHideFlags: 1
Expand Down
6 changes: 3 additions & 3 deletions Assets/Prefabs/Tools/GUIControllerRoboy.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1126800167700074
GameObject:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -419,7 +419,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1598226301214338
GameObject:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -661,7 +661,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1918889209502858
GameObject:
m_ObjectHideFlags: 1
Expand Down

0 comments on commit 11c6e46

Please sign in to comment.