Merge branch 'master' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020.git
Conflicts: objects/oPlayer/Step_0.gml objects/oPlayer/oPlayer.yy sprites/Purple/Purple.yy sprites/sSword/sSword.yy
This commit is contained in:
commit
4bfd9c8491
9 changed files with 513 additions and 154 deletions
11
objects/oPlayer/Step_0.gml.base
Normal file
11
objects/oPlayer/Step_0.gml.base
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
|
||||||
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
|
||||||
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
|
||||||
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
|
x += deplaceHorizontal;
|
||||||
|
y += deplaceVertical;
|
||||||
37
objects/oPlayer/Step_0.gml.orig
Normal file
37
objects/oPlayer/Step_0.gml.orig
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
<<<<<<< HEAD
|
||||||
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));
|
||||||
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));
|
||||||
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
|
||||||
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
|
||||||
|
// Déplacement du joueur
|
||||||
|
|
||||||
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
|
x += deplaceHorizontal;
|
||||||
|
y += deplaceVertical;
|
||||||
|
|
||||||
|
seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0);
|
||||||
|
|
||||||
|
// Animation des sprites
|
||||||
|
|
||||||
|
if (seDeplace) {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
=======
|
||||||
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
|
||||||
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
|
||||||
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
|
||||||
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
|
x += deplaceHorizontal;
|
||||||
|
y += deplaceVerticald;
|
||||||
|
>>>>>>> master
|
||||||
23
objects/oPlayer/Step_0.gml.ours
Normal file
23
objects/oPlayer/Step_0.gml.ours
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));
|
||||||
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));
|
||||||
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
|
||||||
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
|
||||||
|
// Déplacement du joueur
|
||||||
|
|
||||||
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
|
x += deplaceHorizontal;
|
||||||
|
y += deplaceVertical;
|
||||||
|
|
||||||
|
seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0);
|
||||||
|
|
||||||
|
// Animation des sprites
|
||||||
|
|
||||||
|
if (seDeplace) {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
11
objects/oPlayer/Step_0.gml.theirs
Normal file
11
objects/oPlayer/Step_0.gml.theirs
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
|
||||||
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
|
||||||
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
|
||||||
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
|
x += deplaceHorizontal;
|
||||||
|
y += deplaceVerticald;
|
||||||
41
objects/oPlayer/oPlayer.yy.orig
Normal file
41
objects/oPlayer/oPlayer.yy.orig
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
{
|
||||||
|
"spriteId": {
|
||||||
|
"name": "sPlayer",
|
||||||
|
"path": "sprites/sPlayer/sPlayer.yy",
|
||||||
|
},
|
||||||
|
"solid": false,
|
||||||
|
"visible": true,
|
||||||
|
"spriteMaskId": null,
|
||||||
|
"persistent": false,
|
||||||
|
"parentObjectId": null,
|
||||||
|
"physicsObject": false,
|
||||||
|
"physicsSensor": false,
|
||||||
|
"physicsShape": 1,
|
||||||
|
"physicsGroup": 1,
|
||||||
|
"physicsDensity": 0.5,
|
||||||
|
"physicsRestitution": 0.1,
|
||||||
|
"physicsLinearDamping": 0.1,
|
||||||
|
"physicsAngularDamping": 0.1,
|
||||||
|
"physicsFriction": 0.2,
|
||||||
|
"physicsStartAwake": true,
|
||||||
|
"physicsKinematic": false,
|
||||||
|
"physicsShapePoints": [],
|
||||||
|
"eventList": [
|
||||||
|
{"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
|
||||||
|
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
|
||||||
|
],
|
||||||
|
"properties": [
|
||||||
|
{"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceHorizontal","tags":[],"resourceType":"GMObjectProperty",},
|
||||||
|
{"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceVertical","tags":[],"resourceType":"GMObjectProperty",},
|
||||||
|
{"varType":0,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"spriteDir","tags":[],"resourceType":"GMObjectProperty",},
|
||||||
|
],
|
||||||
|
"overriddenProperties": [],
|
||||||
|
"parent": {
|
||||||
|
"name": "Objects",
|
||||||
|
"path": "folders/Objects.yy",
|
||||||
|
},
|
||||||
|
"resourceVersion": "1.0",
|
||||||
|
"name": "oPlayer",
|
||||||
|
"tags": [],
|
||||||
|
"resourceType": "GMObject",
|
||||||
|
}
|
||||||
|
|
@ -1,78 +1,78 @@
|
||||||
{
|
{
|
||||||
"bboxMode": 0,
|
"bboxMode": 0,
|
||||||
"collisionKind": 1,
|
"collisionKind": 1,
|
||||||
"type": 0,
|
"type": 0,
|
||||||
"origin": 0,
|
"origin": 0,
|
||||||
"preMultiplyAlpha": false,
|
"preMultiplyAlpha": false,
|
||||||
"edgeFiltering": false,
|
"edgeFiltering": false,
|
||||||
"collisionTolerance": 0,
|
"collisionTolerance": 0,
|
||||||
"swfPrecision": 2.525,
|
"swfPrecision": 2.525,
|
||||||
"bbox_left": 0,
|
"bbox_left": 0,
|
||||||
"bbox_right": 63,
|
"bbox_right": 63,
|
||||||
"bbox_top": 0,
|
"bbox_top": 0,
|
||||||
"bbox_bottom": 63,
|
"bbox_bottom": 63,
|
||||||
"HTile": false,
|
"HTile": false,
|
||||||
"VTile": false,
|
"VTile": false,
|
||||||
"For3D": false,
|
"For3D": false,
|
||||||
"width": 64,
|
"width": 64,
|
||||||
"height": 64,
|
"height": 64,
|
||||||
"textureGroupId": {
|
"textureGroupId": {
|
||||||
"name": "Default",
|
"name": "Default",
|
||||||
"path": "texturegroups/Default",
|
"path": "texturegroups/Default",
|
||||||
},
|
},
|
||||||
"swatchColours": null,
|
"swatchColours": null,
|
||||||
"gridX": 0,
|
"gridX": 0,
|
||||||
"gridY": 0,
|
"gridY": 0,
|
||||||
"frames": [
|
"frames": [
|
||||||
{"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
{"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",},
|
{"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",},
|
],"parent":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",},
|
||||||
],
|
],
|
||||||
"sequence": {
|
"sequence": {
|
||||||
"spriteId": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
"spriteId": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
||||||
"timeUnits": 1,
|
"timeUnits": 1,
|
||||||
"playback": 1,
|
"playback": 1,
|
||||||
"playbackSpeed": 30.0,
|
"playbackSpeed": 30.0,
|
||||||
"playbackSpeedType": 0,
|
"playbackSpeedType": 0,
|
||||||
"autoRecord": true,
|
"autoRecord": true,
|
||||||
"volume": 1.0,
|
"volume": 1.0,
|
||||||
"length": 1.0,
|
"length": 1.0,
|
||||||
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
||||||
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
||||||
"tracks": [
|
"tracks": [
|
||||||
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
{"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>",},
|
{"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",},
|
],"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,
|
"visibleRange": null,
|
||||||
"lockOrigin": false,
|
"lockOrigin": false,
|
||||||
"showBackdrop": true,
|
"showBackdrop": true,
|
||||||
"showBackdropImage": false,
|
"showBackdropImage": false,
|
||||||
"backdropImagePath": "",
|
"backdropImagePath": "",
|
||||||
"backdropImageOpacity": 0.5,
|
"backdropImageOpacity": 0.5,
|
||||||
"backdropWidth": 1366,
|
"backdropWidth": 1366,
|
||||||
"backdropHeight": 768,
|
"backdropHeight": 768,
|
||||||
"backdropXOffset": 0.0,
|
"backdropXOffset": 0.0,
|
||||||
"backdropYOffset": 0.0,
|
"backdropYOffset": 0.0,
|
||||||
"xorigin": 0,
|
"xorigin": 0,
|
||||||
"yorigin": 0,
|
"yorigin": 0,
|
||||||
"eventToFunction": {},
|
"eventToFunction": {},
|
||||||
"eventStubScript": null,
|
"eventStubScript": null,
|
||||||
"parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
"parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
|
||||||
"resourceVersion": "1.3",
|
"resourceVersion": "1.3",
|
||||||
"name": "Purple",
|
"name": "Purple",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSequence",
|
"resourceType": "GMSequence",
|
||||||
},
|
},
|
||||||
"layers": [
|
"layers": [
|
||||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
||||||
],
|
],
|
||||||
"parent": {
|
"parent": {
|
||||||
"name": "Sprites",
|
"name": "Sprites",
|
||||||
"path": "folders/Sprites.yy",
|
"path": "folders/Sprites.yy",
|
||||||
},
|
},
|
||||||
"resourceVersion": "1.0",
|
"resourceVersion": "1.0",
|
||||||
"name": "Purple",
|
"name": "Purple",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSprite",
|
"resourceType": "GMSprite",
|
||||||
}
|
}
|
||||||
|
|
@ -1,78 +1,78 @@
|
||||||
{
|
{
|
||||||
"bboxMode": 0,
|
"bboxMode": 0,
|
||||||
"collisionKind": 1,
|
"collisionKind": 1,
|
||||||
"type": 0,
|
"type": 0,
|
||||||
"origin": 0,
|
"origin": 0,
|
||||||
"preMultiplyAlpha": false,
|
"preMultiplyAlpha": false,
|
||||||
"edgeFiltering": false,
|
"edgeFiltering": false,
|
||||||
"collisionTolerance": 0,
|
"collisionTolerance": 0,
|
||||||
"swfPrecision": 2.525,
|
"swfPrecision": 2.525,
|
||||||
"bbox_left": 22,
|
"bbox_left": 22,
|
||||||
"bbox_right": 32,
|
"bbox_right": 32,
|
||||||
"bbox_top": 6,
|
"bbox_top": 6,
|
||||||
"bbox_bottom": 43,
|
"bbox_bottom": 43,
|
||||||
"HTile": false,
|
"HTile": false,
|
||||||
"VTile": false,
|
"VTile": false,
|
||||||
"For3D": false,
|
"For3D": false,
|
||||||
"width": 64,
|
"width": 64,
|
||||||
"height": 64,
|
"height": 64,
|
||||||
"textureGroupId": {
|
"textureGroupId": {
|
||||||
"name": "Default",
|
"name": "Default",
|
||||||
"path": "texturegroups/Default",
|
"path": "texturegroups/Default",
|
||||||
},
|
},
|
||||||
"swatchColours": null,
|
"swatchColours": null,
|
||||||
"gridX": 0,
|
"gridX": 0,
|
||||||
"gridY": 0,
|
"gridY": 0,
|
||||||
"frames": [
|
"frames": [
|
||||||
{"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
|
{"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",},
|
{"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",},
|
],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",},
|
||||||
],
|
],
|
||||||
"sequence": {
|
"sequence": {
|
||||||
"spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
"spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
||||||
"timeUnits": 1,
|
"timeUnits": 1,
|
||||||
"playback": 1,
|
"playback": 1,
|
||||||
"playbackSpeed": 30.0,
|
"playbackSpeed": 30.0,
|
||||||
"playbackSpeedType": 0,
|
"playbackSpeedType": 0,
|
||||||
"autoRecord": true,
|
"autoRecord": true,
|
||||||
"volume": 1.0,
|
"volume": 1.0,
|
||||||
"length": 1.0,
|
"length": 1.0,
|
||||||
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
|
||||||
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
|
||||||
"tracks": [
|
"tracks": [
|
||||||
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
|
{"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>",},
|
{"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",},
|
],"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,
|
"visibleRange": null,
|
||||||
"lockOrigin": false,
|
"lockOrigin": false,
|
||||||
"showBackdrop": true,
|
"showBackdrop": true,
|
||||||
"showBackdropImage": false,
|
"showBackdropImage": false,
|
||||||
"backdropImagePath": "",
|
"backdropImagePath": "",
|
||||||
"backdropImageOpacity": 0.5,
|
"backdropImageOpacity": 0.5,
|
||||||
"backdropWidth": 1366,
|
"backdropWidth": 1366,
|
||||||
"backdropHeight": 768,
|
"backdropHeight": 768,
|
||||||
"backdropXOffset": 0.0,
|
"backdropXOffset": 0.0,
|
||||||
"backdropYOffset": 0.0,
|
"backdropYOffset": 0.0,
|
||||||
"xorigin": 0,
|
"xorigin": 0,
|
||||||
"yorigin": 0,
|
"yorigin": 0,
|
||||||
"eventToFunction": {},
|
"eventToFunction": {},
|
||||||
"eventStubScript": null,
|
"eventStubScript": null,
|
||||||
"parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
"parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
|
||||||
"resourceVersion": "1.3",
|
"resourceVersion": "1.3",
|
||||||
"name": "sSword",
|
"name": "sSword",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSequence",
|
"resourceType": "GMSequence",
|
||||||
},
|
},
|
||||||
"layers": [
|
"layers": [
|
||||||
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
{"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",},
|
||||||
],
|
],
|
||||||
"parent": {
|
"parent": {
|
||||||
"name": "Sprites",
|
"name": "Sprites",
|
||||||
"path": "folders/Sprites.yy",
|
"path": "folders/Sprites.yy",
|
||||||
},
|
},
|
||||||
"resourceVersion": "1.0",
|
"resourceVersion": "1.0",
|
||||||
"name": "sSword",
|
"name": "sSword",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMSprite",
|
"resourceType": "GMSprite",
|
||||||
}
|
}
|
||||||
78
sprites/sSword/sSword.yy~HEAD
Normal file
78
sprites/sSword/sSword.yy~HEAD
Normal file
|
|
@ -0,0 +1,78 @@
|
||||||
|
{
|
||||||
|
"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",
|
||||||
|
}
|
||||||
158
sprites/sSword/sSword.yy~master
Normal file
158
sprites/sSword/sSword.yy~master
Normal file
|
|
@ -0,0 +1,158 @@
|
||||||
|
<<<<<<< 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
|
||||||
|
}
|
||||||
Reference in a new issue