Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.

Commit 93bc646

Browse files
Merge pull request #2 from ARgorithm/vinay-patch
Final Unity package Upgrade
2 parents 0340fd7 + 11977ee commit 93bc646

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

Assets/Scripts/PageSwipper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44
using UnityEngine.EventSystems;
5+
/* This script controls the scrolling under Gameobject UI->ARgorithmCloud Menu->Panel List Holder
6+
Don't do changes to the below script */
57

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

2224
}
23-
25+
/* Prevents the swipping downwards below a certain point*/
2426
public float easing = 0.5f;
2527

2628
public void OnEndDrag(PointerEventData data)

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"com.unity.collab-proxy": "1.2.16",
44
"com.unity.ide.rider": "1.1.4",
55
"com.unity.ide.vscode": "1.2.3",
6-
"com.unity.test-framework": "1.1.18",
6+
"com.unity.test-framework": "1.1.20",
77
"com.unity.textmeshpro": "2.1.1",
88
"com.unity.timeline": "1.2.17",
99
"com.unity.ugui": "1.0.0",

Packages/packages-lock.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"url": "https://packages.unity.com"
1515
},
1616
"com.unity.ext.nunit": {
17-
"version": "1.0.0",
17+
"version": "1.0.6",
1818
"depth": 1,
1919
"source": "registry",
2020
"dependencies": {},
@@ -44,11 +44,11 @@
4444
"url": "https://packages.unity.com"
4545
},
4646
"com.unity.test-framework": {
47-
"version": "1.1.18",
47+
"version": "1.1.20",
4848
"depth": 0,
4949
"source": "registry",
5050
"dependencies": {
51-
"com.unity.ext.nunit": "1.0.0",
51+
"com.unity.ext.nunit": "1.0.6",
5252
"com.unity.modules.imgui": "1.0.0",
5353
"com.unity.modules.jsonserialize": "1.0.0"
5454
},
@@ -119,14 +119,17 @@
119119
"url": "https://packages.unity.com"
120120
},
121121
"com.unity.xr.legacyinputhelpers": {
122-
"version": "2.1.4",
122+
"version": "2.1.7",
123123
"depth": 1,
124124
"source": "registry",
125-
"dependencies": {},
125+
"dependencies": {
126+
"com.unity.modules.vr": "1.0.0",
127+
"com.unity.modules.xr": "1.0.0"
128+
},
126129
"url": "https://packages.unity.com"
127130
},
128131
"com.unity.xr.management": {
129-
"version": "3.2.16",
132+
"version": "3.2.17",
130133
"depth": 1,
131134
"source": "registry",
132135
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.15f1
2-
m_EditorVersionWithRevision: 2019.4.15f1 (fbf367ac14e9)
1+
m_EditorVersion: 2019.4.18f1
2+
m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880)

ProjectSettings/UnityConnectSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 1
7-
m_Enabled: 0
7+
m_Enabled: 1
88
m_TestMode: 0
99
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
1010
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events

0 commit comments

Comments
 (0)