Merge branch '3.7' into 3.8-beta

examples/spinosaurus/export/spinosaurus-ess.json

@@ -1 +1,277 @@
-{"skeleton":{"hash":"B2ZPp7lIxBrN+g+ALWuTw4IWKYE","spine":"3.7.68-beta","width":1680,"height":1782.28,"images":"./images/","audio":""},"bones":[{"name":"root","y":-526.32},{"name":"leaves","parent":"root","x":-0.17,"y":1310.1},{"name":"logo","parent":"root","y":1332.03},{"name":"play","parent":"root","x":3.02,"y":-83.61},{"name":"quit","parent":"root","x":-2.86,"y":-201.21},{"name":"settings","parent":"root","x":3.02,"y":-144.37}],"slots":[{"name":"background","bone":"root"},{"name":"leaves","bone":"leaves","attachment":"leaves"},{"name":"logo","bone":"logo","attachment":"logo"},{"name":"play","bone":"play","color":"fff99dff","attachment":"play"},{"name":"quit","bone":"quit","color":"fff99dff","attachment":"quit"},{"name":"settings","bone":"settings","color":"fff99dff","attachment":"settings"}],"skins":{"default":{"leaves":{"leaves":{"y":-28.54,"width":1042,"height":522}},"logo":{"logo":{"y":-20.4,"width":917,"height":323}},"play":{"play":{"width":218,"height":77}},"quit":{"quit":{"width":216,"height":77}},"settings":{"settings":{"width":446,"height":76}}}},"animations":{"animation":{"slots":{"leaves":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"logo":{"color":[{"time":0,"color":"ffffff00"},{"time":0.3333,"color":"ffffffff"}]},"play":{"color":[{"time":1.3333,"color":"fff99dff"},{"time":1.5667,"color":"ffffffff","curve":"stepped"},{"time":1.8333,"color":"ffffffff"},{"time":2.0667,"color":"fff99dff"}]},"quit":{"color":[{"time":2.4,"color":"fff99dff"},{"time":2.6333,"color":"ffffffff"}]},"settings":{"color":[{"time":1.8667,"color":"fff99dff"},{"time":2.1,"color":"ffffffff","curve":"stepped"},{"time":2.3667,"color":"ffffffff"},{"time":2.6,"color":"fff99dff"}]}},"bones":{"logo":{"translate":[{"time":0,"x":0,"y":40.8,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0,"y":-597.72,"curve":[0.425,0.17,0.592,1]},{"time":1,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":1.6667,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":2.3333,"x":0,"y":-583.72,"curve":[0.402,0,0.603,1]},{"time":3,"x":0,"y":-592.12,"curve":[0.408,0.01,0.655,0.99]},{"time":3.6667,"x":0,"y":-583.72}],"scale":[{"time":0,"x":0.342,"y":0.342,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1,"curve":[0.19,0.38,0.658,0.99]},{"time":1,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":1.6667,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":2.3333,"x":1.02,"y":1.03,"curve":[0.371,0,0.661,1]},{"time":3,"x":1,"y":1,"curve":[0.388,0.01,0.687,1]},{"time":3.6667,"x":1.02,"y":1.03}]},"play":{"translate":[{"time":0.6667,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":0.8667,"x":0,"y":480.2}],"scale":[{"time":1.3333,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":1.5667,"x":1.231,"y":1.231,"curve":"stepped"},{"time":1.8333,"x":1.231,"y":1.231,"curve":[0,0,0.526,2.46]},{"time":2.0667,"x":1,"y":1}]},"settings":{"translate":[{"time":0.8,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1,"x":0,"y":431.2}],"scale":[{"time":1.8667,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.1,"x":1.23,"y":1.23,"curve":"stepped"},{"time":2.3667,"x":1.23,"y":1.23,"curve":[0,0,0.526,2.46]},{"time":2.6,"x":1,"y":1}]},"quit":{"translate":[{"time":0.9333,"x":0,"y":0,"curve":[0,0,0.448,1.63]},{"time":1.1333,"x":0,"y":376.32}],"scale":[{"time":2.4,"x":1,"y":1,"curve":[0,0,0.526,2.46]},{"time":2.6333,"x":1.23,"y":1.23}]},"leaves":{"translate":[{"time":0,"x":0,"y":0,"curve":[0.043,0.15,0.345,1.27]},{"time":0.3333,"x":0.17,"y":-601.24,"curve":[0.425,0.17,0.592,1]},{"time":1.3333,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":2,"x":0.17,"y":-595.12},{"time":2.6667,"x":0.17,"y":-580.84,"curve":[0.402,0,0.603,1]},{"time":3.3333,"x":0.17,"y":-595.12}],"scale":[{"time":0,"x":0.34,"y":0.34,"curve":[0,0,0.744,0.4]},{"time":0.3333,"x":1,"y":1},{"time":1.3333,"x":1.03,"y":1.02},{"time":2,"x":1,"y":1},{"time":2.6667,"x":1.03,"y":1.02},{"time":3.3333,"x":1,"y":1}]}}}}}
+{
+"skeleton": { "hash": "B2ZPp7lIxBrN+g+ALWuTw4IWKYE", "spine": "3.7.90", "width": 1680, "height": 1782.28, "images": "./images/", "audio": "" },
+"bones": [
+	{ "name": "root", "y": -526.32 },
+	{ "name": "leaves", "parent": "root", "x": -0.17, "y": 1310.1 },
+	{ "name": "logo", "parent": "root", "y": 1332.03 },
+	{ "name": "play", "parent": "root", "x": 3.02, "y": -83.61 },
+	{ "name": "quit", "parent": "root", "x": -2.86, "y": -201.21 },
+	{ "name": "settings", "parent": "root", "x": 3.02, "y": -144.37 }
+],
+"slots": [
+	{ "name": "background", "bone": "root" },
+	{ "name": "leaves", "bone": "leaves", "attachment": "leaves" },
+	{ "name": "logo", "bone": "logo", "attachment": "logo" },
+	{ "name": "play", "bone": "play", "color": "fff99dff", "attachment": "play" },
+	{ "name": "quit", "bone": "quit", "color": "fff99dff", "attachment": "quit" },
+	{ "name": "settings", "bone": "settings", "color": "fff99dff", "attachment": "settings" }
+],
+"skins": {
+	"default": {
+		"leaves": {
+			"leaves": { "y": -28.54, "width": 1042, "height": 522 }
+		},
+		"logo": {
+			"logo": { "y": -20.4, "width": 917, "height": 323 }
+		},
+		"play": {
+			"play": { "width": 218, "height": 77 }
+		},
+		"quit": {
+			"quit": { "width": 216, "height": 77 }
+		},
+		"settings": {
+			"settings": { "width": 446, "height": 76 }
+		}
+	}
+},
+"animations": {
+	"animation": {
+		"slots": {
+			"leaves": {
+				"color": [
+					{ "time": 0, "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" }
+				]
+			},
+			"logo": {
+				"color": [
+					{ "time": 0, "color": "ffffff00" },
+					{ "time": 0.3333, "color": "ffffffff" }
+				]
+			},
+			"play": {
+				"color": [
+					{ "time": 1.3333, "color": "fff99dff" },
+					{ "time": 1.5667, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 1.8333, "color": "ffffffff" },
+					{ "time": 2.0667, "color": "fff99dff" }
+				]
+			},
+			"quit": {
+				"color": [
+					{ "time": 2.4, "color": "fff99dff" },
+					{ "time": 2.6333, "color": "ffffffff" }
+				]
+			},
+			"settings": {
+				"color": [
+					{ "time": 1.8667, "color": "fff99dff" },
+					{ "time": 2.1, "color": "ffffffff", "curve": "stepped" },
+					{ "time": 2.3667, "color": "ffffffff" },
+					{ "time": 2.6, "color": "fff99dff" }
+				]
+			}
+		},
+		"bones": {
+			"logo": {
+				"translate": [
+					{
+						"time": 0,
+						"x": 0,
+						"y": 40.8,
+						"curve": [ 0.043, 0.15, 0.345, 1.27 ]
+					},
+					{
+						"time": 0.3333,
+						"x": 0,
+						"y": -597.72,
+						"curve": [ 0.425, 0.17, 0.592, 1 ]
+					},
+					{
+						"time": 1,
+						"x": 0,
+						"y": -583.72,
+						"curve": [ 0.402, 0, 0.603, 1 ]
+					},
+					{
+						"time": 1.6667,
+						"x": 0,
+						"y": -592.12,
+						"curve": [ 0.408, 0.01, 0.655, 0.99 ]
+					},
+					{
+						"time": 2.3333,
+						"x": 0,
+						"y": -583.72,
+						"curve": [ 0.402, 0, 0.603, 1 ]
+					},
+					{
+						"time": 3,
+						"x": 0,
+						"y": -592.12,
+						"curve": [ 0.408, 0.01, 0.655, 0.99 ]
+					},
+					{ "time": 3.6667, "x": 0, "y": -583.72 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 0.342,
+						"y": 0.342,
+						"curve": [ 0, 0, 0.744, 0.4 ]
+					},
+					{
+						"time": 0.3333,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.19, 0.38, 0.658, 0.99 ]
+					},
+					{
+						"time": 1,
+						"x": 1.02,
+						"y": 1.03,
+						"curve": [ 0.371, 0, 0.661, 1 ]
+					},
+					{
+						"time": 1.6667,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.388, 0.01, 0.687, 1 ]
+					},
+					{
+						"time": 2.3333,
+						"x": 1.02,
+						"y": 1.03,
+						"curve": [ 0.371, 0, 0.661, 1 ]
+					},
+					{
+						"time": 3,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.388, 0.01, 0.687, 1 ]
+					},
+					{ "time": 3.6667, "x": 1.02, "y": 1.03 }
+				]
+			},
+			"play": {
+				"translate": [
+					{
+						"time": 0.6667,
+						"x": 0,
+						"y": 0,
+						"curve": [ 0, 0, 0.448, 1.63 ]
+					},
+					{ "time": 0.8667, "x": 0, "y": 480.2 }
+				],
+				"scale": [
+					{
+						"time": 1.3333,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0, 0, 0.526, 2.46 ]
+					},
+					{ "time": 1.5667, "x": 1.231, "y": 1.231, "curve": "stepped" },
+					{
+						"time": 1.8333,
+						"x": 1.231,
+						"y": 1.231,
+						"curve": [ 0, 0, 0.526, 2.46 ]
+					},
+					{ "time": 2.0667, "x": 1, "y": 1 }
+				]
+			},
+			"settings": {
+				"translate": [
+					{
+						"time": 0.8,
+						"x": 0,
+						"y": 0,
+						"curve": [ 0, 0, 0.448, 1.63 ]
+					},
+					{ "time": 1, "x": 0, "y": 431.2 }
+				],
+				"scale": [
+					{
+						"time": 1.8667,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0, 0, 0.526, 2.46 ]
+					},
+					{ "time": 2.1, "x": 1.23, "y": 1.23, "curve": "stepped" },
+					{
+						"time": 2.3667,
+						"x": 1.23,
+						"y": 1.23,
+						"curve": [ 0, 0, 0.526, 2.46 ]
+					},
+					{ "time": 2.6, "x": 1, "y": 1 }
+				]
+			},
+			"quit": {
+				"translate": [
+					{
+						"time": 0.9333,
+						"x": 0,
+						"y": 0,
+						"curve": [ 0, 0, 0.448, 1.63 ]
+					},
+					{ "time": 1.1333, "x": 0, "y": 376.32 }
+				],
+				"scale": [
+					{
+						"time": 2.4,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0, 0, 0.526, 2.46 ]
+					},
+					{ "time": 2.6333, "x": 1.23, "y": 1.23 }
+				]
+			},
+			"leaves": {
+				"translate": [
+					{
+						"time": 0,
+						"x": 0,
+						"y": 0,
+						"curve": [ 0.043, 0.15, 0.345, 1.27 ]
+					},
+					{
+						"time": 0.3333,
+						"x": 0.17,
+						"y": -601.24,
+						"curve": [ 0.425, 0.17, 0.592, 1 ]
+					},
+					{
+						"time": 1.3333,
+						"x": 0.17,
+						"y": -580.84,
+						"curve": [ 0.402, 0, 0.603, 1 ]
+					},
+					{ "time": 2, "x": 0.17, "y": -595.12 },
+					{
+						"time": 2.6667,
+						"x": 0.17,
+						"y": -580.84,
+						"curve": [ 0.402, 0, 0.603, 1 ]
+					},
+					{ "time": 3.3333, "x": 0.17, "y": -595.12 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 0.34,
+						"y": 0.34,
+						"curve": [ 0, 0, 0.744, 0.4 ]
+					},
+					{ "time": 0.3333, "x": 1, "y": 1 },
+					{ "time": 1.3333, "x": 1.03, "y": 1.02 },
+					{ "time": 2, "x": 1, "y": 1 },
+					{ "time": 2.6667, "x": 1.03, "y": 1.02 },
+					{ "time": 3.3333, "x": 1, "y": 1 }
+				]
+			}
+		}
+	}
+}
+}