Skip to content

Commit e35d9df

Browse files
committed
Merge branch 'develop' into sam/feat/better-indexing-in-readme
* develop: Fix: Changed Default Quality Setting to Medium (#749) fix: adding RTT graph to RNSM [MTT-4788] (#747) # Conflicts: # CHANGELOG.md
2 parents 54700a7 + 66dc2ba commit e35d9df

File tree

6 files changed

+20
-8
lines changed

6 files changed

+20
-8
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
99
## [Unreleased] - yyyy-mm-dd
1010

1111
### Added
12+
* Added TOC and Index of educational concepts to readme (#736)
1213
* Added tests for connection management (#692). These are integration tests to validate that the state machine works properly. They use Netcode's NetworkIntegrationTest
1314
* Added handling the OnTransportFailure callback (#707). This callback is invoked when a failure happens on the transport's side, for example if the host loses connection to the Relay service. This won't get called when the host is just listening with direct IP, this would need to be handled differently (by pinging an external service like google to test for internet connectivity for example). Boss Room now handles that callback by returning to the Offline state.
1415
* Pickup and Drop action added to the Action system. Actionable once targeting a "Heavy"-tagged NetworkObject. (#372) - This shows NetworkObject parenting with a pattern to follow animation bones (the hands when picking up)
@@ -17,7 +18,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1718
* Introduced a mechanism for identifying actions by their runtime-generated ActionID, instead of relying on a fragile ActionType enumeration (#705)
1819
* NetworkObjectSpawner handles dynamically spawning in-scene placed NetworkObjects (#717) - You can't place a NetworkObject in scene directly and destroy it at runtime. This PR showcases proper handling of NetworkObjects that you'd wish to place inside of scenes, but would still want to destroy at game-time. Examples of these are: Imps, VandalImps, ImpBoss. NetworkObjects such as doors, crystals, door switch, etc. remain the same, statically-placed in scene.
1920
* Quality levels settings set up for Desktop [MTT-4450] (#713)
20-
* Added TOC and Index of educational concepts to readme (#736)
21+
* Added custom RNSM config with graph for RTT instead of single value (#747)
2122

2223
### Changed
2324
* Updated tools, authentication and relay packages (#690)

Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## [Unreleased] - yyyy-mm-dd
44

55
### Added
6-
*
6+
* Added custom RNSM config with graph for RTT instead of single value (#747)
77
### Changed
88
*
99
### Removed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:5080a9b907bac3cbc409cf77779de83470afe1262c4c76f661e1453f39ac2a93
3+
size 5873

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/CustomNetStatsMonitorConfiguration.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ MonoBehaviour:
4848
m_Name:
4949
m_EditorClassIdentifier:
5050
m_Visible: 1
51-
<MaxRefreshRate>k__BackingField: 30
51+
m_MaxRefreshRate: 30
5252
<CustomStyleSheet>k__BackingField: {fileID: 0}
5353
<PanelSettingsOverride>k__BackingField: {fileID: 0}
5454
<Position>k__BackingField:
5555
<OverridePosition>k__BackingField: 1
56-
<PositionLeftToRight>k__BackingField: 0
57-
<PositionTopToBottom>k__BackingField: 0
58-
<Configuration>k__BackingField: {fileID: 11400000, guid: 8f1b4e3792d8446399527749cfb591a2, type: 2}
56+
m_PositionLeftToRight: 0
57+
m_PositionTopToBottom: 0
58+
<Configuration>k__BackingField: {fileID: 11400000, guid: e778574068db1456fa54fbbade3bd995, type: 2}
5959
--- !u!114 &2974514019541307266
6060
MonoBehaviour:
6161
m_ObjectHideFlags: 0
@@ -174,7 +174,7 @@ MonoBehaviour:
174174
m_faceColor:
175175
serializedVersion: 2
176176
rgba: 4294967295
177-
m_fontSize: 70.5
177+
m_fontSize: 32.05
178178
m_fontSizeBase: 21
179179
m_fontWeight: 400
180180
m_enableAutoSizing: 1
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:95490dd92b15417ddd55926e6eaad48764b4b725f6fea02242cd587d406693ef
2+
oid sha256:416d44ea91cba52ac86f7fa1810da31481374c98cfc1b07ecb7d514d364efc83
33
size 8255

0 commit comments

Comments
 (0)