Skip to content

Commit 0dc05da

Browse files
committed
Upgrade Unity 2019.4 and fixes
1 parent 19b156a commit 0dc05da

File tree

21 files changed

+10
-113
lines changed

21 files changed

+10
-113
lines changed

Assets/Photon/PhotonChat/Demos.meta

-8
This file was deleted.

Assets/Photon/PhotonRealtime/Demos.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoAsteroids/Models.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoAsteroids/Scripts.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoHub.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoProcedural.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoSlotRacer/Kenney Assets/Racing Kit/Models.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoSlotRacer/Kenney Assets/Stylized city.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/DemoSlotRacer/Scripts/BezierCurve.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/PunBasics-Tutorial.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/PunCockpit/Scripts/Autonomous UI.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/Shared Assets/Animations.meta

-8
This file was deleted.

Assets/Photon/PhotonUnityNetworking/Demos/Shared Assets/Prefabs.meta

-8
This file was deleted.
Binary file not shown.

Assets/Standard Assets/Utility/ForcedReset.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System;
22
using UnityEngine;
3+
using UnityEngine.UI;
34
using UnityEngine.SceneManagement;
45
using UnityStandardAssets.CrossPlatformInput;
56

6-
[RequireComponent(typeof (GUITexture))]
7+
[RequireComponent(typeof (Image))]
78
public class ForcedReset : MonoBehaviour
89
{
910
private void Update()

Assets/Standard Assets/Utility/SimpleActivatorMenu.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using System;
22
using UnityEngine;
3+
using UnityEngine.UI;
34

45
namespace UnityStandardAssets.Utility
56
{
67
public class SimpleActivatorMenu : MonoBehaviour
78
{
89
// An incredibly simple menu which, when given references
910
// to gameobjects in the scene
10-
public GUIText camSwitchButton;
11+
public Text camSwitchButton;
1112
public GameObject[] objects;
1213

1314

Packages/manifest.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.ext.nunit": "1.0.0",
6-
"com.unity.ide.rider": "1.1.0",
7-
"com.unity.ide.vscode": "1.1.2",
8-
"com.unity.package-manager-ui": "2.2.0",
9-
"com.unity.postprocessing": "2.1.7",
10-
"com.unity.test-framework": "1.0.13",
6+
"com.unity.ide.rider": "1.1.4",
7+
"com.unity.ide.vscode": "1.2.1",
8+
"com.unity.postprocessing": "2.2.2",
9+
"com.unity.test-framework": "1.1.14",
1110
"com.unity.ugui": "1.0.0",
1211
"com.unity.modules.ai": "1.0.0",
1312
"com.unity.modules.androidjni": "1.0.0",

ProjectSettings/EditorSettings.asset

56 Bytes
Binary file not shown.

ProjectSettings/ProjectSettings.asset

-1.51 KB
Binary file not shown.

ProjectSettings/ProjectVersion.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.2.12f1
2-
m_EditorVersionWithRevision: 2019.2.12f1 (b1a7e1fb4fa5)
1+
m_EditorVersion: 2019.4.5f1
2+
m_EditorVersionWithRevision: 2019.4.5f1 (81610f64359c)
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)