Merging 5.5 back into master #445
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 77ee7fa)
(cherry picked from commit e20ced9) # Conflicts: # Signalling/package.json
(cherry picked from commit 333dd7e)
(cherry picked from commit 4922c5e)
(cherry picked from commit 589745c) # Conflicts: # SignallingWebServer/package.json
(cherry picked from commit 23d91b5) # Conflicts: # Frontend/library/package.json
(cherry picked from commit 9239db4) # Conflicts: # Frontend/ui-library/package.json
(cherry picked from commit 48c8fbc)
(cherry picked from commit 1dbe046)
(cherry picked from commit f659f21)
(cherry picked from commit 9be1ab2) # Conflicts: # Extras/JSStreamer/package.json
…he libraries. run in the SignallingWebServer folder (cherry picked from commit 800b5c1) # Conflicts: # package-lock.json # package.json
(cherry picked from commit 737554b)
(cherry picked from commit dc251fb)
(cherry picked from commit 1c9cc73)
(cherry picked from commit 74fb8ad)
(cherry picked from commit 2aee710) # Conflicts: # Frontend/ui-library/.eslintrc.js
(cherry picked from commit 04a238c)
…ojects. fixing signalling server watch using the incorrect http_root. (cherry picked from commit ab03627)
(cherry picked from commit 30e26bb)
(cherry picked from commit 03824c5)
(cherry picked from commit ebed041)
…g file (cherry picked from commit 25f7900)
(cherry picked from commit 3945532)
(cherry picked from commit 0464bf4)
(cherry picked from commit dc2f6b0)
[UE5.5] Merge pull request #420 from mcottontensor/build-cleanup
(cherry picked from commit f258c54) # Conflicts: # package-lock.json
[UE5.5] Merge pull request #424 from mcottontensor/undicking_undici
(cherry picked from commit 268a4c4)
…me usage. (cherry picked from commit 92e9265)
(cherry picked from commit a672d2f)
(cherry picked from commit 457a0dc)
(cherry picked from commit d4d5205)
Co-authored-by: Luke Bermingham <[email protected]> (cherry picked from commit ce752b4)
…r limit on npm script. (cherry picked from commit 156cdfc)
[UE5.5] Merge pull request #427 from mcottontensor/player_limits
- Adjusting how Protocol and Transport handle protocol BaseMessages. Transport should just handle strings. Protocol should handle messages. (cherry picked from commit 84b4253)
(cherry picked from commit 60a8f22)
(cherry picked from commit 80aa060)
(cherry picked from commit 709d6fe)
(cherry picked from commit 127c7c6)
(cherry picked from commit f004b84)
[UE5.5] Merge pull request #429 from mcottontensor/esm_fix
…local library config.
…sticking with 8.5.13 for now.
(cherry picked from commit 92b82ac) # Conflicts: # package-lock.json
[UE5.5] Merge pull request #441 from mcottontensor/develop-win-fix
…ozRequestPointerLock? Does it even need to be used any more?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.