Merge remote-tracking branch 'origin/assets' into player_texturing
This commit is contained in:
commit
3d4cf226b6
BIN
assets/img/character/diveNormal.aseprite
Normal file
BIN
assets/img/character/diveNormal.aseprite
Normal file
Binary file not shown.
82
assets/img/character/diveNormal.json
Normal file
82
assets/img/character/diveNormal.json
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
{ "frames": {
|
||||||
|
"Sprite-0005 0.": {
|
||||||
|
"frame": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 1.": {
|
||||||
|
"frame": { "x": 11, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 2.": {
|
||||||
|
"frame": { "x": 22, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 3.": {
|
||||||
|
"frame": { "x": 33, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 4.": {
|
||||||
|
"frame": { "x": 44, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 5.": {
|
||||||
|
"frame": { "x": 55, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 6.": {
|
||||||
|
"frame": { "x": 66, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"Sprite-0005 7.": {
|
||||||
|
"frame": { "x": 77, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meta": {
|
||||||
|
"app": "http://www.aseprite.org/",
|
||||||
|
"version": "1.2.27-x64",
|
||||||
|
"image": "diveNormal.png",
|
||||||
|
"format": "RGBA8888",
|
||||||
|
"size": { "w": 88, "h": 21 },
|
||||||
|
"scale": "1",
|
||||||
|
"frameTags": [
|
||||||
|
],
|
||||||
|
"layers": [
|
||||||
|
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
|
||||||
|
],
|
||||||
|
"slices": [
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
BIN
assets/img/character/diveNormal.png
Normal file
BIN
assets/img/character/diveNormal.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 657 B |
BIN
assets/img/character/diveStroke.aseprite
Normal file
BIN
assets/img/character/diveStroke.aseprite
Normal file
Binary file not shown.
186
assets/img/character/diveStroke.json
Normal file
186
assets/img/character/diveStroke.json
Normal file
@ -0,0 +1,186 @@
|
|||||||
|
{ "frames": {
|
||||||
|
"diveStroke 0.aseprite": {
|
||||||
|
"frame": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 1.aseprite": {
|
||||||
|
"frame": { "x": 17, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 2.aseprite": {
|
||||||
|
"frame": { "x": 34, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 3.aseprite": {
|
||||||
|
"frame": { "x": 51, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 4.aseprite": {
|
||||||
|
"frame": { "x": 68, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 5.aseprite": {
|
||||||
|
"frame": { "x": 85, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 6.aseprite": {
|
||||||
|
"frame": { "x": 102, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 7.aseprite": {
|
||||||
|
"frame": { "x": 119, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 8.aseprite": {
|
||||||
|
"frame": { "x": 136, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 9.aseprite": {
|
||||||
|
"frame": { "x": 153, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 10.aseprite": {
|
||||||
|
"frame": { "x": 170, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 11.aseprite": {
|
||||||
|
"frame": { "x": 187, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 12.aseprite": {
|
||||||
|
"frame": { "x": 204, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 13.aseprite": {
|
||||||
|
"frame": { "x": 221, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 14.aseprite": {
|
||||||
|
"frame": { "x": 238, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 15.aseprite": {
|
||||||
|
"frame": { "x": 255, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 16.aseprite": {
|
||||||
|
"frame": { "x": 272, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 17.aseprite": {
|
||||||
|
"frame": { "x": 289, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 18.aseprite": {
|
||||||
|
"frame": { "x": 306, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 19.aseprite": {
|
||||||
|
"frame": { "x": 323, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
},
|
||||||
|
"diveStroke 20.aseprite": {
|
||||||
|
"frame": { "x": 340, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 17, "h": 21 },
|
||||||
|
"sourceSize": { "w": 17, "h": 21 },
|
||||||
|
"duration": 75
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meta": {
|
||||||
|
"app": "http://www.aseprite.org/",
|
||||||
|
"version": "1.2.27-x64",
|
||||||
|
"image": "diveStroke.png",
|
||||||
|
"format": "RGBA8888",
|
||||||
|
"size": { "w": 357, "h": 21 },
|
||||||
|
"scale": "1",
|
||||||
|
"frameTags": [
|
||||||
|
],
|
||||||
|
"layers": [
|
||||||
|
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
|
||||||
|
],
|
||||||
|
"slices": [
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
BIN
assets/img/character/diveStroke.png
Normal file
BIN
assets/img/character/diveStroke.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
BIN
assets/img/character/diveStrokeCharge.aseprite
Normal file
BIN
assets/img/character/diveStrokeCharge.aseprite
Normal file
Binary file not shown.
50
assets/img/character/diveStrokeCharge.json
Normal file
50
assets/img/character/diveStrokeCharge.json
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
{ "frames": {
|
||||||
|
"diveStroke 0.aseprite": {
|
||||||
|
"frame": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"diveStroke 1.aseprite": {
|
||||||
|
"frame": { "x": 11, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"diveStroke 2.aseprite": {
|
||||||
|
"frame": { "x": 22, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
},
|
||||||
|
"diveStroke 3.aseprite": {
|
||||||
|
"frame": { "x": 33, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"rotated": false,
|
||||||
|
"trimmed": false,
|
||||||
|
"spriteSourceSize": { "x": 0, "y": 0, "w": 11, "h": 21 },
|
||||||
|
"sourceSize": { "w": 11, "h": 21 },
|
||||||
|
"duration": 100
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"meta": {
|
||||||
|
"app": "http://www.aseprite.org/",
|
||||||
|
"version": "1.2.27-x64",
|
||||||
|
"image": "diveStrokeCharge.png",
|
||||||
|
"format": "RGBA8888",
|
||||||
|
"size": { "w": 44, "h": 21 },
|
||||||
|
"scale": "1",
|
||||||
|
"frameTags": [
|
||||||
|
],
|
||||||
|
"layers": [
|
||||||
|
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
|
||||||
|
],
|
||||||
|
"slices": [
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
BIN
assets/img/character/diveStrokeCharge.png
Normal file
BIN
assets/img/character/diveStrokeCharge.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 666 B |
BIN
assets/img/character/walk1.png
Normal file
BIN
assets/img/character/walk1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 402 B |
BIN
assets/img/tiles/tileset.png
Normal file
BIN
assets/img/tiles/tileset.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 894 B |
Reference in New Issue
Block a user