UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 3.9-beta

Browse Source
This commit is contained in:
badlogic 2020-01-11 15:03:24 +01:00
commit d1d5e126a5
14 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-ts/build/spine-all.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/build/spine-canvas.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-canvas.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/build/spine-core.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/build/spine-player.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-player.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/build/spine-threejs.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/build/spine-webgl.js
View File

@ -2169,6 +2169,7 @@ var spine;
} }
AssetManager.prototype.downloadText = function (url, success, error) { AssetManager.prototype.downloadText = function (url, success, error) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) if (this.rawDataUris[url])
url = this.rawDataUris[url]; url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
@ -3510,6 +3511,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3529,6 +3531,7 @@ var spine;
if (!this.queueAsset(clientId, null, path)) if (!this.queueAsset(clientId, null, path))
return; return;
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = function () { request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -3548,7 +3551,6 @@ var spine;
if (!this.queueAsset(clientId, textureLoader, path)) if (!this.queueAsset(clientId, textureLoader, path))
return; return;
var img = new Image(); var img = new Image();
img.src = path;
img.crossOrigin = "anonymous"; img.crossOrigin = "anonymous";
img.onload = function (ev) { img.onload = function (ev) {
_this.rawAssets[path] = img; _this.rawAssets[path] = img;
@ -3556,6 +3558,7 @@ var spine;
img.onerror = function (ev) { img.onerror = function (ev) {
_this.errors[path] = "Couldn't load image " + path; _this.errors[path] = "Couldn't load image " + path;
}; };
img.src = path;
}; };
SharedAssetManager.prototype.get = function (clientId, path) { SharedAssetManager.prototype.get = function (clientId, path) {
path = this.pathPrefix + path; path = this.pathPrefix + path;

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

1
spine-ts/core/src/AssetManager.ts
View File

@ -44,6 +44,7 @@ module spine {
private downloadText (url: string, success: (data: string) => void, error: (status: number, responseText: string) => void) { private downloadText (url: string, success: (data: string) => void, error: (status: number, responseText: string) => void) {
let request = new XMLHttpRequest(); let request = new XMLHttpRequest();
request.overrideMimeType("text/html");
if (this.rawDataUris[url]) url = this.rawDataUris[url]; if (this.rawDataUris[url]) url = this.rawDataUris[url];
request.open("GET", url, true); request.open("GET", url, true);
request.onload = () => { request.onload = () => {

2
spine-ts/core/src/SharedAssetManager.ts
View File

@ -79,6 +79,7 @@ module spine {
path = this.pathPrefix + path; path = this.pathPrefix + path;
if (!this.queueAsset(clientId, null, path)) return; if (!this.queueAsset(clientId, null, path)) return;
let request = new XMLHttpRequest(); let request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = () => { request.onreadystatechange = () => {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
@ -96,6 +97,7 @@ module spine {
path = this.pathPrefix + path; path = this.pathPrefix + path;
if (!this.queueAsset(clientId, null, path)) return; if (!this.queueAsset(clientId, null, path)) return;
let request = new XMLHttpRequest(); let request = new XMLHttpRequest();
request.overrideMimeType("text/html");
request.onreadystatechange = () => { request.onreadystatechange = () => {
if (request.readyState == XMLHttpRequest.DONE) { if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {