Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Aseprite export format (.json) for animations #379

Closed
wants to merge 67 commits into from
Closed

Support Aseprite export format (.json) for animations #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
850ad90
Add gson dependency
Mar 4, 2021
7a0f8f5
Add new file AsepriteHandler.java
Mar 4, 2021
083e2c4
Fix access modifiers in Animation to support exporting Json
nwessman Mar 8, 2021
5fc9246
Add object structure for aseprite json
nwessman Mar 8, 2021
7f06243
Revert "Fix access modifiers in Animation to support exporting Json"
nwessman Mar 8, 2021
7e53123
Add functionality to create json with frames object
nwessman Mar 8, 2021
77b10c4
Fix index of json frames
nwessman Mar 8, 2021
d872f4a
Add spritesheet for testing
nwessman Mar 8, 2021
d071aef
Add tests for exportAnimation
nwessman Mar 8, 2021
c746954
Add meta object to json in animationExport
nwessman Mar 8, 2021
1721274
Add closing bracket to aseprite json
nwessman Mar 8, 2021
0a638d8
Fix absolute path to spritesheet
nwessman Mar 8, 2021
8b8a493
Add import functionality for Aseprite animations
Mar 8, 2021
0cc51f5
Add test animations used to test Aseprite import
Mar 8, 2021
61ad827
Add unit test for Aseprite animation import
Mar 8, 2021
3415a7a
Add javadoc comments to export
nwessman Mar 8, 2021
5867e48
Fix test print json
nwessman Mar 8, 2021
88f1d8a
Add some unit tests to verify the exceptions.
audreyeternal Mar 9, 2021
e54f445
Fix formatting
Mar 9, 2021
49a7021
Remove redundancy
Mar 9, 2021
e6512f6
Merge branch 'issue/321' into issue/12
Mar 9, 2021
2163073
Merge pull request #20 from DD2480-Group-11/issue/12
danhalv Mar 9, 2021
64c8def
Change export argument from Animation to SpritesheetResource
nwessman Mar 9, 2021
77ebd3d
Fix test so it uses SpritesourceResource
nwessman Mar 9, 2021
dc289ed
Merge pull request #21 from DD2480-Group-11/fix_spritesheetresource_o…
nwessman Mar 9, 2021
9c64b2c
Editor integration
HannesSundin Mar 9, 2021
cb98f95
Update Editor.java
HannesSundin Mar 9, 2021
eccad3c
Update ResourcesMenu.java
HannesSundin Mar 9, 2021
51b9171
Add some unit tests to exportAnimation method.
audreyeternal Mar 9, 2021
772565a
Update AssetPanelItem.java
HannesSundin Mar 10, 2021
61878d8
Update AsepriteHandler.java
HannesSundin Mar 10, 2021
8e5d51d
Update AsepriteHandler.java
HannesSundin Mar 10, 2021
4336bc9
Update strings.properties
HannesSundin Mar 10, 2021
34d8a01
Update AssetPanelItem.java
HannesSundin Mar 10, 2021
8581bbc
Update AsepriteHandler.java
HannesSundin Mar 10, 2021
865a105
Update AsepriteHandlerTests.java
HannesSundin Mar 10, 2021
5f80679
Improve spritesheet file search for Aseprite import
Mar 10, 2021
4d42a00
Merge pull request #24 from DD2480-Group-11/issue/12
danhalv Mar 10, 2021
27942cc
Merge Changes from Issue/321
HannesSundin Mar 10, 2021
5597332
Update AsepriteHandler.java
HannesSundin Mar 10, 2021
c687257
Merge branch 'issue/321' into issue/15
Mar 10, 2021
cecd806
Merge branch 'issue/15' of https://github.com/DD2480-Group-11/litieng…
HannesSundin Mar 10, 2021
bbf1457
Added caught exceptions
HannesSundin Mar 10, 2021
00842cc
Fix formatting
HannesSundin Mar 10, 2021
c8a0bae
Fix format in AssetPanelItem.exportspriteSheet
HannesSundin Mar 10, 2021
ad99750
Fix formatting
Mar 10, 2021
e3df2aa
Merge pull request #26 from DD2480-Group-11/issue/15
danhalv Mar 10, 2021
0d397b7
Merge branch 'issue/321' into Yu_assignment4.
audreyeternal Mar 10, 2021
692f422
Modify spritesheet searching in Aseprite import
Mar 10, 2021
8fb5d37
Remove unused method
Mar 10, 2021
4bff7ab
Remove unused imports
Mar 10, 2021
e55c34d
Merge branch 'issue/321' of https://github.com/DD2480-Group-11/litien…
audreyeternal Mar 10, 2021
e359ce3
Add some unit tests for exportAnimation method.
audreyeternal Mar 10, 2021
fc0f4c1
Add some unit tests to importAnimation method.
audreyeternal Mar 10, 2021
98affeb
Refactor the exportAnimationTest.
audreyeternal Mar 10, 2021
a94824e
Delete the faulty test.
audreyeternal Mar 10, 2021
20574be
Merge pull request #28 from DD2480-Group-11/issue/22
nwessman Mar 10, 2021
28e0bf5
Resolve merge conflict.
audreyeternal Mar 10, 2021
8d867ed
Merge pull request #29 from DD2480-Group-11/issue/27
nwessman Mar 10, 2021
ec12f2f
Fix formatting
Mar 10, 2021
d1cc4e6
Fix formatting
Mar 10, 2021
ce1269b
Remove unused imports
Gamebuster19901 Mar 16, 2021
03ad6ac
Subclass IOException not Error
Gamebuster19901 Mar 16, 2021
920ddd2
Fix build error
Gamebuster19901 Mar 16, 2021
7d657a2
Remove unused imports
Gamebuster19901 Mar 16, 2021
3144975
Merge pull request #30 from Gamebuster19901/issue/321
nwessman Mar 16, 2021
f06ad52
Update AssetPanelItem.java
HannesSundin Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ dependencies {
implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
implementation 'com.sun.xml.bind:jaxb-impl:2.3.2'

implementation 'com.google.code.gson:gson:2.8.6'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.6.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
Expand Down
Loading