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.

Sign up for GitHub

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

Jump to bottom

Basic Multiplayer UI #774

Draft
wants to merge 52 commits into
base: main
Choose a base branch
from
Draft

Basic Multiplayer UI #774

wants to merge 52 commits into from

Commits on Dec 7, 2023

  1. WIP UI 

    # Conflicts:
#	Assets/Prefabs/Panels/AdminPanel.prefab
#	Assets/Settings/Localization/Strings/Strings Shared Data.asset
#	Assets/Settings/Localization/Strings/Strings_en.asset
    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    dd1f515 View commit details
    Browse the repository at this point in the history

  2. Fix panel spawn

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    a0ad425 View commit details
    Browse the repository at this point in the history

  3. Add MP panel to list 

    will probably conflict

# Conflicts:
#	Assets/Scenes/Main.unity
    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    774196c View commit details
    Browse the repository at this point in the history

  4. Oculus connection logic for testing

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    ed48bef View commit details
    Browse the repository at this point in the history

  5. Join logic 

    # Conflicts:
#	Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs
#	Assets/Scripts/Multiplayer/MultiplayerManager.cs
    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    52c54ff View commit details
    Browse the repository at this point in the history

  6. WIP panel

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    a23f473 View commit details
    Browse the repository at this point in the history

  7. Setup new button type, fix close button

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    5d45586 View commit details
    Browse the repository at this point in the history

  8. Change instantiation point of photon runner 

    # Conflicts:
#	Assets/Scripts/PassthroughManager.cs
    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    99b54d1 View commit details
    Browse the repository at this point in the history

  9. beta tag prefab

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    87c9a62 View commit details
    Browse the repository at this point in the history

  10. Add alpha tag to multiplayer

    @mikeskydev
    mikeskydev committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3ee080a View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Merge remote-tracking branch 'origin/main' into multiplayer/ui 

    [CI BUILD]
    @andybak
    andybak committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    2fbf009 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Remove duplicate "using" block 

    [CI BUILD]
    @andybak
    andybak committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    3882616 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Merge branch 'main' into multiplayer/ui 

    # Conflicts:
#	Assets/Settings/Localization/Strings/Strings Shared Data.asset
#	Assets/Settings/Localization/Strings/Strings_en.asset
    @mikeskydev
    mikeskydev committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    33efddc View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. Merge remote-tracking branch 'origin/main' into multiplayer/ui

    @andybak
    andybak committed May 19, 2024
    Configuration menu
    Copy the full SHA
    2e03443 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'main' into multiplayer/ui

    @mikeskydev
    mikeskydev committed May 21, 2024
    Configuration menu
    Copy the full SHA
    e90d5dc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge remote-tracking branch 'origin/main' into multiplayer/ui 

    # Conflicts:
#	Assets/Settings/Localization/Strings/Strings_en.asset
    @andybak
    andybak committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b4cc4ec View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Trigger CI workflow

    @sbanca
    sbanca committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    de5499a View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Minimal UI Implementation for multiplayer room 

    -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.
    @sbanca
    sbanca committed Oct 7, 2024
    4 Configuration menu
    Copy the full SHA
    4fe8071 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into multiplayer/ui

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    defb047 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'multiplayer/ui' of https://github.com/icosa-foundation/… 

    …open-brush into multiplayer/ui
    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    ad8281b View commit details
    Browse the repository at this point in the history

  4. Numeric keyboard popup for multiplayer room

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    cf83975 View commit details
    Browse the repository at this point in the history

  5. Buttons were too close to panel

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    16d3746 View commit details
    Browse the repository at this point in the history

  6. Don't init XR manager on start

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    1637dc9 View commit details
    Browse the repository at this point in the history

  7. OpenXR should be the default in the editor

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    ba14137 View commit details
    Browse the repository at this point in the history

  8. Admin panel label tweaks

    @andybak
    andybak committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    ada058c View commit details
    Browse the repository at this point in the history

  9. Initialize keyboard with room name and refactor room name handling 

    - 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.
    @sbanca
    sbanca committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    7a2b832 View commit details
    Browse the repository at this point in the history

  10. Does Room exist 

    -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)
    @sbanca
    sbanca committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    02dbcfe View commit details
    Browse the repository at this point in the history

  11. Update MultiplayerManager.cs 

    remove  'GraphView'
    @sbanca
    sbanca committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    af158cc View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge remote-tracking branch 'origin/main' into multiplayer/ui

    @andybak
    andybak committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    af7a389 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'multiplayer/ui' of https://github.com/icosa-foundation/… 

    …open-brush into multiplayer/ui
    @andybak
    andybak committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    50e7266 View commit details
    Browse the repository at this point in the history

  3. Remove graphview reference

    @andybak
    andybak committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    3e3bc6f View commit details
    Browse the repository at this point in the history

  4. dotnet format

    @andybak
    andybak committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    562b5bd View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Add Disconnection Handling for Multiplayer Mode Update 

    This change set introduces event-driven handling for multiplayer disconnections and ensures that the MultiplayerPanel properly updates its UI when a disconnection occurs.
    @sbanca
    sbanca committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    a8e177b View commit details
    Browse the repository at this point in the history

  2. Add Leave Room button 

    Add Leave Room button
