Skip to content

Commit

Permalink
Merge pull request #395 from FeedJonathanFoundation/revert-394-simonn…
Browse files Browse the repository at this point in the history
…etworkfix

Revert "Simonnetworkfix"
  • Loading branch information
Stella committed Apr 10, 2016
2 parents aa4b48a + bb1468c commit 0ccc6b2
Show file tree
Hide file tree
Showing 68 changed files with 1,350 additions and 33,924 deletions.
File renamed without changes.
File renamed without changes.
54 changes: 0 additions & 54 deletions Assets/Prefabs/FlareObject.prefab
Expand Up @@ -28,8 +28,6 @@ GameObject:
- 4: {fileID: 426696}
- 54: {fileID: 5408638}
- 114: {fileID: 11475008}
- 114: {fileID: 11474730}
- 114: {fileID: 11462774}
m_Layer: 0
m_Name: FlareObject
m_TagString: Flare
Expand Down Expand Up @@ -139,58 +137,6 @@ Light:
m_ShadowRadius: 0
m_ShadowAngle: 0
m_AreaSize: {x: 1, y: 1}
--- !u!114 &11462774
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 177066}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1768714887, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TransformSyncMode: 3
m_SendInterval: 0.1
m_SyncRotationAxis: 3
m_RotationSyncCompression: 0
m_SyncSpin: 0
m_MovementTheshold: 0.001
m_SnapThreshold: 5
m_InterpolateRotation: 1
m_InterpolateMovement: 1
--- !u!114 &11474730
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 177066}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 372142912, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SceneId:
m_Value: 0
m_AssetId:
i0: 20
i1: 129
i2: 88
i3: 90
i4: 143
i5: 22
i6: 76
i7: 4
i8: 217
i9: 190
i10: 237
i11: 208
i12: 133
i13: 242
i14: 238
i15: 45
m_ServerOnly: 0
m_LocalPlayerAuthority: 0
--- !u!114 &11475008
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
9 changes: 0 additions & 9 deletions Assets/Prefabs/Network.meta

This file was deleted.

0 comments on commit 0ccc6b2

Please sign in to comment.