Skip to content

Commit

Permalink
Upgrade linux build image
Browse files Browse the repository at this point in the history
  • Loading branch information
reinaldooli committed May 9, 2023
1 parent b3dcdda commit cfa4b15
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 24 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

RUN apt-get update && apt-get --assume-yes install make cmake g++-7 git ninja-build python3 zlib1g-dev
ENV TZ=America/Sao_Paulo
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN apt-get update && apt-get -y install make cmake g++-7 git ninja-build python3 zlib1g-dev

ENV CC=gcc-7
ENV CXX=g++-7
Expand Down
44 changes: 22 additions & 22 deletions unity/PitayaExample/UserSettings/Layouts/default-2021.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ MonoBehaviour:
width: 1728
height: 1051
m_ShowMode: 4
m_Title: Inspector
m_Title: Project
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
m_Maximized: 0
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 41
controlID: 15
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -187,7 +187,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 322.5
width: 322
height: 594
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
Expand All @@ -211,9 +211,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 322.5
x: 322
y: 0
width: 996.5
width: 997
height: 594
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
Expand Down Expand Up @@ -328,7 +328,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 96
width: 321.5
width: 321
height: 573
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand Down Expand Up @@ -690,9 +690,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 322.5
x: 322
y: 96
width: 994.5
width: 995
height: 573
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
Expand All @@ -704,7 +704,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 994.5, y: 552}
m_TargetSize: {x: 995, y: 552}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
Expand All @@ -719,8 +719,8 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -248.625
m_HBaseRangeMax: 248.625
m_HBaseRangeMin: -248.75
m_HBaseRangeMax: 248.75
m_VBaseRangeMin: -138
m_VBaseRangeMax: 138
m_HAllowExceedBaseRangeMin: 1
Expand All @@ -740,23 +740,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 994.5
width: 995
height: 552
m_Scale: {x: 2, y: 2}
m_Translation: {x: 497.25, y: 276}
m_Translation: {x: 497.5, y: 276}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -248.625
x: -248.75
y: -138
width: 497.25
width: 497.5
height: 276
m_MinimalGUI: 1
m_defaultScale: 2
m_LastWindowPixelSize: {x: 1989, y: 1146}
m_LastWindowPixelSize: {x: 1990, y: 1146}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
Expand Down Expand Up @@ -817,9 +817,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4c420000
m_LastClickedID: 16972
m_ExpandedIDs: 0000000040420000424200004a42000000ca9a3bffffff7f
m_SelectedIDs: 4a420000
m_LastClickedID: 16970
m_ExpandedIDs: 0000000040420000424200004442000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -847,7 +847,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000004042000042420000
m_ExpandedIDs: 00000000404200004242000044420000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand All @@ -874,7 +874,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
Expand Down

0 comments on commit cfa4b15

Please sign in to comment.