Skip to content

Commit adef534

Browse files
committed
Merge branch 'master' into 'release'
Release 2.2.6 See merge request voltstro-studios/uwb/unitywebbrowser!17
2 parents a42098f + 3b1d3bf commit adef534

File tree

46 files changed

+2213
-984
lines changed

Some content is hidden

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

46 files changed

+2213
-984
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
#This job builds the main non-platform depent packages
1111
build-core:
1212
name: "Build-UWB-Main"
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
# Checkout Repo
1616
- uses: actions/checkout@v4

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+
8+
## [2.2.6] - 2025-02-23
9+
10+
### Added
11+
12+
- Added no sandbox flag (#369)
13+
- Added headless mode (#370)
14+
15+
### Changed
16+
17+
- Update CEF to 133.4.2
18+
- Bump copyright year
19+
20+
### Fixed
21+
22+
- Fixed Unity 6 showing engine packages as "pre-release" (#387)
23+
- Engine packages are now version as `x.x.x+<cef-major><cef-minor><cef-patch>`, instead of `x.x.x-<cef-major>.<cef-minor>.<cef-patch>`
24+
- Fixed non-json logs causing errors by adding `ignoreLogProcessJsonErrors` option (#395)
25+
726
## [2.2.5] - 2024-11-13
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-2024 Voltstro-Studios
3+
Copyright (c) 2021-2025 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/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
href: user/javascript.md
2424
- name: Client Events
2525
href: user/events.md
26+
- name: Runtime Creation
27+
href: user/runtime.md
2628
- name: Player Build
2729
href: user/player-build.md
2830

docs/articles/user/runtime.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Runtime Creation
2+
3+
The <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient> can be created manually at runtime without the usage of <xref:VoltstroStudios.UnityWebBrowser.WebBrowserUIBasic> or <xref:VoltstroStudios.UnityWebBrowser.WebBrowserUIFull>.
4+
5+
When instantiating the class, you will need to set all required properties yourself.
6+
7+
> [!NOTE]
8+
> <xref:VoltstroStudios.UnityWebBrowser.Communication.CommunicationLayer> and <xref:VoltstroStudios.UnityWebBrowser.Core.Engines.Engine> objects are Unity's [ScriptableObject](https://docs.unity3d.com/2021.3/Documentation/Manual/class-ScriptableObject.html). The associated properties on <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient> must be set to a ScriptableObject instance, or created at runtime through the [`ScriptableObject.CreateInstance()`](https://docs.unity3d.com/2021.3/Documentation/ScriptReference/ScriptableObject.CreateInstance.html) method.
9+
10+
There is a sample script that creates everything including the canvas, the <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient.engine>, the <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient.communicationLayer> and the <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient> instance it self. You can import the script straight into your Unity project via the sample sections of the UWB package, or you can [view the script in GitHub](https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/src/Packages/UnityWebBrowser/Samples~/Runtime/Scripts/UWBRuntime.cs).
11+
12+
## Headless Mode
13+
14+
<xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient> constructor includes a `headless` parameter. When set to `true`, UWB will run in headless mode.
15+
16+
Headless mode will not create a <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient.BrowserTexture>, and it will not run UWB's internal pixel data thread. All other methods that the <xref:VoltstroStudios.UnityWebBrowser.Core.WebBrowserClient> has are available.

renovate.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"assignees": ["voltstro"],
4+
"ignorePaths": [
5+
"src/Packages/**"
6+
]
7+
}

src/DevScripts/sync_info.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
2222

2323
new_package_version = version
2424
if sub_version:
25-
new_package_version += '-{0}'.format(sub_version)
25+
new_package_version += '+{0}'.format(sub_version)
2626

2727
# Set new package version
2828
package_json['version'] = new_package_version
@@ -58,11 +58,11 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
5858
# Sync CEF Engine version.json
5959
cef_engine_version_json_path = path.abspath(path.join(__file__, '../../UnityWebBrowser.Engine.Cef/version.json'))
6060
cef_engine_version_json = read_json_from_file(cef_engine_version_json_path)
61-
cef_engine_versions = cef_engine_version_json['version'].split('-')
61+
cef_engine_versions = cef_engine_version_json['version'].split('+')
6262

6363
cef_engine_versions[0] = version
6464

65-
cef_engine_version = '-'.join(cef_engine_versions)
65+
cef_engine_version = '+'.join(cef_engine_versions)
6666
cef_engine_version_json['version'] = cef_engine_version
6767
write_json_to_file(cef_engine_version_json, cef_engine_version_json_path)
6868

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.6.146</Version>
6+
<Version>3.7.115</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-2024 Voltstro-Studios</Copyright>
5+
<Copyright>Copyright (c) 2021-2025 Voltstro-Studios</Copyright>
66
<Configurations>Debug;Release;ReleaseUnity</Configurations>
77
<Platforms>AnyCPU</Platforms>
88
<LangVersion>10</LangVersion>

0 commit comments

Comments
 (0)