From af7eb764a1dc65846819cb4de172df9040e5eacd Mon Sep 17 00:00:00 2001 From: rick Date: Sat, 5 Dec 2020 14:29:38 +0100 Subject: [PATCH] Suppression de fichiers inutiles --- Surprise Dungeon.yyp | 3 - sprites/Purple/Purple.yy | 78 --------- .../99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png | Bin 295 -> 0 bytes .../19b32337-1cc4-49aa-a953-00db83b561b0.png | Bin 295 -> 0 bytes .../f22d7d55-97ea-47bf-8f60-73fb15b280fe.png | Bin 295 -> 0 bytes sprites/sSword/sSword.yy | 78 --------- sprites/sSword/sSword.yy~HEAD | 78 --------- sprites/sSword/sSword.yy~master | 158 ------------------ .../b8641d82-c176-43ff-afc6-591bbe2745c5.png | Bin 381 -> 0 bytes .../4fa87a58-e87e-4913-919a-04e965f1d410.png | Bin 381 -> 0 bytes sprites/sTest/sTest.yy | 78 --------- 11 files changed, 473 deletions(-) delete mode 100644 sprites/Purple/Purple.yy delete mode 100644 sprites/sSword/99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png delete mode 100644 sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png delete mode 100644 sprites/sSword/layers/99d311e5-d6f5-4d00-bf4b-db7a8aea407a/f22d7d55-97ea-47bf-8f60-73fb15b280fe.png delete mode 100644 sprites/sSword/sSword.yy delete mode 100644 sprites/sSword/sSword.yy~HEAD delete mode 100644 sprites/sSword/sSword.yy~master delete mode 100644 sprites/sTest/b8641d82-c176-43ff-afc6-591bbe2745c5.png delete mode 100644 sprites/sTest/layers/b8641d82-c176-43ff-afc6-591bbe2745c5/4fa87a58-e87e-4913-919a-04e965f1d410.png delete mode 100644 sprites/sTest/sTest.yy diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 1af8673..7509d2b 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -1,12 +1,9 @@ { "resources": [ {"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":"Purple","path":"sprites/Purple/Purple.yy",},"order":1,}, {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.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,}, ], "Options": [ diff --git a/sprites/Purple/Purple.yy b/sprites/Purple/Purple.yy deleted file mode 100644 index f993914..0000000 --- a/sprites/Purple/Purple.yy +++ /dev/null @@ -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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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", -} \ No newline at end of file diff --git a/sprites/sSword/99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png b/sprites/sSword/99d311e5-d6f5-4d00-bf4b-db7a8aea407a.png deleted file mode 100644 index 47ecb4d147fa19d998017c1684ee1411042589f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`LHy>Xkf#ejh|P<+iv zzcog4Z-jhf)a#btWq*>hf}O?D@bQce3xD(UYfQ6PEI#m%Of`A`&SnT!vHZCA=bVS&C!s3{^)P+d=xL0v_62+Gv}*q=lWWC1Ep?|&`t5Dg zxTdFYZrQV=ZrA?{Mh6OGuTM_y(P7kG;K_i58~T!YKY#u1oz@_BL4^RmV|PG!>TB7U U85%zx0e#Nk>FVdQ&MBb@02*U+=>Px# diff --git a/sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png b/sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png deleted file mode 100644 index 47ecb4d147fa19d998017c1684ee1411042589f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`LHy>Xkf#ejh|P<+iv zzcog4Z-jhf)a#btWq*>hf}O?D@bQce3xD(UYfQ6PEI#m%Of`A`&SnT!vHZCA=bVS&C!s3{^)P+d=xL0v_62+Gv}*q=lWWC1Ep?|&`t5Dg zxTdFYZrQV=ZrA?{Mh6OGuTM_y(P7kG;K_i58~T!YKY#u1oz@_BL4^RmV|PG!>TB7U U85%zx0e#Nk>FVdQ&MBb@02*U+=>Px# diff --git a/sprites/sSword/layers/99d311e5-d6f5-4d00-bf4b-db7a8aea407a/f22d7d55-97ea-47bf-8f60-73fb15b280fe.png b/sprites/sSword/layers/99d311e5-d6f5-4d00-bf4b-db7a8aea407a/f22d7d55-97ea-47bf-8f60-73fb15b280fe.png deleted file mode 100644 index 47ecb4d147fa19d998017c1684ee1411042589f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`LHy>Xkf#ejh|P<+iv zzcog4Z-jhf)a#btWq*>hf}O?D@bQce3xD(UYfQ6PEI#m%Of`A`&SnT!vHZCA=bVS&C!s3{^)P+d=xL0v_62+Gv}*q=lWWC1Ep?|&`t5Dg zxTdFYZrQV=ZrA?{Mh6OGuTM_y(P7kG;K_i58~T!YKY#u1oz@_BL4^RmV|PG!>TB7U U85%zx0e#Nk>FVdQ&MBb@02*U+=>Px# diff --git a/sprites/sSword/sSword.yy b/sprites/sSword/sSword.yy deleted file mode 100644 index 9dd5e29..0000000 --- a/sprites/sSword/sSword.yy +++ /dev/null @@ -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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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", -} \ No newline at end of file diff --git a/sprites/sSword/sSword.yy~HEAD b/sprites/sSword/sSword.yy~HEAD deleted file mode 100644 index 030b8a0..0000000 --- a/sprites/sSword/sSword.yy~HEAD +++ /dev/null @@ -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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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", -} \ No newline at end of file diff --git a/sprites/sSword/sSword.yy~master b/sprites/sSword/sSword.yy~master deleted file mode 100644 index eff2ad4..0000000 --- a/sprites/sSword/sSword.yy~master +++ /dev/null @@ -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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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 -} \ No newline at end of file diff --git a/sprites/sTest/b8641d82-c176-43ff-afc6-591bbe2745c5.png b/sprites/sTest/b8641d82-c176-43ff-afc6-591bbe2745c5.png deleted file mode 100644 index 356eb6842f04be43499be89df7283054218edf42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP) zA@@V0*#J=#UI{WrrCrv9II3f>F;Q6ORR9>R*KAUz=WQ;krs9y{x(r~$v5Bz!E&?o! zKvdqg5_l>0wk`tUe0r`8z>ARTYd(u*n8xx!gpqin=$Hi}xQ0i`@Ct(XqZgAM bU?qD48H2RmFEKH400000NkvXXu0mjf*N3e6 diff --git a/sprites/sTest/layers/b8641d82-c176-43ff-afc6-591bbe2745c5/4fa87a58-e87e-4913-919a-04e965f1d410.png b/sprites/sTest/layers/b8641d82-c176-43ff-afc6-591bbe2745c5/4fa87a58-e87e-4913-919a-04e965f1d410.png deleted file mode 100644 index 356eb6842f04be43499be89df7283054218edf42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP) zA@@V0*#J=#UI{WrrCrv9II3f>F;Q6ORR9>R*KAUz=WQ;krs9y{x(r~$v5Bz!E&?o! zKvdqg5_l>0wk`tUe0r`8z>ARTYd(u*n8xx!gpqin=$Hi}xQ0i`@Ct(XqZgAM bU?qD48H2RmFEKH400000NkvXXu0mjf*N3e6 diff --git a/sprites/sTest/sTest.yy b/sprites/sTest/sTest.yy deleted file mode 100644 index 2c78881..0000000 --- a/sprites/sTest/sTest.yy +++ /dev/null @@ -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",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "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",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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", -} \ No newline at end of file