sOlaris38
4bfd9c8491
Conflicts: objects/oPlayer/Step_0.gml objects/oPlayer/oPlayer.yy sprites/Purple/Purple.yy sprites/sSword/sSword.yy
158 lines
No EOL
6.6 KiB
Text
158 lines
No EOL
6.6 KiB
Text
<<<<<<< HEAD:sprites/Purple/Purple.yy
|
|
{
|
|
"bboxMode": 0,
|
|
"collisionKind": 1,
|
|
"type": 0,
|
|
"origin": 0,
|
|
"preMultiplyAlpha": false,
|
|
"edgeFiltering": false,
|
|
"collisionTolerance": 0,
|
|
"swfPrecision": 2.525,
|
|
"bbox_left": 0,
|
|
"bbox_right": 63,
|
|
"bbox_top": 0,
|
|
"bbox_bottom": 63,
|
|
"HTile": false,
|
|
"VTile": false,
|
|
"For3D": false,
|
|
"width": 64,
|
|
"height": 64,
|
|
"textureGroupId": {
|
|
"name": "Default",
|
|
"path": "texturegroups/Default",
|
|
},
|
|
"swatchColours": null,
|
|
"gridX": 0,
|
|
"gridY": 0,
|
|
"frames": [
|
|
{"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
|
{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"LayerId":{"name":"19b32337-1cc4-49aa-a953-00db83b561b0","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
|
],"parent":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",},
|
|
],
|
|
"sequence": {
|
|
"spriteId": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
|
"timeUnits": 1,
|
|
"playback": 1,
|
|
"playbackSpeed": 30.0,
|
|
"playbackSpeedType": 0,
|
|
"autoRecord": true,
|
|
"volume": 1.0,
|
|
"length": 1.0,
|
|
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
|
"tracks": [
|
|
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
|
{"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
|
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
|
],
|
|
"visibleRange": null,
|
|
"lockOrigin": false,
|
|
"showBackdrop": true,
|
|
"showBackdropImage": false,
|
|
"backdropImagePath": "",
|
|
"backdropImageOpacity": 0.5,
|
|
"backdropWidth": 1366,
|
|
"backdropHeight": 768,
|
|
"backdropXOffset": 0.0,
|
|
"backdropYOffset": 0.0,
|
|
"xorigin": 0,
|
|
"yorigin": 0,
|
|
"eventToFunction": {},
|
|
"eventStubScript": null,
|
|
"parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
|
"resourceVersion": "1.3",
|
|
"name": "Purple",
|
|
"tags": [],
|
|
"resourceType": "GMSequence",
|
|
},
|
|
"layers": [
|
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
|
],
|
|
"parent": {
|
|
"name": "Sprites",
|
|
"path": "folders/Sprites.yy",
|
|
},
|
|
"resourceVersion": "1.0",
|
|
"name": "Purple",
|
|
"tags": [],
|
|
"resourceType": "GMSprite",
|
|
=======
|
|
{
|
|
"bboxMode": 0,
|
|
"collisionKind": 1,
|
|
"type": 0,
|
|
"origin": 0,
|
|
"preMultiplyAlpha": false,
|
|
"edgeFiltering": false,
|
|
"collisionTolerance": 0,
|
|
"swfPrecision": 2.525,
|
|
"bbox_left": 22,
|
|
"bbox_right": 32,
|
|
"bbox_top": 6,
|
|
"bbox_bottom": 43,
|
|
"HTile": false,
|
|
"VTile": false,
|
|
"For3D": false,
|
|
"width": 64,
|
|
"height": 64,
|
|
"textureGroupId": {
|
|
"name": "Default",
|
|
"path": "texturegroups/Default",
|
|
},
|
|
"swatchColours": null,
|
|
"gridX": 0,
|
|
"gridY": 0,
|
|
"frames": [
|
|
{"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
|
{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":{"name":"19b32337-1cc4-49aa-a953-00db83b561b0","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
|
],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",},
|
|
],
|
|
"sequence": {
|
|
"spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
|
"timeUnits": 1,
|
|
"playback": 1,
|
|
"playbackSpeed": 30.0,
|
|
"playbackSpeedType": 0,
|
|
"autoRecord": true,
|
|
"volume": 1.0,
|
|
"length": 1.0,
|
|
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
|
"tracks": [
|
|
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
|
{"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
|
|
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
|
|
],
|
|
"visibleRange": null,
|
|
"lockOrigin": false,
|
|
"showBackdrop": true,
|
|
"showBackdropImage": false,
|
|
"backdropImagePath": "",
|
|
"backdropImageOpacity": 0.5,
|
|
"backdropWidth": 1366,
|
|
"backdropHeight": 768,
|
|
"backdropXOffset": 0.0,
|
|
"backdropYOffset": 0.0,
|
|
"xorigin": 0,
|
|
"yorigin": 0,
|
|
"eventToFunction": {},
|
|
"eventStubScript": null,
|
|
"parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
|
"resourceVersion": "1.3",
|
|
"name": "sSword",
|
|
"tags": [],
|
|
"resourceType": "GMSequence",
|
|
},
|
|
"layers": [
|
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
|
],
|
|
"parent": {
|
|
"name": "Sprites",
|
|
"path": "folders/Sprites.yy",
|
|
},
|
|
"resourceVersion": "1.0",
|
|
"name": "sSword",
|
|
"tags": [],
|
|
"resourceType": "GMSprite",
|
|
>>>>>>> master:sprites/sSword/sSword.yy
|
|
} |