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

GUI integration of import and export #26

Merged
merged 18 commits into from
Mar 10, 2021
Merged

GUI integration of import and export #26

merged 18 commits into from
Mar 10, 2021

Commits on Mar 9, 2021

  1. Editor integration 

    Added two functions for importing animations.
They work much like importspritesheet
    @HannesSundin
    HannesSundin committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    9c64b2c View commit details
    Browse the repository at this point in the history

  2. Update Editor.java 

    Changed imports
    @HannesSundin
    HannesSundin committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    cb98f95 View commit details
    Browse the repository at this point in the history

  3. Update ResourcesMenu.java 

    Added UI elements to resourcemenu for import
    @HannesSundin
    HannesSundin committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    eccad3c View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Update AssetPanelItem.java 

    Integration for export. Changed if else statements to switch
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    772565a View commit details
    Browse the repository at this point in the history

  2. Update AsepriteHandler.java 

    Added static modifiers
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    61878d8 View commit details
    Browse the repository at this point in the history

  3. Update AsepriteHandler.java 

    Forgot a field
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    8e5d51d View commit details
    Browse the repository at this point in the history

  4. Update strings.properties 

    Added string resource for import animation
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    4336bc9 View commit details
    Browse the repository at this point in the history

  5. Update AssetPanelItem.java 

    Added json option
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    34d8a01 View commit details
    Browse the repository at this point in the history

  6. Update AsepriteHandler.java 

    Ran autoformat
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    8581bbc View commit details
    Browse the repository at this point in the history

  7. Update AsepriteHandlerTests.java 

    Ran autoformat
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    865a105 View commit details
    Browse the repository at this point in the history

  8. Merge Changes from Issue/321

    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    27942cc View commit details
    Browse the repository at this point in the history

  9. Update AsepriteHandler.java

    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    5597332 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'issue/321' into issue/15

    Daniel Halvarsson committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    c687257 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'issue/15' of https://github.com/DD2480-Group-11/litiengine 

     into issue/15
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    cecd806 View commit details
    Browse the repository at this point in the history

  12. Added caught exceptions 

    catches the right exceptions and logs them
    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    bbf1457 View commit details
    Browse the repository at this point in the history

  13. Fix formatting

    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    00842cc View commit details
    Browse the repository at this point in the history

  14. Fix format in AssetPanelItem.exportspriteSheet

    @HannesSundin
    HannesSundin committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    c8a0bae View commit details
    Browse the repository at this point in the history

  15. Fix formatting

    Daniel Halvarsson committed Mar 10, 2021
    Configuration menu
    Copy the full SHA
    ad99750 View commit details
    Browse the repository at this point in the history