Merge branch '4.0' into 4.1-beta

# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/spine-threejs/package.json
This commit is contained in:
Mario Zechner 2022-05-30 11:48:34 +02:00
commit ea8f9385fb

View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>spine-threejs</title>
<script src="https://unpkg.com/three@0.138.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.141.0/build/three.js"></script>
<script src="../dist/iife/spine-threejs.js"></script>
<script src="./OrbitalControls.js"></script>
</head>