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

Jump to bottom

Implement RpTools RpMap format #2926

Merged
merged 29 commits into from
Nov 24, 2020
Merged

Implement RpTools RpMap format #2926

merged 29 commits into from
Nov 24, 2020

Commits on Nov 1, 2020

  1. Empty skeleton of the rpmap export (creates dummy zip file for now)

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    946192b View commit details
    Browse the repository at this point in the history

  2. more complete (and less buggy export), gives a null pointer exception… 

    … in zone, though
    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    b5cd5cf View commit details
    Browse the repository at this point in the history

  3. even though the tiles are invisible (but present) the file is now loa… 

    …dable into maptool without error
    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    de3249b View commit details
    Browse the repository at this point in the history

  4. this small difference makes the tiles visible

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    0e74e27 View commit details
    Browse the repository at this point in the history

  5. fully operational export to rpmap, the rotation is wrong, though

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    7161f3e View commit details
    Browse the repository at this point in the history

  6. correct rotation of exported tiles (270 is unmodified)

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    eb1baf0 View commit details
    Browse the repository at this point in the history

  7. remove qmake files for the new project and conditionally compile rpma… 

    …p plugin

This makes building rpmap plugin depend on projects.Tiled.enableKArchive:true
    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    ee54c65 View commit details
    Browse the repository at this point in the history

  8. make the static variables class members (cleanup)

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    ce329e1 View commit details
    Browse the repository at this point in the history

  9. The last commit was incomplete (I didn't save all buffers)

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    a932d80 View commit details
    Browse the repository at this point in the history

  10. Squashed 'src/KArchive/' content from commit 0d55829a 

    git-subtree-dir: src/KArchive
git-subtree-split: 0d55829a2ce093e83c68ac0d1cbef8b6a1814332
    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    9fb241a View commit details
    Browse the repository at this point in the history

  11. import KArchive tree

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    3574278 View commit details
    Browse the repository at this point in the history

  12. Add qbs scripts for KArchive and use in rpmap plugin

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    43c4b1d View commit details
    Browse the repository at this point in the history

  13. These magic incantations from libtiled hopefully fix Win+Mac builds

    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    6e6c50d View commit details
    Browse the repository at this point in the history

  14. Add missing logging source file 

    (somehow the Linux build manages without)
    @cpetig
    cpetig committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    523df24 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. Some code styling adjustments

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    fdff36e View commit details
    Browse the repository at this point in the history

  2. Trimmed down KArchive copy and renamed to lowercase 

    Removed autotests, tests, examples, etc.
    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    28c9ec5 View commit details
    Browse the repository at this point in the history

  3. Qbs: Tweaks 

    * Export needed include dir and defines from karchive product

* Require Qt 5.12 for RpMap plugin and automatically disable it for
  older versions
    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    faf5a79 View commit details
    Browse the repository at this point in the history

  4. See if we can run CodeQL workflow on a more recent Ubuntu

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    d007889 View commit details
    Browse the repository at this point in the history

  5. Qbs: Try to fix disabling of RpMap / karchive products for Qt 5.6

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    44d0d95 View commit details
    Browse the repository at this point in the history

  6. KArchive: Disable deprecated stuff (might help fix MSVC compile)

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    f2093bb View commit details
    Browse the repository at this point in the history

  7. Attempt to fix MSVC compile issues 

    Needs some adjustements for prefixed zlib
    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    cb55094 View commit details
    Browse the repository at this point in the history

  8. Another prefixing fix

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    3d0de81 View commit details
    Browse the repository at this point in the history

  9. Another attempt at fixing MSVC compile

    @bjorn
    bjorn committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    f203198 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. Try fixing MSVC linker error 

    Though, could be that this lib should be linked to the rpmap plugin.
    @bjorn
    bjorn committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    b605e6a View commit details
    Browse the repository at this point in the history

  2. AppVeyor: Be less specific with the Qt version 

    To avoid it from breaking when they update the version.
    @bjorn
    bjorn committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    e98c736 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. Try linking Userenv to plugin instead of static lib

    @bjorn
    bjorn committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    a60acd2 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. RpMap plugin: Disable the plugin for MSVC 

    The karchive.lib file has an unresolved external symbol which I'm not
sure how to fix right now (tried linking to "Userenv" but it didn't seem
to help). Since we don't absolutely need this plugin to work when
compiling with MSVC (since Windows Tiled releases are built with MinGW),
automatically disable it instead.

The error was:

karchive.lib(karchive.cpp.obj) : error LNK2019: unresolved external symbol __imp_GetUserNameW referenced in function "class QString __cdecl getCurrentUserName(void)" (?getCurrentUserName@@ya?AVQString@@xz)
C:\projects\tiled\release\rpmap.bf8dc609\rpmap.dll : fatal error LNK1120: 1 unresolved externals
    @bjorn
    bjorn committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    336bab5 View commit details
    Browse the repository at this point in the history

  2. RpMap plugin: Fixed copyright notice

    @bjorn
    bjorn committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    4881c74 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Merge branch 'master' into cpetig-feature_2922

    @bjorn
    bjorn committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    31e6b5b View commit details
    Browse the repository at this point in the history