Skip to content

Procedural 3d Shapes#862

Draft
andybak wants to merge 1729 commits intomainfrom
feature/3d-shapes
Draft

Procedural 3d Shapes#862
andybak wants to merge 1729 commits intomainfrom
feature/3d-shapes

Conversation

@andybak
Copy link
Copy Markdown
Contributor

@andybak andybak commented May 29, 2025

No description provided.

# Conflicts:
#	Assets/Scripts/PointerManager.cs
#	Assets/Scripts/Widgets/ModelWidget.cs
#	Packages/manifest.json
# Conflicts:
#	Assets/Scripts/Widgets/ModelWidget.cs
…ure/3d-shapes

# Conflicts:
#	Assets/Scripts/PointerManager.cs
#	Assets/Scripts/Widgets/ModelWidget.cs
@andybak andybak changed the title 3d shapes Procedural 3d Shapes May 29, 2025
@github-actions
Copy link
Copy Markdown

github-actions bot commented May 29, 2025

⚠️ Heads‑up:

The following package files were changed:

Packages/manifest.json
Packages/packages-lock.json

The following files from ProjectSettings were changed:

ProjectSettings/PackageManagerSettings.asset
ProjectSettings/TagManager.asset

(Review: flagged files)

andybak added 15 commits August 28, 2025 08:37
# Conflicts:
#	Assets/Prefabs/HttpServer.prefab
#	Assets/Prefabs/Panels/AdvancedToolsPanel.prefab
#	Assets/Prefabs/Panels/LabsPanel.prefab
#	Assets/Prefabs/Panels/LabsPanel_Mobile.prefab
#	Assets/Prefabs/Panels/ToolsPanel_Mobile.prefab
#	Assets/Scenes/Main.unity
#	Assets/Scripts/Model.cs
#	Assets/Scripts/ModelCatalog.cs
…c. still requires the Polypanel to be opened before using shape gallery
# Conflicts:
#	Assets/Scripts/API/ApiMethods.EditableModels.cs
#	Assets/Scripts/Model.cs
#	Packages/manifest.json
#	Packages/packages-lock.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement Feature added

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants