Skip to content

Commit 9267cbf

Browse files
DellaBittaDellaBitta
committed
Merge remote-tracking branch 'origin/master' into ghm
2 parents c6d452b + 5566fd5 commit 9267cbf

45 files changed

Lines changed: 2881 additions & 1420 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎analytics/testapp/ProjectSettings/ProjectSettings.asset‎

Lines changed: 372 additions & 185 deletions
Large diffs are not rendered by default.

‎analytics/testapp/ProjectSettings/ProjectVersion.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
m_EditorVersion: 5.4.1f1
2-
m_StandardAssetsVersion: 0
1+
m_EditorVersion: 2017.4.1f1

‎analytics/testapp/ProjectSettings/UnityAdsSettings.asset‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎analytics/testapp/ProjectSettings/UnityConnectSettings.asset‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
--- !u!310 &1
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
6+
m_Enabled: 0
7+
m_TestMode: 0
8+
m_TestEventUrl:
9+
m_TestConfigUrl:
10+
m_TestInitMode: 0
11+
CrashReportingSettings:
12+
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13+
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
14+
m_Enabled: 0
15+
m_CaptureEditorExceptions: 1
616
UnityPurchasingSettings:
717
m_Enabled: 0
818
m_TestMode: 0
@@ -12,3 +22,13 @@ UnityConnectSettings:
1222
m_TestMode: 0
1323
m_TestEventUrl:
1424
m_TestConfigUrl:
25+
UnityAdsSettings:
26+
m_Enabled: 0
27+
m_InitializeOnStartup: 1
28+
m_TestMode: 0
29+
m_IosGameId:
30+
m_AndroidGameId:
31+
m_GameIds: {}
32+
m_GameId:
33+
PerformanceReportingSettings:
34+
m_Enabled: 0

‎analytics/testapp/readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ with the
88

99
## Requirements
1010

11-
* [Unity](http://unity3d.com/) 5.3 or higher.
11+
* [Unity](http://unity3d.com/) The quickstart project requires 2017.4 or higher.
1212
* [Xcode](https://developer.apple.com/xcode/) 10.3 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)

0 commit comments

Comments
 (0)