Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiplayer Beta #774

Merged
merged 195 commits into from
Dec 21, 2024
Merged

Multiplayer Beta #774

merged 195 commits into from
Dec 21, 2024

Conversation

andybak
Copy link
Contributor

@andybak andybak commented Oct 7, 2024

No description provided.

mikeskydev and others added 25 commits December 7, 2023 12:13
# Conflicts:
#	Assets/Prefabs/Panels/AdminPanel.prefab
#	Assets/Settings/Localization/Strings/Strings Shared Data.asset
#	Assets/Settings/Localization/Strings/Strings_en.asset
will probably conflict

# Conflicts:
#	Assets/Scenes/Main.unity
# Conflicts:
#	Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs
#	Assets/Scripts/Multiplayer/MultiplayerManager.cs
# Conflicts:
#	Assets/Scripts/PassthroughManager.cs
# Conflicts:
#	Assets/Settings/Localization/Strings/Strings Shared Data.asset
#	Assets/Settings/Localization/Strings/Strings_en.asset
# Conflicts:
#	Assets/Settings/Localization/Strings/Strings_en.asset
-Implemented global command: MultiplayerJoinRoom.
-Updated the multiplayer panel prefab and manager.
-Changed the admin panel layout from hexagon to octagon.
TODO:
-Add room name editing capabilities.
@andybak andybak added the enhancement Feature added label Oct 7, 2024
sbanca added 3 commits October 7, 2024 20:39
- Added initialization of the keyboard with the current room name in `MultiplayerPanelButton.cs`.
- Changed `SetRoomName` to a property (`RoomName`) in `MultiplayerPanel.cs` for better readability and encapsulation.
- Updated `SketchControlScript.cs` to use the new `RoomName` property.
-MultiplayerManager: Added DoesRoomNameExist() and updated m_RoomData for room validation.

-MultiplayerPanel: Added UpdateRoomExistenceMessage() to indicate if a room exists or will be created (added a text to the prefab)
remove  'GraphView'
Assets/Scripts/GUI/MultiplayerPanel.cs Outdated Show resolved Hide resolved
@mikeage mikeage dismissed their stale review December 19, 2024 08:06

looks good, thanks!

Replaced
PASSTHROUGH_GUID = "e38af599-4575-46ff-a040-459703dbcd36";
with a new property isPassthrough in the environment scriptable object.
@andybak andybak merged commit d5384b0 into main Dec 21, 2024
42 checks passed
@andybak andybak deleted the multiplayer/ui branch December 21, 2024 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature added
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants