Suppression de fichiers inutiles
This commit is contained in:
parent
0d01432fc6
commit
af7eb764a1
11 changed files with 0 additions and 473 deletions
|
@ -1,12 +1,9 @@
|
||||||
{
|
{
|
||||||
"resources": [
|
"resources": [
|
||||||
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":2,},
|
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":2,},
|
||||||
{"id":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"order":4,},
|
|
||||||
{"id":{"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},"order":3,},
|
{"id":{"name":"sBanana","path":"sprites/sBanana/sBanana.yy",},"order":3,},
|
||||||
{"id":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"order":1,},
|
|
||||||
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
||||||
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
|
{"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,},
|
||||||
{"id":{"name":"sTest","path":"sprites/sTest/sTest.yy",},"order":0,},
|
|
||||||
{"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},"order":0,},
|
{"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},"order":0,},
|
||||||
],
|
],
|
||||||
"Options": [
|
"Options": [
|
||||||
|
|
|
@ -1,78 +0,0 @@
|
||||||
{
|
|
||||||
"bboxMode": 0,
|
|
||||||
"collisionKind": 1,
|
|
||||||
"type": 0,
|
|
||||||
"origin": 0,
|
|
||||||
"preMultiplyAlpha": false,
|
|
||||||
"edgeFiltering": false,
|
|
||||||
"collisionTolerance": 0,
|
|
||||||
"swfPrecision": 2.525,
|
|
||||||
"bbox_left": 0,
|
|
||||||
"bbox_right": 0,
|
|
||||||
"bbox_top": 0,
|
|
||||||
"bbox_bottom": 0,
|
|
||||||
"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",
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 295 B |
Binary file not shown.
Before Width: | Height: | Size: 295 B |
Binary file not shown.
Before Width: | Height: | Size: 295 B |
|
@ -1,78 +0,0 @@
|
||||||
{
|
|
||||||
"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":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
|
||||||
{"FrameId":{"name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","path":"sprites/sSword/sSword.yy",},"LayerId":{"name":"f22d7d55-97ea-47bf-8f60-73fb15b280fe","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
|
||||||
],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","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":"1a03c1ef-1100-4e63-bb02-c36ede5c4357","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"99d311e5-d6f5-4d00-bf4b-db7a8aea407a","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":"f22d7d55-97ea-47bf-8f60-73fb15b280fe","tags":[],"resourceType":"GMImageLayer",},
|
|
||||||
],
|
|
||||||
"parent": {
|
|
||||||
"name": "Sprites",
|
|
||||||
"path": "folders/Sprites.yy",
|
|
||||||
},
|
|
||||||
"resourceVersion": "1.0",
|
|
||||||
"name": "sSword",
|
|
||||||
"tags": [],
|
|
||||||
"resourceType": "GMSprite",
|
|
||||||
}
|
|
|
@ -1,78 +0,0 @@
|
||||||
{
|
|
||||||
"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",
|
|
||||||
}
|
|
|
@ -1,158 +0,0 @@
|
||||||
<<<<<<< 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
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 381 B |
Binary file not shown.
Before Width: | Height: | Size: 381 B |
|
@ -1,78 +0,0 @@
|
||||||
{
|
|
||||||
"bboxMode": 0,
|
|
||||||
"collisionKind": 1,
|
|
||||||
"type": 0,
|
|
||||||
"origin": 4,
|
|
||||||
"preMultiplyAlpha": false,
|
|
||||||
"edgeFiltering": false,
|
|
||||||
"collisionTolerance": 0,
|
|
||||||
"swfPrecision": 2.525,
|
|
||||||
"bbox_left": 0,
|
|
||||||
"bbox_right": 31,
|
|
||||||
"bbox_top": 0,
|
|
||||||
"bbox_bottom": 31,
|
|
||||||
"HTile": false,
|
|
||||||
"VTile": false,
|
|
||||||
"For3D": false,
|
|
||||||
"width": 32,
|
|
||||||
"height": 32,
|
|
||||||
"textureGroupId": {
|
|
||||||
"name": "Default",
|
|
||||||
"path": "texturegroups/Default",
|
|
||||||
},
|
|
||||||
"swatchColours": null,
|
|
||||||
"gridX": 0,
|
|
||||||
"gridY": 0,
|
|
||||||
"frames": [
|
|
||||||
{"compositeImage":{"FrameId":{"name":"b8641d82-c176-43ff-afc6-591bbe2745c5","path":"sprites/sTest/sTest.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
|
||||||
{"FrameId":{"name":"b8641d82-c176-43ff-afc6-591bbe2745c5","path":"sprites/sTest/sTest.yy",},"LayerId":{"name":"4fa87a58-e87e-4913-919a-04e965f1d410","path":"sprites/sTest/sTest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
|
|
||||||
],"parent":{"name":"sTest","path":"sprites/sTest/sTest.yy",},"resourceVersion":"1.0","name":"b8641d82-c176-43ff-afc6-591bbe2745c5","tags":[],"resourceType":"GMSpriteFrame",},
|
|
||||||
],
|
|
||||||
"sequence": {
|
|
||||||
"spriteId": {"name":"sTest","path":"sprites/sTest/sTest.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":"99027be0-dfbe-48c9-a455-f3a6fd289c42","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b8641d82-c176-43ff-afc6-591bbe2745c5","path":"sprites/sTest/sTest.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": 16,
|
|
||||||
"yorigin": 16,
|
|
||||||
"eventToFunction": {},
|
|
||||||
"eventStubScript": null,
|
|
||||||
"parent": {"name":"sTest","path":"sprites/sTest/sTest.yy",},
|
|
||||||
"resourceVersion": "1.3",
|
|
||||||
"name": "sTest",
|
|
||||||
"tags": [],
|
|
||||||
"resourceType": "GMSequence",
|
|
||||||
},
|
|
||||||
"layers": [
|
|
||||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"4fa87a58-e87e-4913-919a-04e965f1d410","tags":[],"resourceType":"GMImageLayer",},
|
|
||||||
],
|
|
||||||
"parent": {
|
|
||||||
"name": "Sprites",
|
|
||||||
"path": "folders/Sprites.yy",
|
|
||||||
},
|
|
||||||
"resourceVersion": "1.0",
|
|
||||||
"name": "sTest",
|
|
||||||
"tags": [],
|
|
||||||
"resourceType": "GMSprite",
|
|
||||||
}
|
|
Reference in a new issue