Merge branch 'main' into memcpy_fix

assets/alien/export/alien-ess.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "F735snjE3r4",
-	"spine": "4.1.23-beta",
+	"hash": "oNAXvMMJkLk",
+	"spine": "4.2.64-beta",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 365.79,

assets/alien/export/alien-pma.atlas

@@ -4,65 +4,62 @@ alien-pma.png
 	pma: true
 	scale: 0.5
 back-foot
-	bounds: 1013, 577, 8, 6
+	bounds: 2, 2, 8, 6
 back-shin
-	bounds: 712, 387, 21, 24
+	bounds: 231, 203, 21, 24
 back-thigh
-	bounds: 971, 135, 24, 24
+	bounds: 971, 877, 24, 24
 backarmor
-	bounds: 159, 61, 81, 91
-	rotate: 90
+	bounds: 261, 325, 81, 91
 blown-up-neck
-	bounds: 252, 90, 77, 52
+	bounds: 571, 652, 77, 52
 body
-	bounds: 516, 2, 98, 118
-	rotate: 90
+	bounds: 918, 903, 98, 118
 burst01
-	bounds: 2, 48, 143, 155
+	bounds: 576, 706, 143, 155
 	rotate: 90
 burst02
-	bounds: 207, 144, 156, 181
+	bounds: 735, 865, 156, 181
+	rotate: 90
 burst03-bg
-	bounds: 735, 356, 276, 227
+	bounds: 2, 10, 276, 227
+	rotate: 90
 burst03-fg
-	bounds: 371, 190, 339, 221
+	bounds: 2, 542, 339, 221
 eye
-	bounds: 252, 13, 75, 75
+	bounds: 494, 640, 75, 75
 eye-highlight
-	bounds: 1000, 166, 22, 22
+	bounds: 261, 256, 22, 22
 eye-pupil
-	bounds: 712, 367, 18, 18
+	bounds: 293, 305, 18, 18
 eye-stalk
-	bounds: 640, 114, 74, 66
-	rotate: 90
+	bounds: 494, 572, 74, 66
 front-foot
-	bounds: 1013, 565, 10, 6
-	rotate: 90
+	bounds: 343, 542, 10, 6
 front-lower-arm
-	bounds: 640, 57, 55, 63
+	bounds: 650, 649, 55, 63
 	rotate: 90
 front-shin
-	bounds: 971, 190, 25, 28
-	rotate: 90
+	bounds: 343, 735, 25, 28
 front-thigh
-	bounds: 971, 161, 27, 27
+	bounds: 343, 550, 27, 27
 front-upper-arm
-	bounds: 971, 217, 57, 28
+	bounds: 231, 229, 57, 28
 	rotate: 90
 head
-	bounds: 365, 52, 149, 136
+	bounds: 343, 579, 149, 136
 lower-back-arm
-	bounds: 971, 308, 51, 46
+	bounds: 918, 855, 51, 46
 metaljaw
-	bounds: 516, 102, 122, 86
+	bounds: 261, 418, 122, 86
+	rotate: 90
 splat01
-	bounds: 712, 102, 257, 252
+	bounds: 2, 288, 257, 252
 splat01-fg
-	bounds: 2, 193, 203, 132
+	bounds: 371, 717, 203, 132
 splat02
-	bounds: 2, 327, 367, 256
+	bounds: 2, 765, 367, 256
 splat03
-	bounds: 371, 413, 362, 170
+	bounds: 371, 851, 362, 170
 upper-back-arm
-	bounds: 971, 276, 30, 43
-	rotate: 90
+	bounds: 261, 280, 30, 43

assets/alien/export/alien-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "UmVPCRBPHcg",
-	"spine": "4.1.23-beta",
+	"hash": "tTPHKN0ryvs",
+	"spine": "4.2.64-beta",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 368.26,

assets/alien/export/alien.atlas

@@ -3,65 +3,62 @@ alien.png
 	filter: Linear, Linear
 	scale: 0.5
 back-foot
-	bounds: 1013, 577, 8, 6
+	bounds: 2, 2, 8, 6
 back-shin
-	bounds: 712, 387, 21, 24
+	bounds: 231, 203, 21, 24
 back-thigh
