Skip to content

Commit

Permalink
Merge pull request #10 from finol-digital/development
Browse files Browse the repository at this point in the history
Release version 1.1.0
  • Loading branch information
davidmfinol authored May 21, 2018
2 parents 3a89e3b + efbc820 commit 2cea152
Show file tree
Hide file tree
Showing 179 changed files with 3,643 additions and 2,126 deletions.
9 changes: 5 additions & 4 deletions Assets/Prefabs/Card Info Viewer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_Mode: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
Expand Down Expand Up @@ -2502,6 +2502,7 @@ MonoBehaviour:
infoPanel: {fileID: 224040624008649796}
zoomPanel: {fileID: 224109217147786326}
cardImage: {fileID: 114093825176017184}
zoomImage: {fileID: 114442512476595824}
nameText: {fileID: 114372086061571136}
idText: {fileID: 114097102399410170}
propertySelection: {fileID: 114246151119062808}
Expand Down Expand Up @@ -3157,7 +3158,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000026751028}
m_AnchoredPosition: {x: 0, y: -0.000062942505}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224247773585803872
Expand Down Expand Up @@ -3312,7 +3313,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 50.735172}
m_AnchoredPosition: {x: 0, y: 70.09609}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224463543092697836
Expand Down Expand Up @@ -3461,7 +3462,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000026751028}
m_AnchoredPosition: {x: 0, y: -0.000062942505}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224695781774734674
Expand Down
87 changes: 0 additions & 87 deletions Assets/Prefabs/MainMenu/Company Text.prefab

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/Prefabs/MainMenu/Company Text.prefab.meta

This file was deleted.

87 changes: 0 additions & 87 deletions Assets/Prefabs/MainMenu/Version Text.prefab

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/Prefabs/Menus.meta

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

Loading

0 comments on commit 2cea152

Please sign in to comment.