Skip to content

Commit 4c5f7b6

Browse files
authored
Merge branch 'development' into tests/native-render
2 parents 66597f1 + 53e22a5 commit 4c5f7b6

File tree

24 files changed

+349
-88
lines changed

24 files changed

+349
-88
lines changed

Assets/Plugins/Android/Core/AndroidPlatformSpecifics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class AndroidPlatformSpecifics : PlatformSpecifics<AndroidConfig>
5656
[DllImport("UnityHelpers_Android")]
5757
private static extern JavaVM UnityHelpers_GetJavaVM();
5858

59-
public AndroidPlatformSpecifics() : base(PlatformManager.Platform.Android, ".so") { }
59+
public AndroidPlatformSpecifics() : base(PlatformManager.Platform.Android) { }
6060

6161
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
6262
static public void Register()

Assets/Plugins/Linux/Core/LinuxPlatformSpecifics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class LinuxPlatformSpecifics : PlatformSpecifics<LinuxConfig>
5050

5151
private static GCHandle SteamOptionsGCHandle;
5252

53-
public LinuxPlatformSpecifics() : base(PlatformManager.Platform.Linux, ".so") { }
53+
public LinuxPlatformSpecifics() : base(PlatformManager.Platform.Linux) { }
5454

5555
//-------------------------------------------------------------------------
5656
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]

Assets/Plugins/Source/Editor/Utility/GUIEditorUtility.cs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,8 +823,26 @@ private static void RenderSetOfNamed<T>(
823823
list.DoLayoutList();
824824
}
825825
else
826-
{
827-
// TODO here
826+
{
827+
// If there are no items in the list, then the user needs to add an entry
828+
// before they can start modifying.
829+
EditorGUILayout.BeginHorizontal();
830+
831+
Rect rect = EditorGUILayout.GetControlRect();
832+
rect.height = EditorGUIUtility.singleLineHeight;
833+
834+
// Render the "+" button to add a new item
835+
if (GUILayout.Button("+", GUILayout.Width(24)))
836+
{
837+
addNewItemFn();
838+
}
839+
840+
if (!string.IsNullOrEmpty(helpUrl))
841+
{
842+
RenderHelpIcon(helpUrl);
843+
}
844+
845+
EditorGUILayout.EndHorizontal();
828846
}
829847
}
830848

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b2566815097f8df84c3481ef36648226a4f184744154e19335eb58b643c53f15
2+
oid sha256:969153308fe56d512c998509226a5a84918b8624c4691f06345a434396d136a7
33
size 122880
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5984497fc9cb68e8dd2d25dc8e6fe45b8322d282f88b82b1bfe6eea3c10d7732
3-
size 592896
2+
oid sha256:fcd9618285bb1bf56c72f46f64e228cda95aa27e64ea2a0199d649dbfebd8c10
3+
size 604672
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1926250dbc34f8519f4fab17ca42aea9808bbd6472fe7f6490bf4a40fe7fb7ed
2+
oid sha256:cf018202e613caa46f9f32301f728a6386cfb9b3c036b0f4b300725336f4e5e1
33
size 87040
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:feb614c1f35aa2339572866a481cb293924701dd3970922170537cd518f1743a
3-
size 457728
2+
oid sha256:361b0b0201d2b0afbf8f982cd529faa6cf148aeb7e9d303df7dff7854b61414f
3+
size 467968

Assets/Plugins/iOS/Core/IOSPlatformSpecifics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class EOSInitializeOptions
4444

4545
public class IOSPlatformSpecifics : PlatformSpecifics<IOSConfig>
4646
{
47-
public IOSPlatformSpecifics() : base(PlatformManager.Platform.iOS, ".dylib") { }
47+
public IOSPlatformSpecifics() : base(PlatformManager.Platform.iOS) { }
4848

4949
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
5050
static public void Register()

Assets/Plugins/macOS/Core/MacOSPlatformSpecifics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class EOSInitializeOptions
4545
//-------------------------------------------------------------------------
4646
public class MacOSPlatformSpecifics : PlatformSpecifics<MacOSConfig>
4747
{
48-
public MacOSPlatformSpecifics() : base(PlatformManager.Platform.macOS, ".dylib") { }
48+
public MacOSPlatformSpecifics() : base(PlatformManager.Platform.macOS) { }
4949

5050
//-------------------------------------------------------------------------
5151
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]

Assets/Scripts/StandardSamples/UI/MatchMaking/UISessionsMatchmakingMenu.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public void CreateNewSessionOnClick()
258258

259259
session.Attributes.Add(attribute);
260260

261-
GetEOSSessionsManager.CreateSession(session, UIOnSessionCreated);
261+
GetEOSSessionsManager.CreateSession(session, UIOnSessionCreated, this.PresenceVal.isOn);
262262
}
263263

264264
private void UIOnSessionCreated(SessionsManagerCreateSessionCallbackInfo info)

0 commit comments

Comments
 (0)