Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

Hubs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

51d6bd1c

Commit 51d6bd1c authored 6 years ago by joni

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/image-interactables' into feature/paste-models

parents 1b17deea 34a4ec9d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/stylesheets/2d-hud.scss 17 additions, 0 deletions

src/assets/stylesheets/2d-hud.scss
src/assets/stylesheets/info-dialog.scss 1 addition, 1 deletion

src/assets/stylesheets/info-dialog.scss
src/components/networked-counter.js 1 addition, 1 deletion

src/components/networked-counter.js
src/components/sticky-object.js 21 additions, 9 deletions

src/components/sticky-object.js
src/react-components/2d-hud.js 21 additions, 2 deletions

src/react-components/2d-hud.js
src/react-components/info-dialog.js 40 additions, 2 deletions

src/react-components/info-dialog.js
src/react-components/ui-root.js 7 additions, 1 deletion

src/react-components/ui-root.js

with 108 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment