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

47adaf93

Commit 47adaf93 authored 2 years ago by Tobias Schöner

Downloads
- Plain Diff

Merge branch 'marcel' of https://github.com/UFrameIT/UFrameIT into marcel

parents e3e74855 964e953b

No related branches found

No related tags found

1 merge request!1feat: added visualisation for CircleFact; added Torus- and ConeGenerator

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Scenes/Worlds/RiverWorld.unity 7 additions, 1 deletion

Assets/Scenes/Worlds/RiverWorld.unity
Assets/Scripts/InteractionEngine/FactHandling/Fact.cs 201 additions, 1 deletion

Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
Assets/Scripts/InteractionEngine/WorldCursor.cs 1 addition, 0 deletions

Assets/Scripts/InteractionEngine/WorldCursor.cs
Assets/Scripts/InventoryStuff/DisplayFacts.cs 2 additions, 0 deletions

Assets/Scripts/InventoryStuff/DisplayFacts.cs
Assets/Scripts/InventoryStuff/Scroll.cs 1 addition, 0 deletions

Assets/Scripts/InventoryStuff/Scroll.cs
Assets/Scripts/JSONManager.cs 17 additions, 15 deletions

Assets/Scripts/JSONManager.cs
ProjectSettings/Packages/com.unity.probuilder/Settings.json 0 additions, 5 deletions

ProjectSettings/Packages/com.unity.probuilder/Settings.json
UserSettings/EditorUserSettings.asset 2 additions, 2 deletions

UserSettings/EditorUserSettings.asset

with 231 additions and 24 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