-	bounds: 971, 135, 24, 24
+	bounds: 971, 877, 24, 24
 backarmor
-	bounds: 159, 61, 81, 91
-	rotate: 90
+	bounds: 261, 325, 81, 91
 blown-up-neck
-	bounds: 252, 90, 77, 52
+	bounds: 571, 652, 77, 52
 body
-	bounds: 516, 2, 98, 118
-	rotate: 90
+	bounds: 918, 903, 98, 118
 burst01
-	bounds: 2, 48, 143, 155
+	bounds: 576, 706, 143, 155
 	rotate: 90
 burst02
-	bounds: 207, 144, 156, 181
+	bounds: 735, 865, 156, 181
+	rotate: 90
 burst03-bg
-	bounds: 735, 356, 276, 227
+	bounds: 2, 10, 276, 227
+	rotate: 90
 burst03-fg
-	bounds: 371, 190, 339, 221
+	bounds: 2, 542, 339, 221
 eye
-	bounds: 252, 13, 75, 75
+	bounds: 494, 640, 75, 75
 eye-highlight
-	bounds: 1000, 166, 22, 22
+	bounds: 261, 256, 22, 22
 eye-pupil
-	bounds: 712, 367, 18, 18
+	bounds: 293, 305, 18, 18
 eye-stalk
-	bounds: 640, 114, 74, 66
-	rotate: 90
+	bounds: 494, 572, 74, 66
 front-foot
-	bounds: 1013, 565, 10, 6
-	rotate: 90
+	bounds: 343, 542, 10, 6
 front-lower-arm
-	bounds: 640, 57, 55, 63
+	bounds: 650, 649, 55, 63
 	rotate: 90
 front-shin
-	bounds: 971, 190, 25, 28
-	rotate: 90
+	bounds: 343, 735, 25, 28
 front-thigh
-	bounds: 971, 161, 27, 27
+	bounds: 343, 550, 27, 27
 front-upper-arm
-	bounds: 971, 217, 57, 28
+	bounds: 231, 229, 57, 28
 	rotate: 90
 head
-	bounds: 365, 52, 149, 136
+	bounds: 343, 579, 149, 136
 lower-back-arm
-	bounds: 971, 308, 51, 46
+	bounds: 918, 855, 51, 46
 metaljaw
-	bounds: 516, 102, 122, 86
+	bounds: 261, 418, 122, 86
+	rotate: 90
 splat01
-	bounds: 712, 102, 257, 252
+	bounds: 2, 288, 257, 252
 splat01-fg
-	bounds: 2, 193, 203, 132
+	bounds: 371, 717, 203, 132
 splat02
-	bounds: 2, 327, 367, 256
+	bounds: 2, 765, 367, 256
 splat03
-	bounds: 371, 413, 362, 170
+	bounds: 371, 851, 362, 170
 upper-back-arm
-	bounds: 971, 276, 30, 43
-	rotate: 90
+	bounds: 261, 280, 30, 43

assets/alien/license.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Esoteric Software
+Copyright (c) 2013, Esoteric Software LLC
 
 The images in this project may be redistributed as long as they are accompanied
 by this license file. The images may not be used for commercial use of any

assets/celestial-circus/export/celestial-circus-pma.atlas

