Skip to content

Commit 433bcfe

Browse files
VoltstroVoltstro
committed
Merge branch 'master' into 'release'
Release 2.2.2 See merge request voltstro-studios/uwb/unitywebbrowser!5
2 parents c81279a + 7379df0 commit 433bcfe

25 files changed

Lines changed: 194 additions & 79 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@ 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.2] - 2024-10-16
8+
9+
### Added
10+
11+
- Added ignore SSL errors option (#350)
12+
13+
### Changed
14+
15+
- Move some web browser client options to a new section called "Advanced"
16+
17+
### Fixed
18+
19+
- Fixed `LoadHtml` not working correctly (#351)
20+
21+
### Removed
22+
23+
- Removed CEF engine custom error page. It shows the default chrome one now.
24+
725
## [2.2.1] - 2024-10-06
826

927
### Added

‎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.0",
5+
"version": "2.2.2",
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.0",
21+
"dev.voltstro.unitywebbrowser": "2.2.2",
2222
"org.nuget.voltrpc.communication.pipes": "3.1.0"
2323
}
2424
}

‎src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/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.engine.cef.linux.x64",
33
"displayName": "Unity Web Browser CEF Engine (Linux x64)",
44
"description": "CEF engine for Unity Web Browser (Linux x64).",
5-
"version": "2.2.1-129.0.11",
5+
"version": "2.2.2-129.0.11",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",
@@ -17,6 +17,6 @@
1717
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1818
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
1919
"dependencies": {
20-
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.1-129.0.11"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/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.engine.cef.macos.arm64",
33
"displayName": "Unity Web Browser CEF Engine (MacOS arm64)",
44
"description": "CEF engine for Unity Web Browser (MacOS arm64).",
5-
"version": "2.2.1-129.0.11",
5+
"version": "2.2.2-129.0.11",
66
"unity": "2021.2",
77
"author": {
88
"name": "Voltstro",
@@ -17,6 +17,6 @@
1717
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1818
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
1919
"dependencies": {
20-
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.1-129.0.11"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/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.engine.cef.macos.x64",
33
"displayName": "Unity Web Browser CEF Engine (MacOS x64)",
44
"description": "CEF engine for Unity Web Browser (MacOS x64).",
5-
"version": "2.2.1-129.0.11",
5+
"version": "2.2.2-129.0.11",
66
"unity": "2021.2",
77
"author": {
88
"name": "Voltstro",
@@ -17,6 +17,6 @@
1717
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1818
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
1919
"dependencies": {
20-
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.1-129.0.11"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/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.engine.cef.win.x64",
33
"displayName": "Unity Web Browser CEF Engine (Win x64)",
44
"description": "CEF engine for Unity Web Browser (Win x64).",
5-
"version": "2.2.1-129.0.11",
5+
"version": "2.2.2-129.0.11",
66
"unity": "2021.2",
77
"author": {
88
"name": "Voltstro",
@@ -17,6 +17,6 @@
1717
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1818
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
1919
"dependencies": {
20-
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.1-129.0.11"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.2-129.0.11"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef/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.engine.cef",
33
"displayName": "Unity Web Browser CEF Engine",
44
"description": "CEF engine for Unity Web Browser.",
5-
"version": "2.2.1-129.0.11",
5+
"version": "2.2.2-129.0.11",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",
@@ -18,6 +18,6 @@
1818
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1919
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
2020
"dependencies": {
21-
"dev.voltstro.unitywebbrowser": "2.2.1"
21+
"dev.voltstro.unitywebbrowser": "2.2.2"
2222
}
2323
}

‎src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
// You can specify all the values or you can default the Build and Revision Numbers
3535
// by using the '*' as shown below:
3636
// [assembly: AssemblyVersion("1.0.*")]
37-
[assembly: AssemblyVersion("2.2.1")]
38-
[assembly: AssemblyFileVersion("2.2.1")]
37+
[assembly: AssemblyVersion("2.2.2")]
38+
[assembly: AssemblyFileVersion("2.2.2")]
3939

4040
[assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
4141
[assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]

‎src/Packages/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,6 @@ public Resolution Resolution
114114
[Tooltip("Enable or disable incognito/private mode. When true, no profile-specific data is persisted to disk, but cache is still used to persist installation-specific data.")]
115115
public bool incognitoMode;
116116

117-
/// <summary>
118-
/// Enable or disable WebRTC
119-
/// </summary>
120-
[Tooltip("Enable or disable WebRTC")] public bool webRtc;
121-
122117
/// <summary>
123118
/// Enable or disable local storage
124119
/// </summary>
@@ -134,6 +129,12 @@ public Resolution Resolution
134129
/// Proxy Settings
135130
/// </summary>
136131
[Tooltip("Proxy settings")] public ProxySettings proxySettings;
132+
133+
/// <summary>
134+
/// Enable or disable WebRTC
135+
/// </summary>
136+
[Header("Advanced")]
137+
[Tooltip("Enable or disable WebRTC")] public bool webRtc;
137138

138139
/// <summary>
139140
/// Enable or disable remote debugging
@@ -159,6 +160,18 @@ public Resolution Resolution
159160
[Tooltip("Manager for JS methods")]
160161
public JsMethodManager jsMethodManager = new();
161162

163+
/// <summary>
164+
/// Will ignore SSL errors on provided domains in <see cref="ignoreSslErrorsDomains"/>
165+
/// </summary>
166+
[Tooltip("Will ignore SSL errors on provided domains in ignoreSSLErrorsDomains")]
167+
public bool ignoreSslErrors = false;
168+
169+
/// <summary>
170+
/// Domains to ignore SSL errors on if <see cref="ignoreSslErrors"/> is enabled
171+
/// </summary>
172+
[Tooltip("Domains to ignore SSL errors on if ignoreSSLErrors is enabled")]
173+
public string[] ignoreSslErrorsDomains;
174+
162175
/// <summary>
163176
/// The <see cref="CommunicationLayer" /> to use
164177
/// </summary>
@@ -385,6 +398,13 @@ internal void Init()
385398
if (!string.IsNullOrWhiteSpace(proxySettings.Password))
386399
argsBuilder.AppendArgument("proxy-password", proxySettings.Password, true);
387400
}
401+
402+
//Ignore ssl errors
403+
if (ignoreSslErrors)
404+
{
405+
argsBuilder.AppendArgument("ignore-ssl-errors", true);
406+
argsBuilder.AppendArgument("ignore-ssl-errors-domains", string.Join(",", ignoreSslErrorsDomains));
407+
}
388408

389409
//Make sure not to include this, its for testing
390410
#if UWB_ENGINE_PRJ //Define for backup, cause I am dumb as fuck and gonna accidentally include this in a release build one day

‎src/Packages/UnityWebBrowser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dev.voltstro.unitywebbrowser",
33
"displayName": "Unity Web Browser",
44
"description": "Unity Web Browser (UWB) is a Unity package that allows displaying and interacting with the web from within Unity.",
5-
"version": "2.2.1",
5+
"version": "2.2.2",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",

0 commit comments

Comments
 (0)