Jacob Stove Lorentzen
a394c6e4
Latest Dev and Readme without Vivox
3 年前
4dc33191
merging in the working plastic branch.
3 年前
75340c6c
Merge pull request #5 from Unity-Technologies/mainBranchMergeAndDocs
dev branch merge and docs
3 年前
5a5209dc
Pulled in latest Renames from Plastic Branch
3 年前
85de15c7
Updated latest Lobby Rename and Moved Relay allocation to Countdown.
3 年前
d7613e86
Latest Rename Changes.
3 年前
a41d97a0
Merge pull request #7 from Unity-Technologies/dev
Latest class renaming and Doc updates.
3 年前
Jacob Stove Lorentzen
8cbba883
Merging from Dev to fix double-main head issue.
3 年前
Jacob Stove Lorentzen
35c03f04
Bringing in Merge changes to Lobby
3 年前
0aa138ef
Merge pull request #9 from Unity-Technologies/master-lobby_merge_resolution-beta_packages_included-public_release_staging
Public Release Structure
3 年前
Jacob Stove Lorentzen
356c8836
Staging/dev should be pretty in-sync
3 年前
678fd232
Still partial progress. I have a little handoff going where the client identifies itself to the server and the server responds with an ID to use in further communication. However, I don't think that will actually work since all clients would also need those IDs? I can just send the user ID, which takes up more bandwidth but not dramatically so. Also, this pinpoints the heartbeat for keeping the Relay allocation up. I'm trying to pull out all the job system things, since that both seems like an extra layer of complexity that devs would have to learn and it also isn't, like, *actually* used correctly in the sample?
3 年前
d1773d39
Consolidating and renaming for readability. This still represents the baseline Relay + UTP behavior, without removing existing Lobby behavior yet or handling edge cases.
3 年前
fbb0cb37
Adding inclusion of initial player data to lobby creation/join. Adding logic for Relay hosts to ferry network events from client to client. A bit of progress on changing the flow of user state to account for Relay, but that's still mostly in-progress. Adding client heartbeat to keep the UTP connection alive.
3 年前
90d3890c
Completing the game state shift from lobby to relay. This adjusts the countdown to be interruptible and to properly handle exiting the game and restarting it. I'm also starting to trim a bit from the GameStateManager and the main scene, though most of that is pending.
3 年前
2689dab6
Adding in a color field to the lobbies, and the ability to filter by color in the lobby list. I still need to ensure the additional UI works for arbitrary aspect ratios.
3 年前
60538f07
Adjusting the color filter UI elements to work with arbitrary aspect ratios.
3 年前
363b2f50
Merging the UTP changes.
3 年前
Jacob Stove Lorentzen
d48a3cea
Swapped IP and Lobby Code positions,
3 年前
Jacob Stove Lorentzen
4481b919
Moved UI to seperate Lobby and relay elements, framed them.
3 年前
499de49e
Just swapping around what text gets colored to match the lobby color.
3 年前
f34a8337
Merge of UI changes.
3 年前
Jacob Stove Lorentzen
787d711a
Added Crown Icon for host, and updated LobbyUserUI to switch it on/off based on "IsHost"
3 年前
Jacob Stove Lorentzen
18cac2ab
UI changes and Readme to Staging
3 年前
Jacob Stove Lorentzen
e7ddbab9
Cooldown for Lobby Requests - Preventing Confusing errors due to User impatience.
3 年前
08f80eee
Shortening player name character limit. Adding lobby name character limit.
3 年前
Jacob Stove Lorentzen
286b4757
Implemented CR feedback
3 年前
e9163795
Oh, I found one of the bits that had been modified in mainScene instead of the JoinCreateCanvas prefab; Looks like the assignment of Hide on the join button OnSelect wasn't made to the prefab.
3 年前
92722c59
Merge from minor fixes branch
3 年前
Jacob Stove Lorentzen
8957a190
Merging from main to check compatibility
3 年前
Jacob Stove Lorentzen
b536a7a4
Merging in Cooldown for Lobby Buttons.
3 年前
Jacob Stove Lorentzen
ebefab4b
Brought in latest Bug fixes and Updates
3 年前
b9db2078
Adding in rate limit events for query operations. Now, the refresh button will be disabled while within the rate limit cooldown, and the lobby data refresh follows it as well (which it did previously, but it was less clear).
3 年前
691a48ab
Adding rate limit behavior for the Join button, so it will also fade while within the rate limit for joining lobbies.
Seems like at some point here, I've lost all non-manual list refreshing except when coming from the main menu? I.e. when quitting a lobby, the list doesn't refresh, since it's still within the rate limit for the lobby but we don't (and shouldn't?) cache the refresh call for the list.
3 年前
a8327179
Ugh, I'm just getting really lost in this merge. Just gonna check this in reaaaal quick since this seems to be nearly correct and then make adjustments. It appears I no longer have the issue where it recurses forever and crashes, but it's not *quite* right on the Join menu refreshing logic.
3 年前
Jacob Stove Lorentzen
be717df9
Working Popup spawning and deletion, as well as extracting the topmost sentence from the Exception Log.
Popup design is pending, will have to work out a better UI spot.
3 年前
9f43a38a
Minor renames to clarify join codes.
Keep forgetting how to tag this, but let's try: [apply-change:a7f97ad3-049d-441d-8e2b-5f9e984488cc]
3 年前
9785bf7e
Merging the rate limit handling branch.
3 年前
Jacob Stove Lorentzen
3f26c715
PopUI CR changes applied
3 年前
Jacob Stove Lorentzen
aabd0373
3 年前
Jacob Stove Lorentzen
140c3348
Merged in latest from Staging
3 年前
ea4a1137
Merging the Open_beta_update branch. The behavior for error pop-ups isn't quite done yet, but we've gotten a few other updates and fixes wrapped up with that so we'll just merge this all together now and branch of completion of that task next.
3 年前
Jacob Stove Lorentzen
1a5dccac
Merging in latest from Staging
3 年前
9cc7b9d3
Changing the error pop-up to handle the LobbyServiceException with more player-facing error output. The same work for Relay will follow if the package is in a usable state.
3 年前
Jacob Stove Lorentzen
0b5d6093
Added volume icon panel
3 年前
Jacob Stove Lorentzen
e1029858
Mute art added, main scene changes reverted to show them.
3 年前
Jacob Stove Lorentzen
b683e72d
Finished UI graphics, begun adding local user data for Muting/Activating/Volume.
3 年前
Jacob Stove Lorentzen
60ca6111
Local User Audio UI hooked into listening for LocalUser.HasVoice.
Added Mute Toggle Button,
Added Volume Button
3 年前
Jacob Stove Lorentzen
c06c142d
addressed CR comments.
3 年前
Jacob Stove Lorentzen
db92ac88
Updating main branch to latest Lobby and relay SDK
3 年前
ab507ae5
Merge pull request #10 from Unity-Technologies/master
plastic-dev-master to github main
3 年前
6ce074b5
Merge from the Vivox UI branch
3 年前
c90240f8
Merging the error code exception branch.
3 年前
Jacob Stove Lorentzen
ce9d9799
Merging in latest to begin network integration
3 年前
Jacob Stove Lorentzen
db4d0f42
QuickJoin Button and functionality
3 年前
a685cb09
Adding volume controls and muting, though the actual cross-muting isn't yet working since the Vivox IDs aren't being mapped correctly to our Auth IDs yet.
3 年前
3740510f
Merge pull request #11 from Unity-Technologies/master-staging
Master staging
3 年前
Jacob Stove Lorentzen
6b794fd9
merging in public transport package
3 年前
c218602f
Merge of Vivox UI branch
3 年前
Jacob Stove Lorentzen
3f090620
Merged in latest to work on Quick Join errors
3 年前
fb9919c6
Adding the automatic en/disabling of the volume controls based on whether the player is actually able to send voice (i.e. do they have a device available, are they connected to the channel). Adding logic to display a mic icon for the local user instead of the volume control, so they just have the mute toggle. It still needs a mic icon.
3 年前
Jacob Stove Lorentzen
1b9c4895
Quick Join errors updated to latest error handling, added unique rate limiter to quick join in accordance with SDK Spec (10 seconds)
3 年前
Jacob Stove Lorentzen
c610d2b5
Vivox Prefab Hookup
3 年前
Jacob Stove Lorentzen
517f271d
Solved UI Raycasts not working
3 年前
Jacob Stove Lorentzen
49b70c15
Merging in quick join button
3 年前
Jacob Stove Lorentzen
8236bc89
MicIcon add
3 年前
f15bb0a0
Adding images and started to update the scene
3 年前
Jacob Stove Lorentzen
c69acc26
consolidated Mute Icon
3 年前
d85e28b4
updated the main menu canvas
3 年前
Jacob Stove Lorentzen
845cb450
fixed prefab
3 年前
de4e25de
continuinig
3 年前
Jacob Stove Lorentzen
3d9b2eba
re-fixed icon reference for mute overlay icon
3 年前
66e6555e
more updates to the join screen
3 年前
Jacob Stove Lorentzen
c7e353aa
Vivox Support for Lobby and Relay merge
3 年前
5f62c6f2
updating join/create
3 年前
Jacob Stove Lorentzen
cddafaa2
Added new Borders and replaced some UI elements for testing
3 年前
7d335331
Restoring the Quick Join button, which was lost during the merge of vivox_package_integration. I'm also recovering the error pop-up which was also lost in that merge, and I'll verify that nothing else was lost.
3 年前
a101f72d
Correcting how we handle the volume state and UI when users leave and rejoin lobbies, to prevent stale values from persisting and to prevent the initial UI state for a user entering a lobby from being incorrect if they were previously in a lobby.
3 年前
Jacob Stove Lorentzen
e5c32078
Updated all UI elements to new borders
3 年前
94647717
Verified that there are no other losses from the vivox_package branch. Unrelated, I noticed this old prefab isn't used anywhere.
3 年前
783c41cb
Merging the quick_join_put_it_back branch, which puts back the quick join button as well as the error popup.
3 年前
Jacob Stove Lorentzen
a915717f
continued cleaning up UI elements
3 年前
3743aff9
pull from staging
3 年前
Jacob Stove Lorentzen
ef338f8f
Merge and Prefab polish
3 年前
64a2f21c
The green "in-game" border was blocking raycasts to user card UI elements, which I hadn't noticed until now since the Vivox volume controls are the only interactable thing therein.
3 年前
Jacob Stove Lorentzen
4b1b4b2e
Addded mipmaps
3 年前
Jacob Stove Lorentzen
8e017b40
UI Edits merged
3 年前
e7d52025
Pull from staging for UI polish
3 年前
Jacob Stove Lorentzen
87f68c15
merge in latest Vivox and UI Fixes
3 年前
3188678f
Merge from vivox_polish branch
3 年前
Jacob Stove Lorentzen
5b8f3d41
UI Cleanup, unified some fonts, added borders to Lobby List.
3 年前
Jacob Stove Lorentzen
cdf1ba7f
Updated Canvas Visuals to new Assets
3 年前
Jacob Stove Lorentzen
256d3d19
3 年前
fa1b6636
Pull from main/staging
3 年前
4954d4e9
Merge pull request #13 from Unity-Technologies/master-staging
Vivox Feature branch
3 年前
Jacob Stove Lorentzen
4f570a1a
Merging LAtest vivox changes to Main
3 年前
e0abc931
Bugs: Removing the selected lobby data from the Join menu, so that when we return from a lobby, if we select Join again immediately, we don't just try to join the same lobby again. Changing "Ready." to "Ready" in the lobby UI. Making the error popup block raycasts fully, except for the Back button (for the case of the host disconnecting from the Lobby, since they would be popping up a 404 every 1.5s such that it would be difficult to click the button to leave the lobby).
3 年前
Jacob Stove Lorentzen
aabe96ba
moved UI to MainMenu
3 年前
Jacob Stove Lorentzen
a08fcab2
added the in-gamecolor back in
3 年前
8192c7a4
Bugs: Fixing a couple harmless null refs that could result from quitting out of a lobby during Relay connection. Allowing the Back button to be visible during lobby countdown since quitting out at that point won't, like, *ruin* anything; this is actually to fix an issue where a client's Back button could disappear for an UpdateSlow between the point where they locally know they're in game and the lobby receives the actual data push from the host.
3 年前
Jacob Stove Lorentzen
dc3fdbcc
3 年前
e32921b2
Bugs: Adding clarifying comments for Relay + UTP and for some of the design patterns. Adding a rate limit on the lobby host button. Adding a blocker on the spinner so that the lobby list UI can't be interacted with while the spinner is visible (to prevent someone from starting to join a room that's about to be removed from the list).
3 年前
c1ec2599
Merge pull request #14 from Unity-Technologies/master
Master
3 年前
Jacob Stove Lorentzen
f9b30e40
Merged in latest bug fixes.
3 年前
92365e69
Merge from current staging.
3 年前
Jacob Stove Lorentzen
963ba54f
UI text font unification.
Unified UI heights and widths.
Added UI background scene for UI prefab editing.
3 年前
aa4205bd
Oops, I missed one of the prefabs adding in whitespace.
3 年前
Jacob Stove Lorentzen
710a57f6
Tweaked shiny button.
3 年前
5819d891
just kidding there were two of 'em!
3 年前
fca424e7
Merging in the "bugs, various" branch
3 年前
56b3f054
Shoot I forgot to merge in the bugs_various but I was gonna set up smart merge first
3 年前
Jacob Stove Lorentzen
cb671a01
Addressed CR feedback and implemented new Assets.
3 年前
Jacob Stove Lorentzen
e50e7220
Merged from Staging
3 年前
Jacob Stove Lorentzen
559e15e9
Up-rezzed the back icon, adjusted icon to background ratio
3 年前
a1a07b92
Pulling the countdown logic out of the GameManager and the LocalLobby; the latter fixes a bug where the countdown would prevent any lobby changes from being pushed from the host, since every from the LocalLobby's OnChanged event would fire.
3 年前
Jacob Stove Lorentzen
4c0d3e65
Colorblindness pass for lobbies.
MipMap settings for Borders.
3 年前
Jacob Stove Lorentzen
0669b238
New Emote Icons.
3 年前
Jacob Stove Lorentzen
99574f3b
Icon Changes and slightly more opaque interaction panel.
3 年前
Jacob Stove Lorentzen
aea6cc91
Circumventing broken Canvas prefab in changelist.
3 年前
Jacob Stove Lorentzen
2f229676
Replaced broken prefab
3 年前
Jacob Stove Lorentzen
3ca1aac2
Removed Outlines of Icons.
Brightened the White color of "No Filter" in RecolorForLobbyType
Darkened the Relay colors.
3 年前
Jacob Stove Lorentzen
4ad4cfa9
Merging in new Art!
3 年前
Jacob Stove Lorentzen
05e13f2f
New UI Art Merge!
3 年前
6b94015c
Merge pull request #16 from Unity-Technologies/master
Master UI Merge to Main.
New UI Assets!
3 年前
ba20852d
Merging from main/staging
3 年前
Jacob Stove Lorentzen
45ad44d6
Disallowing Empty Name Changes
Clearing Join Code Field on return to correctly reflect the code state.
3 年前
7d08ddb1
Merge from the host_handshake branch
3 年前
Jacob Stove Lorentzen
0bccd972
3 年前
Jacob Stove Lorentzen
94ea6209
Merging staging and UI Bugs
3 年前
6b1bc7b6
Join menu lost the reference to the join code input field.
3 年前
Jacob Stove Lorentzen
70ddfc82
3 年前
16ed3868
Merge pull request #18 from Unity-Technologies/master
Master
3 年前
Jacob Stove Lorentzen
073fb83a
hooked up Join button UI Tinter
3 年前
Jacob Stove Lorentzen
0ff5396c
Fixed Rename Popup Icon
3 年前
deb8c877
Minor cleanup, folder rename.
3 年前
Jacob Stove Lorentzen
57b494b0
Renamed PlayerInteractionPanel to UserInteraction Panel.
Player should refer to in-game entities, and user should refer to in-lobby and other service entities.
3 年前
Jacob Stove Lorentzen
8a497896
added userinteractionPanel back in
3 年前
Jacob Stove Lorentzen
413eb4b3
Join Menu tabs retain their color on change.
3 年前
684cd853
Merge from NGO cleanup branch
3 年前
Jacob Stove Lorentzen
123f372a
Code reviewed bugs
3 年前
8816a3db
Merge from staging. This breaks behavior for this fix, will investigate.
3 年前
c0e1472f
Merge from staging.
3 年前
Jacob Stove Lorentzen
c75c5377
Merging in the Glyph Game and additional bug fixes.
3 年前
bb8832a3
Merge pull request #21 from Unity-Technologies/master
Master
3 年前
Jacob Stove Lorentzen
e876c95b
NGO Error spam Fix.
-Reduced the amount of NetworkMonobehaviours on the glyphs
-Increased the Queue Limit on the Transport.
3 年前
Jacob Stove Lorentzen
28ad491f
First working Wire implementation
3 年前
Jacob Stove Lorentzen
df45474f
Merging in the NGO fix
3 年前
3b6a28a2
Merge pull request #24 from Unity-Technologies/master-staging
Quality of Life & Bug Fixes.
3 年前
Jacob Stove Lorentzen
04cf2cf7
Stopping point. for converting Lobby to non-observer.
2 年前
Jacob Stove Lorentzen
7e47c4ab
Stopping POint
2 年前
Jacob Stove Lorentzen
de17cb80
Renamed AuthenticationManager to Auth to avoid conflct with a System API
Reframed the LobbyManager to maintain the life cycle of the remote Lobby.
-Is now responsible for maintaining the reference to the latest cache of the remote Lobby,
-Will automatically set up the heartbeat for host,
-Also Works to prevent RateLimit Errors by creating cooldowns for each Lobby API Call
-Adjusted Roundtrip tests accordingly.
Moved Data synchronizastion to LobbySynchronizer
-Checks for local and remote changes and pushes/pulls player and lobby data accordingly.
2 年前
Jacob Stove Lorentzen
2ca155b9
merged in Async teardown
2 年前
Jacob Stove Lorentzen
f73d89e6
WIP: Torn out LobbyUserObserver and LocalobbyObserver.
At least getting local Lobby Changes.
2 年前
05bb81d4
feat: Fixed some broken UI Prefabs
2 年前
e462c1d1
feat : Working Callbacks!!!!
-still need to remove commented out code
2 年前
d9767fc6
fix : color, entry and double calls.
-Updated the Rate limiting code to use similar design to the service one
-Fixed colors not appearing for filters (filtering still does not work)
-Fixed Emotes sticking after leaving and joining lobbies
-Fixed double-calls using the Toggles.
-Fixed Lobby Player Entry Init
2 年前
a91d6f8a
cleanup : removed redundant infrastructure
2 年前
6a10872c
Merge pull request #33 from Unity-Technologies/master-staging
Master staging
2 年前
92bb0e81
fix : vivox package upgrade
2 年前
UnityJacob
GitHub
nathaniel.buck@unity3d.com
Esteban Maldonado
Jacob