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

Scaling tool #1124

Merged
merged 12 commits into from
Mar 28, 2019
Merged

Scaling tool #1124

merged 12 commits into from
Mar 28, 2019

Conversation

gfodor
Copy link
Contributor

@gfodor gfodor commented Mar 28, 2019

The menu has been re-organized and now also includes a scaling tool.

image

The tips are also updated. Depends on #1122

@gfodor gfodor added the whats new Include this PR on the "What's New" page label Mar 28, 2019
@johnshaughnessy
Copy link
Contributor

johnshaughnessy commented Mar 28, 2019

Where is xform-button defined? Is this missing changes to the rotate-button?

edit: nevermind, I didn't see that this is builton top of feature/scale-tool

<a-entity text="value:Hide; width:2.5; align:center;" position="0 0 0.36"></a-entity>
<a-entity hoverable mixin="rounded-text-button" visible-if-permitted="kick_users" kick-button ui-class-while-frozen position="0 -0.25 .35"> </a-entity>
<a-entity text="value:Kick; width:2.5; align:center;" visible-if-permitted="kick_users" position="0 -0.25 0.36"></a-entity>
<a-entity hoverable mixin="rounded-text-button" block-button ui-class-while-frozen position="0 0 .35">
Copy link
Contributor

@johnshaughnessy johnshaughnessy Mar 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better merge fast unless you want to be the one to resolve 100 merge conflicts
https://github.com/mozilla/hubs/pull/1091/files#diff-a796e11be3d0dfc0f893148f1086736dL155

@gfodor gfodor changed the base branch from feature/scale-tool to master March 28, 2019 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
whats new Include this PR on the "What's New" page
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants