Skip to content

Commit 486610f

Browse files
VoltstroVoltstro
committed
Merge branch 'master' into 'release'
Release 2.2.8 See merge request voltstro-studios/uwb/unitywebbrowser!43
2 parents 960a2a7 + f49743d commit 486610f

File tree

48 files changed

+865
-834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+865
-834
lines changed

‎.github/workflows/main.yml‎

Lines changed: 129 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
11
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
- release
4+
push:
5+
branches:
6+
- master
7+
- release
88

99
jobs:
10-
#This job builds the main non-platform depent packages
11-
build-core:
12-
name: "Build-UWB-Main"
13-
runs-on: ubuntu-24.04
14-
steps:
15-
# Checkout Repo
16-
- uses: actions/checkout@v4
17-
with:
18-
fetch-depth: 0
19-
20-
#Setup the Environment
21-
- uses: actions/setup-dotnet@v4
22-
name: Setup .NET
23-
with:
24-
dotnet-version: "8.0.x"
25-
26-
# Build shared
27-
- name: Build Shared
28-
run: python build_shared.py
29-
working-directory: src/DevScripts/
30-
31-
# Restore Unity's cache
32-
- name: Unity Cache
33-
uses: actions/cache@v4
34-
with:
35-
path: src/UnityWebBrowser.UnityProject/Library
36-
key: Cache-Unity
37-
38-
# Build the Unity project
39-
- name: Build Unity Project
40-
uses: game-ci/unity-builder@v4
41-
env:
42-
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
43-
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
44-
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
45-
with:
46-
projectPath: src/UnityWebBrowser.UnityProject/
47-
targetPlatform: StandaloneLinux64
48-
buildsPath: src/UnityWebBrowser.UnityProject/Builds
49-
versioning: Tag
50-
51-
# Create an output directory for artifacts
52-
- name: Create Artifacts Staging Directory
53-
shell: pwsh
54-
run: mkdir ${{ github.workspace }}/UWBStaging/
55-
56-
# Pack UWB Core
57-
- name: Pack Core Package
58-
shell: pwsh
59-
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
60-
working-directory: src/Packages/UnityWebBrowser
61-
62-
# Pack UWB Pipes Communication
63-
- name: Pack Pipes Communication Package
64-
shell: pwsh
65-
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
66-
working-directory: src/Packages/UnityWebBrowser.Communication.Pipes
67-
68-
# Upload Packed Packages
69-
- name: Upload Artifacts
70-
uses: actions/upload-artifact@v4
71-
with:
72-
name: UWB-Core
73-
path: ${{ github.workspace }}/UWBStaging/*.tgz
74-
75-
build-engine-cef:
76-
strategy:
77-
matrix:
78-
os: [windows-2022, ubuntu-22.04]
79-
include:
80-
- os: windows-2022
81-
build: windows64
82-
package: Win-x64
83-
- os: ubuntu-22.04
84-
build: linux64
85-
package: Linux-x64
86-
- os: macos-14
87-
build: macosx64
88-
package: MacOS-x64
89-
- os: macos-14
90-
build: macosarm64
91-
package: MacOS-arm64
92-
93-
runs-on: ${{ matrix.os }}
94-
name: Build-UWB-Engine-CEF-${{ matrix.package }}
95-
steps:
96-
# Checkout Repo
97-
- uses: actions/checkout@v4
98-
with:
99-
submodules: true
100-
fetch-depth: 0
101-
102-
# Setup the Environment
103-
- uses: actions/setup-dotnet@v4
104-
name: Setup .NET
105-
with:
106-
dotnet-version: "8.0.x"
107-
108-
# Download CEF
109-
- name: Download CEF ${{ matrix.build }}
110-
run: python download_cef_${{ matrix.build }}.py
111-
working-directory: src/DevScripts/
112-
113-
# Build CEF Engine
114-
- name: Build CEF Engine ${{ matrix.build }}
115-
run: python build_cef_${{ matrix.build }}.py
116-
working-directory: src/DevScripts/
117-
118-
# Create an output directory for artifacts
119-
- name: Create Artifacts Staging Directory
120-
shell: pwsh
121-
run: mkdir ${{ github.workspace }}/UWBStaging/
122-
123-
# Pack UWB Core
124-
- name: Pack CEF Engine ${{ matrix.package }} Package
125-
shell: pwsh
126-
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
127-
working-directory: src/Packages/UnityWebBrowser.Engine.Cef.${{ matrix.package }}
128-
129-
# Upload Packed Packages
130-
- name: Upload Artifacts
131-
uses: actions/upload-artifact@v4
132-
with:
133-
name: UWB-Engine-CEF-${{ matrix.package }}
134-
path: ${{ github.workspace }}/UWBStaging/*.tgz
10+
#This job builds the main non-platform depent packages
11+
build-core:
12+
name: "Build-UWB-Main"
13+
runs-on: ubuntu-24.04
14+
steps:
15+
# Checkout Repo
16+
- uses: actions/checkout@v6
17+
with:
18+
fetch-depth: 0
19+
20+
#Setup the Environment
21+
- uses: actions/setup-dotnet@v5
22+
name: Setup .NET
23+
with:
24+
dotnet-version: "10.x"
25+
26+
# Build shared
27+
- name: Build Shared
28+
run: python build_shared.py
29+
working-directory: src/DevScripts/
30+
31+
# Restore Unity's cache
32+
- name: Unity Cache
33+
uses: actions/cache@v5
34+
with:
35+
path: src/UnityWebBrowser.UnityProject/Library
36+
key: Cache-Unity
37+
38+
# Build the Unity project
39+
- name: Build Unity Project
40+
uses: game-ci/unity-builder@v4
41+
env:
42+
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
43+
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
44+
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
45+
with:
46+
projectPath: src/UnityWebBrowser.UnityProject/
47+
targetPlatform: StandaloneLinux64
48+
buildsPath: src/UnityWebBrowser.UnityProject/Builds
49+
versioning: Tag
50+
51+
# Create an output directory for artifacts
52+
- name: Create Artifacts Staging Directory
53+
shell: pwsh
54+
run: mkdir ${{ github.workspace }}/UWBStaging/
55+
56+
# Pack UWB Core
57+
- name: Pack Core Package
58+
shell: pwsh
59+
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
60+
working-directory: src/Packages/UnityWebBrowser
61+
62+
# Pack UWB Pipes Communication
63+
- name: Pack Pipes Communication Package
64+
shell: pwsh
65+
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
66+
working-directory: src/Packages/UnityWebBrowser.Communication.Pipes
67+
68+
# Upload Packed Packages
69+
- name: Upload Artifacts
70+
uses: actions/upload-artifact@v6
71+
with:
72+
name: UWB-Core
73+
path: ${{ github.workspace }}/UWBStaging/*.tgz
74+
75+
build-engine-cef:
76+
strategy:
77+
matrix:
78+
os: [windows-2022, ubuntu-22.04]
79+
include:
80+
- os: windows-2022
81+
build: windows64
82+
package: Win-x64
83+
- os: ubuntu-22.04
84+
build: linux64
85+
package: Linux-x64
86+
- os: macos-14
87+
build: macosx64
88+
package: MacOS-x64
89+
- os: macos-14
90+
build: macosarm64
91+
package: MacOS-arm64
92+
93+
runs-on: ${{ matrix.os }}
94+
name: Build-UWB-Engine-CEF-${{ matrix.package }}
95+
steps:
96+
# Checkout Repo
97+
- uses: actions/checkout@v6
98+
with:
99+
submodules: true
100+
fetch-depth: 0
101+
102+
# Setup the Environment
103+
- uses: actions/setup-dotnet@v5
104+
name: Setup .NET
105+
with:
106+
dotnet-version: "10.x"
107+
108+
# Download CEF
109+
- name: Download CEF ${{ matrix.build }}
110+
run: python download_cef_${{ matrix.build }}.py
111+
working-directory: src/DevScripts/
112+
113+
# Build CEF Engine
114+
- name: Build CEF Engine ${{ matrix.build }}
115+
run: python build_cef_${{ matrix.build }}.py
116+
working-directory: src/DevScripts/
117+
118+
# Create an output directory for artifacts
119+
- name: Create Artifacts Staging Directory
120+
shell: pwsh
121+
run: mkdir ${{ github.workspace }}/UWBStaging/
122+
123+
# Pack UWB Core
124+
- name: Pack CEF Engine ${{ matrix.package }} Package
125+
shell: pwsh
126+
run: npm pack --pack-destination ${{ github.workspace }}/UWBStaging/
127+
working-directory: src/Packages/UnityWebBrowser.Engine.Cef.${{ matrix.package }}
128+
129+
# Upload Packed Packages
130+
- name: Upload Artifacts
131+
uses: actions/upload-artifact@v6
132+
with:
133+
name: UWB-Engine-CEF-${{ matrix.package }}
134+
path: ${{ github.workspace }}/UWBStaging/*.tgz

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.2.8] - 2025-01-07
8+
9+
NOTE: Next release is planned to be 3.x breaking change release. The main reason is to drop deprecated code and to up minimal supported Unity version to Unity 6.x.
10+
11+
### Added
12+
13+
- Add configurable WindowlessFrameRate setting (#428)
14+
15+
### Changed
16+
17+
- Update CEF to 143.0.13
18+
- Bump deps
19+
- Use custom FixUpdate loop that uses Time.unscaledDeltaTime (#422)
20+
- Upgrade engine to .NET 10
21+
22+
### Fixed
23+
24+
- Fixed browser not rendering on resize using a workaround for a CEF issue (#425)
25+
726
## [2.2.7] - 2025-07-19
827

928
### Changed

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021-2025 Voltstro-Studios
3+
Copyright (c) 2021-2026 Voltstro-Studios
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎docs/articles/user/player-build.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ By default, the engines files will be placed in a certain directory in your buil
1313
|MacOS x64 |`<Game>.app/Contents/Frameworks/`|
1414
|MacOS arm64|`<Game>.app/Contents/Frameworks/`|
1515

16-
## MacOS
17-
18-
UWB does not provide signed builds of any of its engines. You will need to create the entitlements, sign and notarize the engine app. [Unity has some docs on signing](https://docs.unity3d.com/2021.3/Documentation/Manual/macos-building-notarization.html), a similar process should apply to signing the engine app.
19-
2016
## Disable
2117

2218
To disable UWB's built-in postprocessor, define `UWB_DISABLE_POSTPROCESSOR` in your project's player settings.
2319

2420
![Player Settings](~/assets/images/articles/user/player-build/player-settings.webp)
2521

2622
You may wish to do this if you have customized your engine's pathing, but you will need to copy the engine files from the packages your self
23+
24+
## Code Signing
25+
26+
By default, none of the UWB binaries are code signed. It is generally recommended to code sign your entire build (including UWB) for releases of your project that you plan on publicly sharing. On some platforms, it may be required to code sign for CEF to work, [especially if you have sandbox enabled](https://bitbucket.org/chromiumembedded/cef/wiki/SandboxSetup.md#markdown-header-usage).
27+
28+
For MacOS, you will also need to create the entitlements, then sign and notarize the engine app. [Unity has some docs on signing](https://docs.unity3d.com/2021.3/Documentation/Manual/macos-building-notarization.html), a similar process should apply to signing the engine app.
29+
30+
> [!NOTE]
31+
> If anyone has any more info on this topic, and is willing to provide that info, then please open either a discussion with your info, or directly contribute a PR to the docs.
32+

‎src/DevTools/rcedit/LICENSE‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2013 GitHub Inc.
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎src/DevTools/rcedit/rcedit.exe‎

1.3 MB
Binary file not shown.

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
55
<PrivateAssets>all</PrivateAssets>
6-
<Version>3.7.115</Version>
6+
<Version>3.9.50</Version>
77
</PackageReference>
88
</ItemGroup>
99
</Project>

‎src/Imports/Properties.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Authors>Voltstro-Studios</Authors>
44
<Company>Voltstro-Studios</Company>
5-
<Copyright>Copyright (c) 2021-2025 Voltstro-Studios</Copyright>
5+
<Copyright>Copyright (c) 2021-2026 Voltstro-Studios</Copyright>
66
<Configurations>Debug;Release;ReleaseUnity</Configurations>
77
<Platforms>AnyCPU</Platforms>
88
<LangVersion>10</LangVersion>

‎src/Packages/UnityWebBrowser.Communication.Pipes/LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021-2025 Voltstro-Studios
3+
Copyright (c) 2021-2026 Voltstro-Studios
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎src/Packages/UnityWebBrowser.Communication.Pipes/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dev.voltstro.unitywebbrowser.communication.pipes",
33
"displayName": "Unity Web Browser Pipes Communication",
44
"description": "Adds support to use pipes in UWB.",
5-
"version": "2.2.7",
5+
"version": "2.2.8",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",
@@ -18,7 +18,7 @@
1818
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/",
1919
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
2020
"dependencies": {
21-
"dev.voltstro.unitywebbrowser": "2.2.7",
21+
"dev.voltstro.unitywebbrowser": "2.2.8",
2222
"org.nuget.voltrpc.communication.pipes": "3.1.0"
2323
}
2424
}

0 commit comments

Comments
 (0)