Merge

.gitignore

.gitmodules

Assets/Resources/Prefabs/Stage_Default.prefab

Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab

Assets/Resources/Prefabs/UI/FrameITUI.prefab

Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab

Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab

Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab

Assets/Scenes/Worlds/RiverWorld.unity

Assets/Scripts/InteractionEngine/CommunicationEvents.cs

...nteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs

...tionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs

Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs

Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs

Assets/Scripts/InteractionEngine/ShinyThings.cs

Assets/Scripts/InventoryStuff/ActiveScroll.cs

Assets/Scripts/InventoryStuff/ActiveScroll.cs.meta

Assets/Scripts/InventoryStuff/DisplayScrolls.cs

Assets/Scripts/InventoryStuff/ScrollClickedScript.cs

Assets/Scripts/InventoryStuff/ScrollDetails.cs