feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
36
engine/misc/dist/html/editor.html
vendored
36
engine/misc/dist/html/editor.html
vendored
|
|
@ -363,24 +363,28 @@ window.addEventListener('load', () => {
|
|||
btn.style.display = '';
|
||||
}
|
||||
if ('serviceWorker' in navigator) {
|
||||
navigator.serviceWorker.register('service.worker.js').then(function (reg) {
|
||||
if (reg.waiting) {
|
||||
notifyUpdate(reg.waiting);
|
||||
}
|
||||
reg.addEventListener('updatefound', function () {
|
||||
const update = reg.installing;
|
||||
update.addEventListener('statechange', function () {
|
||||
if (update.state === 'installed') {
|
||||
// It's a new install, claim and perform aggressive caching.
|
||||
if (!reg.active) {
|
||||
update.postMessage('claim');
|
||||
} else {
|
||||
notifyUpdate(update);
|
||||
try {
|
||||
navigator.serviceWorker.register('service.worker.js').then(function (reg) {
|
||||
if (reg.waiting) {
|
||||
notifyUpdate(reg.waiting);
|
||||
}
|
||||
reg.addEventListener('updatefound', function () {
|
||||
const update = reg.installing;
|
||||
update.addEventListener('statechange', function () {
|
||||
if (update.state === 'installed') {
|
||||
// It's a new install, claim and perform aggressive caching.
|
||||
if (!reg.active) {
|
||||
update.postMessage('claim');
|
||||
} else {
|
||||
notifyUpdate(update);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('Error while registering service worker:', e);
|
||||
}
|
||||
}
|
||||
|
||||
const missing = Engine.getMissingFeatures({
|
||||
|
|
@ -706,7 +710,7 @@ function startEditor(zip) {
|
|||
} else if (typeof err === 'string') {
|
||||
setStatusNotice(err);
|
||||
} else {
|
||||
setStatusNotice('An unknown error occured');
|
||||
setStatusNotice('An unknown error occurred.');
|
||||
}
|
||||
setStatusMode('notice');
|
||||
initializing = false;
|
||||
|
|
|
|||
35
engine/misc/dist/html/full-size.html
vendored
35
engine/misc/dist/html/full-size.html
vendored
|
|
@ -38,7 +38,7 @@ body {
|
|||
}
|
||||
|
||||
#status {
|
||||
background-color: #242424;
|
||||
background-color: $GODOT_SPLASH_COLOR;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
|
@ -52,6 +52,20 @@ body {
|
|||
margin: auto;
|
||||
}
|
||||
|
||||
#status-splash.show-image--false {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#status-splash.fullsize--true {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
#status-splash.use-filter--false {
|
||||
image-rendering: pixelated;
|
||||
}
|
||||
|
||||
#status-progress, #status-notice {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -88,7 +102,7 @@ body {
|
|||
</noscript>
|
||||
|
||||
<div id="status">
|
||||
<img id="status-splash" src="$GODOT_SPLASH" alt="">
|
||||
<img id="status-splash" class="$GODOT_SPLASH_CLASSES" src="$GODOT_SPLASH" alt="">
|
||||
<progress id="status-progress"></progress>
|
||||
<div id="status-notice"></div>
|
||||
</div>
|
||||
|
|
@ -140,7 +154,7 @@ const engine = new Engine(GODOT_CONFIG);
|
|||
} else if (typeof err === 'string') {
|
||||
setStatusNotice(err);
|
||||
} else {
|
||||
setStatusNotice('An unknown error occured');
|
||||
setStatusNotice('An unknown error occurred.');
|
||||
}
|
||||
setStatusMode('notice');
|
||||
initializing = false;
|
||||
|
|
@ -152,9 +166,15 @@ const engine = new Engine(GODOT_CONFIG);
|
|||
|
||||
if (missing.length !== 0) {
|
||||
if (GODOT_CONFIG['serviceWorker'] && GODOT_CONFIG['ensureCrossOriginIsolationHeaders'] && 'serviceWorker' in navigator) {
|
||||
let serviceWorkerRegistrationPromise;
|
||||
try {
|
||||
serviceWorkerRegistrationPromise = navigator.serviceWorker.getRegistration();
|
||||
} catch (err) {
|
||||
serviceWorkerRegistrationPromise = Promise.reject(new Error('Service worker registration failed.'));
|
||||
}
|
||||
// There's a chance that installing the service worker would fix the issue
|
||||
Promise.race([
|
||||
navigator.serviceWorker.getRegistration().then((registration) => {
|
||||
serviceWorkerRegistrationPromise.then((registration) => {
|
||||
if (registration != null) {
|
||||
return Promise.reject(new Error('Service worker already exists.'));
|
||||
}
|
||||
|
|
@ -164,10 +184,11 @@ const engine = new Engine(GODOT_CONFIG);
|
|||
new Promise((resolve) => {
|
||||
setTimeout(() => resolve(), 2000);
|
||||
}),
|
||||
]).catch((err) => {
|
||||
console.error('Error while registering service worker:', err);
|
||||
}).then(() => {
|
||||
]).then(() => {
|
||||
// Reload if there was no error.
|
||||
window.location.reload();
|
||||
}).catch((err) => {
|
||||
console.error('Error while registering service worker:', err);
|
||||
});
|
||||
} else {
|
||||
// Display the message as usual
|
||||
|
|
|
|||
12
engine/misc/dist/html/service-worker.js
vendored
12
engine/misc/dist/html/service-worker.js
vendored
|
|
@ -17,8 +17,8 @@ const ENSURE_CROSSORIGIN_ISOLATION_HEADERS = ___GODOT_ENSURE_CROSSORIGIN_ISOLATI
|
|||
const CACHED_FILES = ___GODOT_CACHE___;
|
||||
// Files that we might not want the user to preload, and will only be cached on first load.
|
||||
/** @type {string[]} */
|
||||
const CACHABLE_FILES = ___GODOT_OPT_CACHE___;
|
||||
const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
|
||||
const CACHEABLE_FILES = ___GODOT_OPT_CACHE___;
|
||||
const FULL_CACHE = CACHED_FILES.concat(CACHEABLE_FILES);
|
||||
|
||||
self.addEventListener('install', (event) => {
|
||||
event.waitUntil(caches.open(CACHE_NAME).then((cache) => cache.addAll(CACHED_FILES)));
|
||||
|
|
@ -99,8 +99,8 @@ self.addEventListener(
|
|||
const referrer = event.request.referrer || '';
|
||||
const base = referrer.slice(0, referrer.lastIndexOf('/') + 1);
|
||||
const local = url.startsWith(base) ? url.replace(base, '') : '';
|
||||
const isCachable = FULL_CACHE.some((v) => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
|
||||
if (isNavigate || isCachable) {
|
||||
const isCacheable = FULL_CACHE.some((v) => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
|
||||
if (isNavigate || isCacheable) {
|
||||
event.respondWith((async () => {
|
||||
// Try to use cache first
|
||||
const cache = await caches.open(CACHE_NAME);
|
||||
|
|
@ -112,7 +112,7 @@ self.addEventListener(
|
|||
if (missing) {
|
||||
try {
|
||||
// Try network if some cached file is missing (so we can display offline page in case).
|
||||
const response = await fetchAndCache(event, cache, isCachable);
|
||||
const response = await fetchAndCache(event, cache, isCacheable);
|
||||
return response;
|
||||
} catch (e) {
|
||||
// And return the hopefully always cached offline page in case of network failure.
|
||||
|
|
@ -129,7 +129,7 @@ self.addEventListener(
|
|||
return cached;
|
||||
}
|
||||
// Try network if don't have it in cache.
|
||||
const response = await fetchAndCache(event, cache, isCachable);
|
||||
const response = await fetchAndCache(event, cache, isCacheable);
|
||||
return response;
|
||||
})());
|
||||
} else if (ENSURE_CROSSORIGIN_ISOLATION_HEADERS) {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
054F8BE62D38852F00B81423 /* MetalFX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 054F8BE52D38852F00B81423 /* MetalFX.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
1F1575721F582BE20003B888 /* dylibs in Resources */ = {isa = PBXBuildFile; fileRef = 1F1575711F582BE20003B888 /* dylibs */; };
|
||||
DEADBEEF2F582BE20003B888 /* $binary.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEADBEEF1F582BE20003B888 /* $binary.xcframework */; };
|
||||
$modules_buildfile
|
||||
|
|
@ -42,6 +43,7 @@
|
|||
1FF4C1881F584E6300A41E41 /* $binary.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "$binary.entitlements"; sourceTree = "<group>"; };
|
||||
1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = dummy.cpp; sourceTree = "<group>"; };
|
||||
9039D3BD24C093AC0020482C /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK; path = MoltenVK.xcframework; sourceTree = "<group>"; };
|
||||
054F8BE52D38852F00B81423 /* MetalFX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalFX.framework; path = System/Library/Frameworks/MetalFX.framework; sourceTree = SDKROOT; };
|
||||
D07CD44D1C5D589C00B7FB28 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
D0BCFE3418AEBDA2004A7AAE /* $binary.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "$binary.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
D0BCFE4318AEBDA2004A7AAE /* $binary-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "$binary-Info.plist"; sourceTree = "<group>"; };
|
||||
|
|
@ -60,6 +62,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
9039D3BE24C093AC0020482C /* MoltenVK.xcframework in Frameworks */,
|
||||
054F8BE62D38852F00B81423 /* MetalFX.framework in Frameworks */,
|
||||
DEADBEEF2F582BE20003B888 /* $binary.xcframework */,
|
||||
$modules_buildphase
|
||||
$additional_pbx_frameworks_build
|
||||
|
|
@ -94,6 +97,7 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
9039D3BD24C093AC0020482C /* MoltenVK.xcframework */,
|
||||
054F8BE52D38852F00B81423 /* MetalFX.framework */,
|
||||
DEADBEEF1F582BE20003B888 /* $binary.xcframework */,
|
||||
$modules_buildgrp
|
||||
$additional_pbx_frameworks_refs
|
||||
|
|
@ -339,6 +343,7 @@
|
|||
MARKETING_VERSION = $short_version;
|
||||
CURRENT_PROJECT_VERSION = $version;
|
||||
PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "$provisioning_profile_specifier_debug";
|
||||
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||
VALID_ARCHS = "arm64 x86_64";
|
||||
WRAPPER_EXTENSION = app;
|
||||
|
|
@ -374,6 +379,7 @@
|
|||
MARKETING_VERSION = $short_version;
|
||||
CURRENT_PROJECT_VERSION = $version;
|
||||
PROVISIONING_PROFILE = "$provisioning_profile_uuid_release";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "$provisioning_profile_specifier_release";
|
||||
TARGETED_DEVICE_FAMILY = "$targeted_device_family";
|
||||
VALID_ARCHS = "arm64 x86_64";
|
||||
WRAPPER_EXTENSION = app;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
$entitlements_push_notifications
|
||||
$entitlements_full
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<project_license>MIT</project_license>
|
||||
<name>Godot Engine</name>
|
||||
<summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary>
|
||||
<launchable type="desktop-id">org.godotengine.Godot.desktop</launchable>
|
||||
<launchable type="desktop-id">org.godotengine.Godot.desktop</launchable>
|
||||
<description>
|
||||
<p>
|
||||
Godot is an advanced, feature-packed, multi-platform 2D and 3D game
|
||||
|
|
|
|||
|
|
@ -4,11 +4,15 @@ GenericName=Libre game engine
|
|||
GenericName[el]=Ελεύθερη μηχανή παιχνιδιού
|
||||
GenericName[fr]=Moteur de jeu libre
|
||||
GenericName[nl]=Libre game-engine
|
||||
GenericName[ru]=Свободный игровой движок
|
||||
GenericName[uk]=Вільний ігровий рушій
|
||||
GenericName[zh_CN]=自由的游戏引擎
|
||||
Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
|
||||
Comment[el]=2D και 3D μηχανή παιχνιδιού πολλαπλών πλατφορμών με επεξεργαστή πλούσιο σε χαρακτηριστικά
|
||||
Comment[fr]=Moteur de jeu 2D et 3D multiplateforme avec un éditeur riche en fonctionnalités
|
||||
Comment[nl]=Multi-platform 2D- en 3d-game-engine met een veelzijdige editor
|
||||
Comment[nl]=Multi-platform 2D- en 3D-game-engine met een veelzijdige editor
|
||||
Comment[ru]=Кроссплатформенный движок с многофункциональным редактором для 2D- и 3D-игр
|
||||
Comment[uk]=Багатофункціональний кросплатформний рушій для створення 2D та 3D ігор
|
||||
Comment[zh_CN]=多平台 2D 和 3D 游戏引擎,带有功能丰富的编辑器
|
||||
Exec=godot %f
|
||||
Icon=godot
|
||||
|
|
|
|||
|
|
@ -49,12 +49,17 @@ $usage_descriptions
|
|||
<string>NSApplication</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.$app_category</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$min_version</string>
|
||||
<key>LSArchitecturePriority</key>
|
||||
<array>
|
||||
<string>arm64</string>
|
||||
<string>x86_64</string>
|
||||
</array>
|
||||
<key>LSMinimumSystemVersionByArchitecture</key>
|
||||
<dict>
|
||||
<key>arm64</key>
|
||||
<string>$min_version_arm64</string>
|
||||
<key>x86_64</key>
|
||||
<string>$min_version</string>
|
||||
<string>$min_version_x86_64</string>
|
||||
</dict>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
$highres
|
||||
|
|
|
|||
|
|
@ -17,17 +17,19 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>4.3</string>
|
||||
<string>4.4</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>godot</string>
|
||||
<string>GODO</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>4.3</string>
|
||||
<string>4.4</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>Microphone access is required to capture audio.</string>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>Camera access is required to capture video.</string>
|
||||
<key>NSRequiresAquaSystemAppearance</key>
|
||||
<false/>
|
||||
<key>NSCameraUseContinuityCameraDeviceType</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2007-present Juan Linietsky, Ariel Manzur & Godot Engine contributors</string>
|
||||
<key>CFBundleSupportedPlatforms</key>
|
||||
|
|
@ -38,10 +40,15 @@
|
|||
<string>NSApplication</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.developer-tools</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.12</string>
|
||||
<key>LSArchitecturePriority</key>
|
||||
<array>
|
||||
<string>arm64</string>
|
||||
<string>x86_64</string>
|
||||
</array>
|
||||
<key>LSMinimumSystemVersionByArchitecture</key>
|
||||
<dict>
|
||||
<key>arm64</key>
|
||||
<string>11.0</string>
|
||||
<key>x86_64</key>
|
||||
<string>10.12</string>
|
||||
</dict>
|
||||
|
|
|
|||
2
engine/misc/dist/windows/godot.iss
vendored
2
engine/misc/dist/windows/godot.iss
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#define MyAppName "Godot Engine"
|
||||
#define MyAppVersion "4.3"
|
||||
#define MyAppVersion "4.4"
|
||||
#define MyAppPublisher "Godot Engine contributors"
|
||||
#define MyAppURL "https://godotengine.org/"
|
||||
#define MyAppExeName "godot.exe"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue