Skip to content

Commit

Permalink
prepare for patch release 1.2.1a
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftwareGuy committed Mar 19, 2019
1 parent 1a5df83 commit c24e573
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 77 deletions.
12 changes: 12 additions & 0 deletions Assets/Mirror/Runtime/Transport/ISegmentTransport.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// This was created on the basis of this pull request
// https://github.com/SoftwareGuy/Ignorance/pull/25
using System;

namespace Mirror
{
public interface ISegmentTransport
{
bool ServerSend(int connectionId, int channelId, ArraySegment<byte> data);
bool ClientSend(int channelId, ArraySegment<byte> data);
}
}
11 changes: 11 additions & 0 deletions Assets/Mirror/Runtime/Transport/ISegmentTransport.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions Assets/Mirror/Runtime/Transport/Ignorance/ISegmentTransport.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
// This was created on the basis of this pull request
// https://github.com/SoftwareGuy/Ignorance/pull/25
using System;

namespace Mirror
{
public interface ISegmentTransport
{
bool ServerSend(int connectionId, int channelId, ArraySegment<byte> data);
bool ClientSend(int channelId, ArraySegment<byte> data);
}
}
// file moved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// at https://github.com/SoftwareGuy/Ignorance. Remember, OSS is the
// way of the future!
// ----------------------------------------
#define IGNORANCE_PRESENT

using ENet;
#if UNITY_EDITOR
Expand Down
69 changes: 6 additions & 63 deletions Assets/PongChamp.unity
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,11 @@ PrefabInstance:
value:
objectReference: {fileID: 21300000, guid: 160d53f9f2b149c418d6d07e95438e53,
type: 3}
- target: {fileID: 114290021321007948, guid: 5f7a7f34494ed40268eff49dbf9168bf,
type: 3}
propertyPath: m_SceneId
value: 1035721996
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5f7a7f34494ed40268eff49dbf9168bf, type: 3}
--- !u!1 &1346799726
Expand All @@ -407,7 +412,6 @@ GameObject:
m_Component:
- component: {fileID: 1346799731}
- component: {fileID: 1346799730}
- component: {fileID: 1346799729}
- component: {fileID: 1346799728}
- component: {fileID: 1346799727}
m_Layer: 0
Expand All @@ -426,14 +430,6 @@ AudioListener:
m_GameObject: {fileID: 1346799726}
m_Enabled: 1
--- !u!124 &1346799728
Behaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346799726}
m_Enabled: 1
--- !u!92 &1346799729
Behaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -904,7 +900,6 @@ GameObject:
- component: {fileID: 1886246550}
- component: {fileID: 1886246552}
- component: {fileID: 1886246551}
- component: {fileID: 1886246554}
- component: {fileID: 1886246553}
m_Layer: 0
m_Name: NetworkManager
Expand Down Expand Up @@ -1030,58 +1025,6 @@ MonoBehaviour:
m_BasePeerTimeout: 5000
m_BasePeerMultiplier: 3
m_MaximumTotalConnections: 1000
--- !u!114 &1886246554
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1886246549}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3}
m_Name:
m_EditorClassIdentifier:
OnClientConnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
OnClientDataReceived:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventByteArray, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnClientError:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventException, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnClientDisconnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
OnServerConnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
OnServerDataReceived:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventIntByteArray, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnServerError:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventIntException, Mirror, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
OnServerDisconnected:
m_PersistentCalls:
m_Calls: []
m_TypeName: Mirror.UnityEventInt, Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
port: 7777
NoDelay: 1
--- !u!1 &2011557018
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1112,10 +1055,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SceneId: 0
m_ServerOnly: 0
m_LocalPlayerAuthority: 0
m_AssetId:
m_SceneId: 799345749
--- !u!114 &2011557020
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
3 changes: 2 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@ PlayerSettings:
webGLCompressionFormat: 1
webGLLinkerTarget: 1
webGLThreadsSupport: 0
scriptingDefineSymbols: {}
scriptingDefineSymbols:
1: MIRROR;MIRROR_1726_OR_NEWER
platformArchitecture: {}
scriptingBackend: {}
il2cppCompilerConfiguration: {}
Expand Down

0 comments on commit c24e573

Please sign in to comment.