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

13036fda

Commit 13036fda authored 5 years ago by Richard Marcus

Downloads
- Plain Diff

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

parents f91e4015 d068c7d2

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Assets/InventoryStuff/DisplayScrolls.cs 23 additions, 5 deletions

Assets/InventoryStuff/DisplayScrolls.cs
Assets/Resources/Prefabs/ScrollDisplay.prefab 155 additions, 28 deletions

Assets/Resources/Prefabs/ScrollDisplay.prefab
Assets/ScrollClickedScript.cs 12 additions, 0 deletions

Assets/ScrollClickedScript.cs
Assets/ScrollClickedScript.cs.meta 11 additions, 0 deletions

Assets/ScrollClickedScript.cs.meta
Assets/inventoryStuff.unity 14 additions, 12 deletions

Assets/inventoryStuff.unity
Mock-Scrolls.json 14 additions, 20 deletions

Mock-Scrolls.json

with 229 additions and 65 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