-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #38 from ptr-geeks/mother-of-prs
Merged multiple PR(s) into a single one to avoid constant conflicts
- Loading branch information
Showing
12 changed files
with
478 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "animation.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 1541, | ||
| "h": 969 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "frame2", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 516, | ||
| "y": 289, | ||
| "w": 590, | ||
| "h": 479 | ||
| }, | ||
| "frame": { | ||
| "x": 1, | ||
| "y": 1, | ||
| "w": 590, | ||
| "h": 479 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame4", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 621, | ||
| "y": 248, | ||
| "w": 502, | ||
| "h": 536 | ||
| }, | ||
| "frame": { | ||
| "x": 593, | ||
| "y": 1, | ||
| "w": 502, | ||
| "h": 536 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame3", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 535, | ||
| "y": 283, | ||
| "w": 569, | ||
| "h": 485 | ||
| }, | ||
| "frame": { | ||
| "x": 1, | ||
| "y": 482, | ||
| "w": 569, | ||
| "h": 485 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame1", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 576, | ||
| "y": 305, | ||
| "w": 472, | ||
| "h": 420 | ||
| }, | ||
| "frame": { | ||
| "x": 572, | ||
| "y": 539, | ||
| "w": 472, | ||
| "h": 420 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame5", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 658, | ||
| "y": 323, | ||
| "w": 468, | ||
| "h": 429 | ||
| }, | ||
| "frame": { | ||
| "x": 1046, | ||
| "y": 539, | ||
| "w": 468, | ||
| "h": 429 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame6", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 694, | ||
| "y": 297, | ||
| "w": 443, | ||
| "h": 444 | ||
| }, | ||
| "frame": { | ||
| "x": 1097, | ||
| "y": 1, | ||
| "w": 443, | ||
| "h": 444 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:5b4de8a079910a43e5c9ddefd13da561:4fb163a2da5cd6b5ca6496bfbb4921a1:9a4e7f1aae4f9765a57ff756284ef5fc$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "animation2.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 1702, | ||
| "h": 994 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "frame2.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 516, | ||
| "y": 289, | ||
| "w": 590, | ||
| "h": 479 | ||
| }, | ||
| "frame": { | ||
| "x": 1, | ||
| "y": 1, | ||
| "w": 590, | ||
| "h": 479 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "stand.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 745, | ||
| "y": 250, | ||
| "w": 311, | ||
| "h": 511 | ||
| }, | ||
| "frame": { | ||
| "x": 1, | ||
| "y": 482, | ||
| "w": 311, | ||
| "h": 511 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame3.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 535, | ||
| "y": 283, | ||
| "w": 569, | ||
| "h": 485 | ||
| }, | ||
| "frame": { | ||
| "x": 593, | ||
| "y": 1, | ||
| "w": 569, | ||
| "h": 485 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame4.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 621, | ||
| "y": 248, | ||
| "w": 502, | ||
| "h": 536 | ||
| }, | ||
| "frame": { | ||
| "x": 1164, | ||
| "y": 1, | ||
| "w": 502, | ||
| "h": 536 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame5.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 658, | ||
| "y": 323, | ||
| "w": 468, | ||
| "h": 429 | ||
| }, | ||
| "frame": { | ||
| "x": 314, | ||
| "y": 488, | ||
| "w": 468, | ||
| "h": 429 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame1.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 576, | ||
| "y": 305, | ||
| "w": 472, | ||
| "h": 420 | ||
| }, | ||
| "frame": { | ||
| "x": 784, | ||
| "y": 539, | ||
| "w": 472, | ||
| "h": 420 | ||
| } | ||
| }, | ||
| { | ||
| "filename": "frame6.png", | ||
| "rotated": false, | ||
| "trimmed": true, | ||
| "sourceSize": { | ||
| "w": 1920, | ||
| "h": 1080 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 694, | ||
| "y": 297, | ||
| "w": 443, | ||
| "h": 444 | ||
| }, | ||
| "frame": { | ||
| "x": 1258, | ||
| "y": 539, | ||
| "w": 443, | ||
| "h": 444 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:1b1de554e0d5bdb57dce22538a83bbe4:bf29212c1a0b37c35d82d4ad0fb9cd24:108a249494ab8159ef6be89ed9e13187$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.