Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Text tool #512

Draft
wants to merge 29 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9abcb52
Initial WIP
andybak Aug 27, 2023
1b42886
WIP - generate png textures for text widget on export
andybak Aug 31, 2023
3d9e29a
Add a button (just a placeholder for now)
andybak Aug 31, 2023
295c80c
Merge branch 'main' into feature/text-tool
andybak Sep 7, 2023
c31504a
wip
andybak Sep 14, 2023
583826d
Initial save/load support WIP
andybak Sep 28, 2023
efc10c7
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Sep 30, 2023
98e0f7a
Fix saving
andybak Sep 30, 2023
3495c4f
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Oct 26, 2023
c2f1410
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Nov 23, 2023
e39cb53
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Nov 29, 2023
dbc56fb
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 7, 2023
2c26ce6
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 7, 2023
7514f22
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 20, 2023
59628b4
dotnet-format
andybak Dec 20, 2023
529c058
dotnet-format
andybak Dec 20, 2023
b10f426
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Jan 1, 2024
7c8b60e
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Feb 28, 2024
db6c0f7
Fix l10n strings after merge
andybak Feb 28, 2024
3b05317
Fix typo
andybak Feb 28, 2024
a3fd255
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Mar 5, 2024
ae1e7e1
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 3, 2024
59c2796
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 7, 2024
362e85a
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 27, 2024
c8ce22e
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak May 3, 2024
7a2f5b9
Update text api endpoints
andybak May 5, 2024
b4091e9
WIP changes
andybak May 5, 2024
2c1f895
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak May 19, 2024
e16183f
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Sep 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 156 additions & 6 deletions Assets/Prefabs/Panels/AdvancedToolsPanel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4067220476156272}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33463444720997118
MeshFilter:
Expand Down Expand Up @@ -1090,7 +1090,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4067220476156272}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33527498822042428
MeshFilter:
Expand Down Expand Up @@ -1130,7 +1130,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4067220476156272}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &65439514599846630
BoxCollider:
Expand Down Expand Up @@ -1179,7 +1179,7 @@ Transform:
m_Children:
- {fileID: 4099180057378294}
m_Father: {fileID: 4067220476156272}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33827995805926138
MeshFilter:
Expand Down Expand Up @@ -1361,6 +1361,7 @@ Transform:
- {fileID: 5132072297439473359}
- {fileID: 5566995999782226336}
- {fileID: 2329771398596852252}
- {fileID: 4502523064090158760}
- {fileID: 4487744745540934}
- {fileID: 4913046734195790}
- {fileID: 4084186664612276}
Expand Down Expand Up @@ -2365,7 +2366,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5664627563248376400}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.211, y: -0.634, z: 0.05}
m_LocalPosition: {x: -0.422, y: -0.634, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -2486,6 +2487,155 @@ MonoBehaviour:
references:
version: 2
RefIds: []
--- !u!1 &6535217432110762182
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4502523064090158760}
- component: {fileID: 4679399731301646499}
- component: {fileID: 364446193627975246}
- component: {fileID: 1319175746123658152}
- component: {fileID: 7156252261596179870}
m_Layer: 16
m_Name: Button_Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4502523064090158760
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6535217432110762182}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.422, y: -0.634, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4067220476156272}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4679399731301646499
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6535217432110762182}
m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3}
--- !u!23 &364446193627975246
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6535217432110762182}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &1319175746123658152
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6535217432110762182}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.01}
m_Center: {x: 0, y: 0, z: -0.05}
--- !u!114 &7156252261596179870
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6535217432110762182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f924f0ff57b618b44aaef2d9484ee7af, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: ADVANCEDTOOLS_PANEL_BUTTON_TEXT
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 140585981667180544
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: 6da5cd89204da99468e34a61cc7ad99d, type: 3}
m_AtlasTexture: 1
m_ToggleButton: 1
m_LongPressReleaseButton: 0
m_ButtonHasPressedAudio: 1
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Tool: 5400
m_EatGazeInputOnPress: 0
references:
version: 2
RefIds: []
--- !u!1 &7793811069088501246
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2514,7 +2664,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7793811069088501246}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.211, y: -0.634, z: 0.05}
m_LocalPosition: {x: 0, y: -0.634, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down
Loading
Loading