Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Assets/Scripts/PageSwipper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
/* This script controls the scrolling under Gameobject UI->ARgorithmCloud Menu->Panel List Holder
Don't do changes to the below script */

public class PageSwipper : MonoBehaviour , IDragHandler, IEndDragHandler
{
Expand All @@ -20,7 +22,7 @@ public void OnDrag(PointerEventData data)
transform.position = panelLocation - new Vector3(0, difference, 0);

}

/* Prevents the swipping downwards below a certain point*/
public float easing = 0.5f;

public void OnEndDrag(PointerEventData data)
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.18",
"com.unity.test-framework": "1.1.20",
"com.unity.textmeshpro": "2.1.1",
"com.unity.timeline": "1.2.17",
"com.unity.ugui": "1.0.0",
Expand Down
15 changes: 9 additions & 6 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.0",
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -44,11 +44,11 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.18",
"version": "1.1.20",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.6",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
Expand Down Expand Up @@ -119,14 +119,17 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.4",
"version": "2.1.7",
"depth": 1,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.management": {
"version": "3.2.16",
"version": "3.2.17",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2019.4.15f1
m_EditorVersionWithRevision: 2019.4.15f1 (fbf367ac14e9)
m_EditorVersion: 2019.4.18f1
m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880)
2 changes: 1 addition & 1 deletion ProjectSettings/UnityConnectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
m_Enabled: 0
m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
Expand Down