Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Commit

Permalink
Merge branch 'UE5.2' into master
Browse files Browse the repository at this point in the history
Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com>
  • Loading branch information
lukehb committed Feb 20, 2023
2 parents 673a260 + 864c0f4 commit a366404
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish the Signalling Server container image from our dev branch

on:
push:
branches: ['master']
branches: ['UE5.2']
paths: ['SignallingWebServer/**']

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-gh-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Releases

on:
push:
branches: ['master']
branches: ['UE5.2']
paths: ['RELEASE_VERSION']

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-library-to-npm.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Publish library package to npmjs
on:
push:
branches: ['master']
branches: ['UE5.2']
paths: ['Frontend/library/package.json']
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion Frontend/implementations/EpicGames/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@epicgames-ps/reference-pixelstreamingfrontend",
"name": "@epicgames-ps/reference-pixelstreamingfrontend-ue5.2",
"version": "0.0.1",
"description": "",
"main": "./src/player.ts",
Expand Down
2 changes: 1 addition & 1 deletion Frontend/implementations/EpicGames/src/player.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Epic Games, Inc. All Rights Reserved.

import * as libfrontend from '@epicgames-ps/lib-pixelstreamingfrontend-dev';
import * as libfrontend from '@epicgames-ps/lib-pixelstreamingfrontend-ue5.2';


document.body.onload = function() {
Expand Down
2 changes: 1 addition & 1 deletion Frontend/implementations/EpicGames/src/stresstest.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Epic Games, Inc. All Rights Reserved.

import * as libfrontend from '@epicgames-ps/lib-pixelstreamingfrontend-dev';
import * as libfrontend from '@epicgames-ps/lib-pixelstreamingfrontend-ue5.2';

// This is the entrypoint to the stress test, all setup happens here
export class StressTester {
Expand Down
2 changes: 1 addition & 1 deletion Frontend/implementations/EpicGames/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ module.exports = {
directory: path.join(__dirname, '../../../SignallingWebServer/Public'),
},
},
}
}
8 changes: 4 additions & 4 deletions Frontend/library/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Frontend/library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epicgames-ps/lib-pixelstreamingfrontend-dev",
"version": "0.1.1",
"name": "@epicgames-ps/lib-pixelstreamingfrontend-ue5.2",
"version": "0.0.2",
"description": "Frontend library for Pixel Streaming",
"main": "dist/lib-pixelstreamingfrontend.js",
"types": "types/pixelstreamingfrontend.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion Frontend/library/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ module.exports = {
clean: true,
globalObject: 'this'
}
};
};
2 changes: 1 addition & 1 deletion RELEASE_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.2
0.1.1

0 comments on commit a366404

Please sign in to comment.