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

Fixes for collaboration experiment #254

Merged
merged 25 commits into from
Mar 27, 2024
Merged

Conversation

xBambusekD
Copy link
Contributor

No description provided.

…o devel

# Conflicts:
#	arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity
# Conflicts:
#	.gitignore
…cted icon was different than the opened menu
…r when adding an AP using robot; Menu icons updated when object locked by other user
@ZdenekM
Copy link
Member

ZdenekM commented Mar 20, 2024

@xBambusekD There is some meta file missing: missing Assets/TextMesh Pro/Examples & Extras/Scripts/DropdownSample.cs.meta

@ZdenekM ZdenekM merged commit ef4f1bd into robofit:master Mar 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants