Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

UFrameIT
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

55ad66d0

Commit 55ad66d0 authored 5 years ago by John Schihada

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/UniFormal/UFrameIT

parents 6182137a 8b8783ec

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Assets/InteractionEngine/ShinyThings.cs 73 additions, 9 deletions

Assets/InteractionEngine/ShinyThings.cs
Assets/InteractionEngine/WorldCursor.cs 6 additions, 2 deletions

Assets/InteractionEngine/WorldCursor.cs
Assets/Materials/CursorMaterial.mat 7 additions, 1 deletion

Assets/Materials/CursorMaterial.mat
Assets/Materials/SeeThrough 1.mat 2 additions, 2 deletions

Assets/Materials/SeeThrough 1.mat
Assets/TreeWorld.unity 21 additions, 27 deletions

Assets/TreeWorld.unity

with 109 additions and 41 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