Skip to content

Commit 4fe2138

Browse files
andybakandybak
committed
Merge remote-tracking branch 'upstream/main' into feature/multi-mirrors
2 parents f6ec6da + 3b866a4 commit 4fe2138

File tree

85 files changed

+17408
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+17408
-367
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ jobs:
419419
steps:
420420
- name: "Build Changelog"
421421
id: changelog
422-
uses: mikepenz/release-changelog-builder-action@v3.7.2
422+
uses: mikepenz/release-changelog-builder-action@v4
423423
with:
424424
fromTag: "${{ needs.configuration.outputs.previousrelease }}"
425425
toTag: "${{ needs.configuration.outputs.currentrelease }}"
@@ -525,7 +525,7 @@ jobs:
525525
steps:
526526
- name: "Build Changelog"
527527
id: changelog
528-
uses: mikepenz/release-changelog-builder-action@v3.7.2
528+
uses: mikepenz/release-changelog-builder-action@v4
529529
with:
530530
fromTag: "${{ needs.configuration.outputs.previousfullrelease }}"
531531
toTag: "${{ needs.configuration.outputs.currentrelease }}"

‎Assets/Prefabs/Panels/ExtraPanel.prefab‎

Lines changed: 187 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Transform:
3030
m_ConstrainProportionsScale: 0
3131
m_Children: []
3232
m_Father: {fileID: 4232412870837608}
33-
m_RootOrder: 8
33+
m_RootOrder: 10
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
--- !u!65 &65772034241514116
3636
BoxCollider:
@@ -339,6 +339,8 @@ Transform:
339339
- {fileID: 4020115478564282}
340340
- {fileID: 8211543910910235730}
341341
- {fileID: 7161901348231431177}
342+
- {fileID: 7656778960772056826}
343+
- {fileID: 2183017126753138076}
342344
- {fileID: 3298845783872388597}
343345
- {fileID: 4159606566656768}
344346
- {fileID: 4082672982539268}
@@ -378,7 +380,7 @@ Transform:
378380
m_ConstrainProportionsScale: 0
379381
m_Children: []
380382
m_Father: {fileID: 4232412870837608}
381-
m_RootOrder: 9
383+
m_RootOrder: 11
382384
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
383385
--- !u!33 &33786679359167878
384386
MeshFilter:
@@ -1121,7 +1123,7 @@ Transform:
11211123
m_ConstrainProportionsScale: 0
11221124
m_Children: []
11231125
m_Father: {fileID: 4232412870837608}
1124-
m_RootOrder: 10
1126+
m_RootOrder: 12
11251127
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11261128
--- !u!33 &33572971787848210
11271129
MeshFilter:
@@ -1606,12 +1608,12 @@ Transform:
16061608
m_PrefabAsset: {fileID: 0}
16071609
m_GameObject: {fileID: 3302177877346690095}
16081610
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1609-
m_LocalPosition: {x: 0, y: -0.425, z: 0.049999237}
1611+
m_LocalPosition: {x: -0.422, y: -0.425, z: 0.049999237}
16101612
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
16111613
m_ConstrainProportionsScale: 0
16121614
m_Children: []
16131615
m_Father: {fileID: 4232412870837608}
1614-
m_RootOrder: 7
1616+
m_RootOrder: 9
16151617
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16161618
--- !u!33 &3288402495669431177
16171619
MeshFilter:
@@ -1727,3 +1729,183 @@ BoxCollider:
17271729
serializedVersion: 2
17281730
m_Size: {x: 1, y: 1, z: 0.01}
17291731
m_Center: {x: 0, y: 0, z: -0.05}
1732+
--- !u!1001 &4136892008545286871
1733+
PrefabInstance:
1734+
m_ObjectHideFlags: 0
1735+
serializedVersion: 2
1736+
m_Modification:
1737+
m_TransformParent: {fileID: 4232412870837608}
1738+
m_Modifications:
1739+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1740+
type: 3}
1741+
propertyPath: m_DescriptionText
1742+
value: Grid and Snap Settings
1743+
objectReference: {fileID: 0}
1744+
- target: {fileID: 4969199155606796208, guid: 3a98611722d498f4c93e269bfc1ba325,
1745+
type: 3}
1746+
propertyPath: m_Name
1747+
value: OptionButton_SnapSettings
1748+
objectReference: {fileID: 0}
1749+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1750+
type: 3}
1751+
propertyPath: m_RootOrder
1752+
value: 7
1753+
objectReference: {fileID: 0}
1754+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1755+
type: 3}
1756+
propertyPath: m_LocalPosition.x
1757+
value: 0
1758+
objectReference: {fileID: 0}
1759+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1760+
type: 3}
1761+
propertyPath: m_LocalPosition.y
1762+
value: -0.425
1763+
objectReference: {fileID: 0}
1764+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1765+
type: 3}
1766+
propertyPath: m_LocalPosition.z
1767+
value: 0.049999237
1768+
objectReference: {fileID: 0}
1769+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1770+
type: 3}
1771+
propertyPath: m_LocalRotation.w
1772+
value: 1
1773+
objectReference: {fileID: 0}
1774+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1775+
type: 3}
1776+
propertyPath: m_LocalRotation.x
1777+
value: -0
1778+
objectReference: {fileID: 0}
1779+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1780+
type: 3}
1781+
propertyPath: m_LocalRotation.y
1782+
value: -0
1783+
objectReference: {fileID: 0}
1784+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1785+
type: 3}
1786+
propertyPath: m_LocalRotation.z
1787+
value: -0
1788+
objectReference: {fileID: 0}
1789+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1790+
type: 3}
1791+
propertyPath: m_LocalEulerAnglesHint.x
1792+
value: 0
1793+
objectReference: {fileID: 0}
1794+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1795+
type: 3}
1796+
propertyPath: m_LocalEulerAnglesHint.y
1797+
value: 0
1798+
objectReference: {fileID: 0}
1799+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1800+
type: 3}
1801+
propertyPath: m_LocalEulerAnglesHint.z
1802+
value: 0
1803+
objectReference: {fileID: 0}
1804+
m_RemovedComponents: []
1805+
m_SourcePrefab: {fileID: 100100000, guid: 3a98611722d498f4c93e269bfc1ba325, type: 3}
1806+
--- !u!4 &7656778960772056826 stripped
1807+
Transform:
1808+
m_CorrespondingSourceObject: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1809+
type: 3}
1810+
m_PrefabInstance: {fileID: 4136892008545286871}
1811+
m_PrefabAsset: {fileID: 0}
1812+
--- !u!1001 &5575672093838166449
1813+
PrefabInstance:
1814+
m_ObjectHideFlags: 0
1815+
serializedVersion: 2
1816+
m_Modification:
1817+
m_TransformParent: {fileID: 4232412870837608}
1818+
m_Modifications:
1819+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1820+
type: 3}
1821+
propertyPath: m_Type
1822+
value: 12000
1823+
objectReference: {fileID: 0}
1824+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1825+
type: 3}
1826+
propertyPath: m_AtlasTexture
1827+
value: 0
1828+
objectReference: {fileID: 0}
1829+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1830+
type: 3}
1831+
propertyPath: m_ButtonTexture
1832+
value:
1833+
objectReference: {fileID: 2800000, guid: 4fb00a3c13d9a1b4e916be1c5a5357b8, type: 3}
1834+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1835+
type: 3}
1836+
propertyPath: m_DescriptionText
1837+
value: Transform Tools
1838+
objectReference: {fileID: 0}
1839+
- target: {fileID: 2454767444388280470, guid: 3a98611722d498f4c93e269bfc1ba325,
1840+
type: 3}
1841+
propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId
1842+
value: 103943359016206336
1843+
objectReference: {fileID: 0}
1844+
- target: {fileID: 4969199155606796208, guid: 3a98611722d498f4c93e269bfc1ba325,
1845+
type: 3}
1846+
propertyPath: m_Name
1847+
value: OptionButton_TransformPanel
1848+
objectReference: {fileID: 0}
1849+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1850+
type: 3}
1851+
propertyPath: m_RootOrder
1852+
value: 8
1853+
objectReference: {fileID: 0}
1854+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1855+
type: 3}
1856+
propertyPath: m_LocalPosition.x
1857+
value: 0.422
1858+
objectReference: {fileID: 0}
1859+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1860+
type: 3}
1861+
propertyPath: m_LocalPosition.y
1862+
value: -0.425
1863+
objectReference: {fileID: 0}
1864+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1865+
type: 3}
1866+
propertyPath: m_LocalPosition.z
1867+
value: 0.049999237
1868+
objectReference: {fileID: 0}
1869+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1870+
type: 3}
1871+
propertyPath: m_LocalRotation.w
1872+
value: 1
1873+
objectReference: {fileID: 0}
1874+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1875+
type: 3}
1876+
propertyPath: m_LocalRotation.x
1877+
value: -0
1878+
objectReference: {fileID: 0}
1879+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1880+
type: 3}
1881+
propertyPath: m_LocalRotation.y
1882+
value: -0
1883+
objectReference: {fileID: 0}
1884+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1885+
type: 3}
1886+
propertyPath: m_LocalRotation.z
1887+
value: -0
1888+
objectReference: {fileID: 0}
1889+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1890+
type: 3}
1891+
propertyPath: m_LocalEulerAnglesHint.x
1892+
value: 0
1893+
objectReference: {fileID: 0}
1894+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1895+
type: 3}
1896+
propertyPath: m_LocalEulerAnglesHint.y
1897+
value: 0
1898+
objectReference: {fileID: 0}
1899+
- target: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1900+
type: 3}
1901+
propertyPath: m_LocalEulerAnglesHint.z
1902+
value: 0
1903+
objectReference: {fileID: 0}
1904+
m_RemovedComponents: []
1905+
m_SourcePrefab: {fileID: 100100000, guid: 3a98611722d498f4c93e269bfc1ba325, type: 3}
1906+
--- !u!4 &2183017126753138076 stripped
1907+
Transform:
1908+
m_CorrespondingSourceObject: {fileID: 5992996673163279405, guid: 3a98611722d498f4c93e269bfc1ba325,
1909+
type: 3}
1910+
m_PrefabInstance: {fileID: 5575672093838166449}
1911+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)