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

[UE5.5] Merge pull request #420 from mcottontensor/build-cleanup #433

Merged
merged 26 commits into from
Feb 9, 2025

Conversation

mcottontensor
Copy link
Collaborator

Backport

This will backport the following commits from master to UE5.5:

Questions ?

Please refer to the Backport tool documentation

mcottontensor and others added 26 commits February 10, 2025 09:50
(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 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 3945532)
(cherry picked from commit 0464bf4)
(cherry picked from commit dc2f6b0)
@mcottontensor mcottontensor merged commit 91a087e into EpicGamesExt:UE5.5 Feb 9, 2025
9 checks passed
@mcottontensor mcottontensor deleted the backport/UE5.5/pr-420 branch February 9, 2025 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant