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

Wang Tiles #1582

Merged
merged 26 commits into from
Jul 4, 2017
Merged

Wang Tiles #1582

merged 26 commits into from
Jul 4, 2017

Commits on May 28, 2017

  1. Created WangSet class, as well as some functions for wangIds

    @Bdtrotte
    Bdtrotte committed May 28, 2017
    Configuration menu
    Copy the full SHA
    904e8bc View commit details
    Browse the repository at this point in the history

Commits on May 29, 2017

  1. Moved wangId into a class of its own

    @Bdtrotte
    Bdtrotte committed May 29, 2017
    Configuration menu
    Copy the full SHA
    cb8d9ae View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. Merge branch 'master' into WangTiles

    @Bdtrotte
    Bdtrotte committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    e93cc74 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. Merge branch 'master' of https://github.com/bjorn/tiled into WangTiles

    @Bdtrotte
    Bdtrotte committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    c329a97 View commit details
    Browse the repository at this point in the history

  2. Refined WangSet class, and added them into Tileset

    @Bdtrotte
    Bdtrotte committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    4757fb6 View commit details
    Browse the repository at this point in the history

  3. Made requested changes

    @Bdtrotte
    Bdtrotte committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    31689c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. Enabled file saving and loading. (Needs testing)

    @Bdtrotte
    Bdtrotte committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    e10151e View commit details
    Browse the repository at this point in the history

  2. Fixed some issues with saving/loading

    @willt @Bdtrotte
    willt authored and Bdtrotte committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    c7e67d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. Style update

    @Bdtrotte
    Bdtrotte committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    0ef5add View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Foundation for adding UI support to wangTile assignment

    @Bdtrotte
    Bdtrotte committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    74dbae3 View commit details
    Browse the repository at this point in the history

  2. merged upstream

    @Bdtrotte
    Bdtrotte committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    400d47c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. Added a couple Undo commands, and made a bit more progress on the mod… 

    …els and views.
    @Bdtrotte
    Bdtrotte committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    ff6c624 View commit details
    Browse the repository at this point in the history

  2. WangSets are now able to be created and edited from the ui

    @Bdtrotte
    Bdtrotte committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    3916cd6 View commit details
    Browse the repository at this point in the history

  3. Added new files to tiled.pro

    @Bdtrotte
    Bdtrotte committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    acae98a View commit details
    Browse the repository at this point in the history

  4. adjusted reading/writting so that all the wang set info (including ti… 

    …les) stays grouped together
    @Bdtrotte
    Bdtrotte committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    68bd9af View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2017

  1. Cleaned up a few things

    @Bdtrotte
    Bdtrotte committed Jun 29, 2017
    Configuration menu
    Copy the full SHA
    52ae862 View commit details
    Browse the repository at this point in the history

  2. remoced references to 'addremocewangset

    @Bdtrotte
    Bdtrotte committed Jun 29, 2017
    Configuration menu
    Copy the full SHA
    4398cea View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2017

  1. Now can assign wangsets an image, added functions for getting the wan… 

    …gId based on surrounding tiles.
    @Bdtrotte
    Bdtrotte committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    7f58709 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2017

  1. Beging to store info about tile rotation and inversion

    @Bdtrotte
    Bdtrotte committed Jul 2, 2017
    Configuration menu
    Copy the full SHA
    bb6b98a View commit details
    Browse the repository at this point in the history

  2. Wangsets now store info about rotation and flipping, mapreader/writer… 

    … reflects this
    @Bdtrotte
    Bdtrotte committed Jul 2, 2017
    Configuration menu
    Copy the full SHA
    0969d46 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. Merge branch 'wip/wangtiles' into WangTiles

    @Bdtrotte
    Bdtrotte committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    8b959a9 View commit details
    Browse the repository at this point in the history

  2. Made requested changes

    @Bdtrotte
    Bdtrotte committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    1df48f5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'WangTiles' of https://github.com/Bdtrotte/tiled into Wa… 

    …ngTiles
    @Bdtrotte
    Bdtrotte committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    25f8494 View commit details
    Browse the repository at this point in the history

  4. fixed issue in 'wangIdFromSurrounding'

    @Bdtrotte
    Bdtrotte committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    888ea7b View commit details
    Browse the repository at this point in the history

  5. Made requested changes!

    @Bdtrotte
    Bdtrotte committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    825774a View commit details
    Browse the repository at this point in the history

  6. Removed file that should not be in version control

    @bjorn
    bjorn committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    0d3f353 View commit details
    Browse the repository at this point in the history