Add Leave Room Global Command
    @sbanca
    sbanca committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    438a276 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Update PhotonPlayerRig.prefab

    @sbanca
    sbanca committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    f2d2108 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Update MultiplayerPanel.prefab

    @sbanca
    sbanca committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    b9fcd27 View commit details
    Browse the repository at this point in the history

  2. Editor UI to test connection to the room

    @sbanca
    sbanca committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    fc4d431 View commit details
    Browse the repository at this point in the history

  3. Reducing payload per Stroke Chunk 

    - Reducing payload per Stroke Chunk from 128 control points to 10 control points
- Adding a single point where the payload can be edited called NetworkingConstants
this is then used both in PhotonStructs.cs and PhotonManager.cs
    @sbanca
    sbanca committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    3213254 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. update Build GitHub Actions workflow (build.yml) to use the new photo… 

    …n tag.
    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0c07316 View commit details
    Browse the repository at this point in the history

  2. Update PopUpWindow_NumericKeyboard.prefab 

    aligning the collider
    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    eed2b6a View commit details
    Browse the repository at this point in the history

  3. Include Photon Fusion project-specific assets in version control

    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0bb5dfe View commit details
    Browse the repository at this point in the history

  4. Include NetworkPrefabAssetCollection.asset in version control

    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ba5a48d View commit details
    Browse the repository at this point in the history

  5. Update PhotonPlayerRig.prefab

    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    29ce9ff View commit details
    Browse the repository at this point in the history

  6. removing the NetworkPrefbAssetCollection

    @sbanca
    sbanca committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f45546b View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Track PhotonAppSettings

    @sbanca
    sbanca committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    20e4a8b View commit details
    Browse the repository at this point in the history

  2. Rebake PhotonPlayerRig 

    Rebake attempt
    @sbanca
    sbanca committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    2543d85 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Update SketchControlsScript.cs 

    1- Adding blank commands to avoid Unrecognized command Error
    @sbanca
    sbanca committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    69f666b View commit details
    Browse the repository at this point in the history

  2. Update MultiplayerPanel.cs 

    Multiplayer Panel
1 - Handle the Case When MultiplayerManager.m_Instance is null
2 - Avoid Accessing MultiplayerManager.m_Instance in Field Initializers
    @sbanca
    sbanca committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    6f13bb7 View commit details
    Browse the repository at this point in the history

  3. Handle the removal of the player rig when leaving the room 

    handle the removal of the player rig to ensure proper Clean-up
    @sbanca
    sbanca committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    ee77722 View commit details
    Browse the repository at this point in the history

  4. Update PhotonManager.cs 

    removing UnityEditor.Localization.Platform.Android
    @sbanca
    sbanca committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    8a589a0 View commit details
    Browse the repository at this point in the history

  5. Update SketchControlsScript.cs 

    pass pre-commit
    @sbanca
    sbanca committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    e7843f2 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Create NetworkPrefabAssetCollection.asset 

    Adding this to solve the
    @sbanca
    sbanca committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    e5de53b View commit details
    Browse the repository at this point in the history