Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bitDecayGames/GMTK2024
Browse files Browse the repository at this point in the history
  • Loading branch information
Tanner committed Aug 18, 2024
2 parents 63a4845 + f6fcdfb commit f0a576e
Show file tree
Hide file tree
Showing 12 changed files with 1,195 additions and 322 deletions.
Binary file added art/acetelyne.aseprite
View file
Binary file not shown.
Binary file added art/explosion.aseprite
View file
Binary file not shown.
Binary file added art/spinningBottle.aseprite
View file
Binary file not shown.
Binary file modified art/tileset.aseprite
View file
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/aseprite/acetelyne.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ "frames": [
{
"filename": "acetelyne.aseprite",
"frame": { "x": 0, "y": 0, "w": 14, "h": 46 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 14, "h": 46 },
"sourceSize": { "w": 14, "h": 46 },
"duration": 100
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3-rc6-x64",
"image": "acetelyne.png",
"format": "RGBA8888",
"size": { "w": 14, "h": 46 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}
Binary file added assets/aseprite/acetelyne.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions assets/aseprite/explosion.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{ "frames": [
{
"filename": "explosion 0.aseprite",
"frame": { "x": 0, "y": 0, "w": 64, "h": 64 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
"sourceSize": { "w": 64, "h": 64 },
"duration": 100
},
{
"filename": "explosion 1.aseprite",
"frame": { "x": 64, "y": 0, "w": 64, "h": 64 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
"sourceSize": { "w": 64, "h": 64 },
"duration": 100
},
{
"filename": "explosion 2.aseprite",
"frame": { "x": 0, "y": 64, "w": 64, "h": 64 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
"sourceSize": { "w": 64, "h": 64 },
"duration": 100
},
{
"filename": "explosion 3.aseprite",
"frame": { "x": 64, "y": 64, "w": 64, "h": 64 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 64 },
"sourceSize": { "w": 64, "h": 64 },
"duration": 100
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3-rc6-x64",
"image": "explosion.png",
"format": "RGBA8888",
"size": { "w": 128, "h": 128 },
"scale": "1",
"frameTags": [
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}
Binary file added assets/aseprite/explosion.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
136 changes: 136 additions & 0 deletions assets/aseprite/spinningBottle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{ "frames": [
{
"filename": "spinningBottle 0.aseprite",
"frame": { "x": 0, "y": 0, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 1.aseprite",
"frame": { "x": 24, "y": 0, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 2.aseprite",
"frame": { "x": 48, "y": 0, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 3.aseprite",
"frame": { "x": 72, "y": 0, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 4.aseprite",
"frame": { "x": 0, "y": 24, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 5.aseprite",
"frame": { "x": 24, "y": 24, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 6.aseprite",
"frame": { "x": 48, "y": 24, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 7.aseprite",
"frame": { "x": 72, "y": 24, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 8.aseprite",
"frame": { "x": 0, "y": 48, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 9.aseprite",
"frame": { "x": 24, "y": 48, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 10.aseprite",
"frame": { "x": 48, "y": 48, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 11.aseprite",
"frame": { "x": 72, "y": 48, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
},
{
"filename": "spinningBottle 12.aseprite",
"frame": { "x": 0, "y": 0, "w": 24, "h": 24 },
"rotated": false,
"trimmed": false,
"spriteSourceSize": { "x": 0, "y": 0, "w": 24, "h": 24 },
"sourceSize": { "w": 24, "h": 24 },
"duration": 100
}
],
"meta": {
"app": "https://www.aseprite.org/",
"version": "1.3-rc6-x64",
"image": "spinningBottle.png",
"format": "RGBA8888",
"size": { "w": 96, "h": 72 },
"scale": "1",
"frameTags": [
{ "name": "spin", "from": 0, "to": 11, "direction": "forward", "color": "#000000ff" }
],
"layers": [
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
],
"slices": [
]
}
}
Binary file added assets/aseprite/spinningBottle.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/aseprite/tileset.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f0a576e

Please sign in to comment.