@@ -0,0 +1,174 @@
+celestial-circus-pma.png
+	size: 1024, 1024
+	filter: Linear, Linear
+	pma: true
+	scale: 0.4
+arm-back-down
+	bounds: 324, 401, 38, 82
+	rotate: 90
+arm-back-up
+	bounds: 290, 44, 83, 116
+	rotate: 90
+arm-front-down
+	bounds: 706, 2, 36, 78
+	rotate: 90
+arm-front-up
+	bounds: 860, 138, 77, 116
+bench
+	bounds: 725, 256, 189, 48
+body-bottom
+	bounds: 879, 868, 154, 124
+	rotate: 90
+body-top
+	bounds: 725, 128, 126, 133
+	rotate: 90
+chest
+	bounds: 408, 26, 104, 93
+cloud-back
+	bounds: 752, 378, 202, 165
+cloud-front
+	bounds: 2, 2, 325, 196
+	rotate: 90
+collar
+	bounds: 786, 13, 47, 26
+ear
+	bounds: 1002, 643, 20, 28
+eye-back-shadow
+	bounds: 428, 395, 14, 10
+eye-front-shadow
+	bounds: 704, 529, 24, 14
+eye-reflex-back
+	bounds: 860, 128, 8, 7
+	rotate: 90
+eye-reflex-front
+	bounds: 726, 386, 10, 7
+eye-white-back
+	bounds: 835, 23, 13, 16
+eye-white-front
+	bounds: 1005, 1000, 22, 17
+	rotate: 90
+eyelashes-down-back
+	bounds: 232, 329, 11, 6
+	rotate: 90
+eyelashes-down-front
+	bounds: 913, 851, 15, 6
+	rotate: 90
+eyelashes-top-back
+	bounds: 408, 395, 18, 10
+eyelashes-top-front
+	bounds: 702, 179, 30, 16
+	rotate: 90
+face
+	bounds: 514, 26, 93, 102
+	rotate: 90
+feathers-back
+	bounds: 954, 625, 46, 46
+feathers-front
+	bounds: 706, 40, 72, 86
+fringe-middle-back
+	bounds: 200, 6, 33, 52
+	rotate: 90
+fringe-middle-front
+	bounds: 878, 76, 60, 50
+	rotate: 90
+fringe-side-back
+	bounds: 780, 41, 27, 94
+	rotate: 90
+fringe-side-front
+	bounds: 939, 161, 26, 93
+glove-bottom-back
+	bounds: 954, 572, 51, 41
+	rotate: 90
+glove-bottom-front
+	bounds: 916, 256, 47, 48
+hair-back-1
+	bounds: 444, 395, 132, 306
+	rotate: 90
+hair-back-2
+	bounds: 438, 211, 80, 285
+	rotate: 90
+hair-back-3
+	bounds: 719, 306, 70, 268
+	rotate: 90
+hair-back-4
+	bounds: 438, 121, 88, 262
+	rotate: 90
+hair-back-5
+	bounds: 438, 293, 88, 279
+	rotate: 90
+hair-back-6
+	bounds: 200, 41, 88, 286
+hair-hat-shadow
+	bounds: 232, 398, 90, 41
+hand-back
+	bounds: 954, 673, 60, 47
+	rotate: 90
+hand-front
+	bounds: 967, 172, 53, 60
+hat-back
+	bounds: 954, 802, 64, 45
+	rotate: 90
+hat-front
+	bounds: 780, 70, 96, 56
+head-back
+	bounds: 618, 17, 102, 86
+	rotate: 90
+jabot
+	bounds: 967, 234, 70, 55
+	rotate: 90
+leg-back
+	bounds: 232, 441, 210, 333
+leg-front
+	bounds: 444, 529, 258, 320
+logo-brooch
+	bounds: 954, 545, 16, 25
+mouth
+	bounds: 408, 121, 22, 6
+neck
+	bounds: 232, 342, 39, 56
+	rotate: 90
+nose
+	bounds: 742, 529, 6, 7
+	rotate: 90
+nose-highlight
+	bounds: 719, 300, 4, 4
+nose-shadow
+	bounds: 869, 128, 7, 8
+pupil-back
+	bounds: 730, 529, 10, 14
+pupil-front
+	bounds: 254, 21, 12, 18
+rope-back
+	bounds: 232, 383, 10, 492
+	rotate: 90
+rope-front
+	bounds: 232, 383, 10, 492
+	rotate: 90
+rope-front-bottom
+	bounds: 954, 735, 42, 65
+skirt
+	bounds: 2, 776, 440, 246
+sock-bow
+	bounds: 408, 407, 33, 32
+spine-logo-body
+	bounds: 879, 853, 13, 32
+	rotate: 90
+star-big
+	bounds: 939, 141, 18, 24
+	rotate: 90
+star-medium
+	bounds: 742, 537, 6, 8
+	rotate: 90
+star-small
+	bounds: 719, 378, 3, 4
+	rotate: 90
+underskirt
+	bounds: 2, 329, 445, 228
+	rotate: 90
+underskirt-back
+	bounds: 444, 851, 433, 171
+wing-back
+	bounds: 290, 129, 146, 252
+wing-front
+	bounds: 704, 545, 304, 248
+	rotate: 90