Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9bf3911
feat: Integrate Ingame UI
hammerlerobi Oct 11, 2024
d97b789
chore: add globals
hammerlerobi Oct 11, 2024
0d6276e
wip: polish main menu
hammerlerobi Oct 11, 2024
b137628
Chore: align StartScreen and clean up
hammerlerobi Oct 14, 2024
6ab1698
chore: fix some UI incosistencies
hammerlerobi Oct 14, 2024
ac1a3b6
feat: Upgrade and align UI
hammerlerobi Oct 14, 2024
08deacf
chore: style adjustments
hammerlerobi Oct 15, 2024
d9a8a4f
chore: docs and refactoring
hammerlerobi Oct 15, 2024
9979d74
fix: add focused state for round buttons
hammerlerobi Oct 15, 2024
2b4ecdd
Merge remote-tracking branch 'origin/develop' into feat/distributed-a…
hammerlerobi Oct 15, 2024
738cfce
chore: remove unused asset
hammerlerobi Oct 15, 2024
f303848
Merge branch 'develop' into feat/distributed-authority-sample/integra…
hammerlerobi Oct 16, 2024
67e42f0
fix: integrate UI with latest develop
hammerlerobi Oct 16, 2024
5915c9b
chore: cleanup names
hammerlerobi Oct 16, 2024
0a8865e
Update Experimental/DistributedAuthoritySample/Assets/Scripts/UI/Inga…
hammerlerobi Oct 16, 2024
568f75b
feat: Add hint about Rnsm Interaction
hammerlerobi Oct 16, 2024
4656bdf
Apply review changes
hammerlerobi Oct 16, 2024
dd6c205
fix: forgot to change to extension method
hammerlerobi Oct 17, 2024
2c35c07
fix: Make sure RSM Hint does not gets added twice on MPPM
hammerlerobi Oct 17, 2024
b781707
chore: add comment
hammerlerobi Oct 17, 2024
d91e666
chrore: rename Events and subscribe
hammerlerobi Oct 17, 2024
cda178b
chore: internalize classes and cleanup in onDisable
hammerlerobi Oct 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.

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 @@ -608,6 +608,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ShowNetworkStats",
"type": "Button",
"id": "4b6bb4e4-7ecf-48df-be01-616de9cd0ff8",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -1028,6 +1037,17 @@
"action": "TrackedDeviceOrientation",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "249f3bcc-4eed-4959-bc3f-d719bc91d034",
"path": "<Keyboard>/#(M)",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "ShowNetworkStats",
"isComposite": false,
"isPartOfComposite": false
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 2560315501379389793}
- component: {fileID: 3424233303973944120}
- component: {fileID: 6717113432061250836}
m_Layer: 0
m_Name: Runtime Network Stats Monitor
m_TagString: Untagged
Expand Down Expand Up @@ -50,6 +51,19 @@ MonoBehaviour:
<PanelSettingsOverride>k__BackingField: {fileID: 0}
<Position>k__BackingField:
<OverridePosition>k__BackingField: 1
m_PositionLeftToRight: 0
m_PositionLeftToRight: 1
m_PositionTopToBottom: 0
<Configuration>k__BackingField: {fileID: 11400000, guid: 08b51bc9665db584a94cac2fd1c7313d, type: 2}
--- !u!114 &6717113432061250836
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6290292887620514864}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c70c2cf93e2f4f7e94a255fac4c480d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractActionReference: {fileID: -6206414252132299102, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}

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

Loading