Răsfoiți Sursa

Merge branch '3.8-beta' into skin-bones

badlogic 6 ani în urmă
părinte
comite
55176c4ac7

+ 1 - 1
spine-ts/build/spine-all.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 1 - 1
spine-ts/build/spine-canvas.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 1 - 1
spine-ts/build/spine-core.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 1 - 1
spine-ts/build/spine-player.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 1 - 1
spine-ts/build/spine-threejs.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 1 - 1
spine-ts/build/spine-webgl.js

@@ -1758,7 +1758,7 @@ var spine;
 		AnimationState.prototype.expandToIndex = function (index) {
 		AnimationState.prototype.expandToIndex = function (index) {
 			if (index < this.tracks.length)
 			if (index < this.tracks.length)
 				return this.tracks[index];
 				return this.tracks[index];
-			spine.Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			spine.Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		};
 		};

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 1 - 1
spine-ts/core/src/AnimationState.ts

@@ -531,7 +531,7 @@ module spine {
 
 
 		expandToIndex (index: number) {
 		expandToIndex (index: number) {
 			if (index < this.tracks.length) return this.tracks[index];
 			if (index < this.tracks.length) return this.tracks[index];
-			Utils.ensureArrayCapacity(this.tracks, index - this.tracks.length + 1, null);
+			Utils.ensureArrayCapacity(this.tracks, index + 1, null);
 			this.tracks.length = index + 1;
 			this.tracks.length = index + 1;
 			return null;
 			return null;
 		}
 		}

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff