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

Save selected strokes #711

Draft
wants to merge 44 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 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
f3c7418
Merge remote-tracking branch 'origin/main' into feature/save-selected
andybak Dec 22, 2024
2dff6fb
Avoid NRE when secrets are missing
andybak Dec 22, 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
Prev Previous commit
Next Next commit
Better icon
  • Loading branch information
andybak committed May 19, 2024
commit 20f50d52f1f1b00a1a1dc9467904d503c6314db9
5 changes: 5 additions & 0 deletions Assets/Prefabs/Panels/ReferencePanel/ReferencePanel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -3346,6 +3346,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8533497137806158463}
m_Modifications:
- target: {fileID: 6491599919484524684, guid: 818cdd60f3752df4fbaa528f87416d0a,
type: 3}
propertyPath: m_ButtonTexture
value:
objectReference: {fileID: 2800000, guid: 1d8bd93c66660a049b45b5f4941fbec7, type: 3}
- target: {fileID: 6593344973932434806, guid: 818cdd60f3752df4fbaa528f87416d0a,
type: 3}
propertyPath: m_Name
Expand Down
Binary file added Assets/Resources/Icons/saved_strokes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 110 additions & 0 deletions Assets/Resources/Icons/saved_strokes.png.meta

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