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

Adds partial ui::Layout support #155

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Adds partial ui::Layout support #155

wants to merge 16 commits into from

Commits on Feb 5, 2018

  1. whitespace

    @tankorsmash
    tankorsmash committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    d99e599 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. move repeated ifs into a object map

    @tankorsmash
    tankorsmash committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    290b1a9 View commit details
    Browse the repository at this point in the history

  2. first pass at adding in Layout support to flatbuffer

    @tankorsmash
    tankorsmash committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    0afdd6a View commit details
    Browse the repository at this point in the history

  3. update .gitignore to ignore vim files

    @tankorsmash
    tankorsmash committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    a8b12ac View commit details
    Browse the repository at this point in the history

  4. fix fbs syntax and compile

    @tankorsmash
    tankorsmash committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    3c2b1f0 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. whitespace

    @tankorsmash
    tankorsmash committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    b63a1a6 View commit details
    Browse the repository at this point in the history

  2. add Layout.js base for parser

    @tankorsmash
    tankorsmash committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    54d21ff View commit details
    Browse the repository at this point in the history

  3. update CreatorReader.fbs to include Layout, update parser/Node.js to … 

    …recognize Layout before Sprite
    @tankorsmash
    tankorsmash committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    1bb97fb View commit details
    Browse the repository at this point in the history

  4. start on layout child inclusion

    @tankorsmash
    tankorsmash committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    4c8c084 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. clean up parser/Utils' if statement

    @tankorsmash
    tankorsmash committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    0bcc0a5 View commit details
    Browse the repository at this point in the history

  2. add fixme note to 'building in progress' warning

    @tankorsmash
    tankorsmash committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    3039c70 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Add cocos2d::ui::Layout::Type support to creator 

    I'm assuming RELATIVE is the same as GRID
    @tankorsmash
    tankorsmash committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    1309a4e View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. rename type to layoutType, remove prints, add background color from Node

    @tankorsmash
    tankorsmash committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    7394bc5 View commit details
    Browse the repository at this point in the history

  2. turn DEBUG back off

    @tankorsmash
    tankorsmash committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    309a28a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. if the layout's sprite is disabled in creator, hide the layout's back… 

    …ground in cocos
    @tankorsmash
    tankorsmash committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    4fbea65 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. delete convert_fire_to_json.py on layout support branch 

    it was previously deleted in master
    @tankorsmash
    tankorsmash committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    e2cd4bf View commit details
    Browse the repository at this point in the history