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.

Sign up for GitHub

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

Save selected strokes #711

Draft
wants to merge 42 commits into
base: main
Choose a base branch
from
Draft

Save selected strokes #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
3773a8c
Initial attempt. Untested WIP
andybak Dec 17, 2022
56a9205
Merge branch 'main' into feature/save-selected
andybak Feb 13, 2023
eac7c2a
Merge branch 'main' into feature/save-selected
andybak Jul 10, 2023
21f8369
WIP commit
andybak Aug 18, 2023
2a838a0
Merge remote-tracking branch 'origin/main' into feature/save-selected
andybak Aug 22, 2023
8ec7474
Merge branch 'main' into feature/save-selected
andybak Aug 23, 2023
68b827d
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Aug 30, 2023
dbb2596
WIP Saved Strokes Panel
andybak Aug 31, 2023
9dedccd
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Sep 6, 2023
ab17f36
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Sep 7, 2023
4b36766
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Sep 12, 2023
055e65c
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Sep 30, 2023
2934441
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Oct 24, 2023
bac26e5
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Nov 23, 2023
e49d951
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Nov 29, 2023
32b2055
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Dec 7, 2023
426c38a
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Dec 7, 2023
35cd5a4
Turn off monoscopic mode
andybak Dec 7, 2023
8d615be
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Dec 20, 2023
d9cb231
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Jan 1, 2024
70231a4
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Feb 28, 2024
c00bec0
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Mar 5, 2024
1ff61b0
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Apr 3, 2024
43fb182
dotnet-format
andybak Apr 3, 2024
8628871
Merge remote-tracking branch 'upstream/main' into feature/save-selected
andybak Apr 7, 2024
9bbf8d4
Merge branch 'main' into feature/save-selected
andybak Apr 23, 2024
ac01a5d
Merge remote-tracking branch 'origin/main' into feature/save-selected
andybak May 3, 2024
90cc3f3
Merge remote-tracking branch 'origin/main' into feature/save-selected
andybak May 3, 2024
bb8ebd9
Use ReferencePanel prefab from main
andybak May 4, 2024
eb80e75
Add the saved strokes panel button back to the ref panel as it is on …
andybak May 5, 2024
61bd959
Merge branch 'main' into feature/save-selected
andybak May 6, 2024
149daef
SavedStrokesCatalog wrapper around sketch catalog (WIP)
andybak May 15, 2024
2eeddbf
Merge branch 'main' into feature/save-selected
andybak May 17, 2024
7fcfccf
Working prototype
andybak May 17, 2024
60a60a1
Button tweaks
andybak May 18, 2024
4ba0df7
Fix thumbs for saved sketches
andybak May 18, 2024
ca009ed
Remove commented out code
andybak May 18, 2024
05e6d4c
UI improvements
andybak May 18, 2024
20f50d5
Better icon
andybak May 19, 2024
098bbd5
Merge branch 'main' into feature/save-selected
andybak Aug 15, 2024
42d9c2d
Merge remote-tracking branch 'origin/main' into feature/save-selected
andybak Sep 15, 2024
0b44b61
Merge branch 'main' into feature/save-selected
andybak Oct 2, 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
14 changes: 7 additions & 7 deletions Assets/Prefabs/Panels/LabsPanel.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@ GameObject:
- component: {fileID: 6320537500852989196}
- component: {fileID: 6254052937444237984}
m_Layer: 16
m_Name: PanelButton_SaveModel
m_Name: PanelButton_SaveStrokes
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -2918,12 +2918,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: Save selected strokes to model catalog
m_DescriptionText: Save selected strokes to media library
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 0
m_KeyId: 235160207315525632
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
Expand All @@ -2940,7 +2940,7 @@ MonoBehaviour:
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: b7fb5e24817634c4eb185b6d24afa87c, type: 3}
m_ButtonTexture: {fileID: 2800000, guid: fec43d52a2edc4846ad3536f1b9182e9, type: 3}
m_AtlasTexture: 1
m_ToggleButton: 0
m_LongPressReleaseButton: 0
Expand All @@ -2949,8 +2949,8 @@ MonoBehaviour:
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 1
m_Command: 56
m_AddOverlay: 0
m_Command: 6500
m_CommandParam: -1
m_CommandParam2: -1
m_RequiresPopup: 0
Expand Down
Loading