UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source 
# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-phaser/package.json
#	spine-ts/spine-pixi/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
This commit is contained in:
Mario Zechner 2023-11-06 11:46:04 +01:00
commit f3005a4b52
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-ts/spine-phaser/src/require-shim.ts
View File

@ -30,7 +30,7 @@
declare global { declare global {
var require: any; var require: any;
} }
if (window.Phaser) { if (typeof window !== 'undefined' && window.Phaser) {
let prevRequire = window.require; let prevRequire = window.require;
window.require = (x: string) => { window.require = (x: string) => {
if (prevRequire) return prevRequire(x); if (prevRequire) return prevRequire(x);

2
spine-ts/spine-pixi/src/require-shim.ts
View File

@ -32,7 +32,7 @@ declare global {
var PIXI: any; var PIXI: any;
} }
if (window.PIXI) { if (typeof window !== 'undefined' && window.PIXI) {
let prevRequire = window.require; let prevRequire = window.require;
window.require = (x: string) => { window.require = (x: string) => {
if (prevRequire) return prevRequire(x); if (prevRequire) return prevRequire(x);

2
spine-ts/spine-threejs/src/require-shim.ts
View File

@ -31,7 +31,7 @@ declare global {
var require: any; var require: any;
} }
if (window.THREE) { if (typeof window !== 'undefined' && window.THREE) {
let prevRequire = window.require; let prevRequire = window.require;
window.require = (x: string) => { window.require = (x: string) => {
if (prevRequire) return prevRequire(x); if (prevRequire) return prevRequire(x);