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

TIMOB-8814 - Simple animation #35

Merged
merged 13 commits into from
May 17, 2013
Merged

TIMOB-8814 - Simple animation #35

merged 13 commits into from
May 17, 2013

Commits on May 3, 2013

  1. Basic animation implementation

    @pec1985
    pec1985 committed May 3, 2013
    Configuration menu
    Copy the full SHA
    3829dcf View commit details
    Browse the repository at this point in the history

  2. typo

    @pec1985
    pec1985 committed May 3, 2013
    Configuration menu
    Copy the full SHA
    22f3b8b View commit details
    Browse the repository at this point in the history

Commits on May 6, 2013

  1. Added animation callback

    @pec1985
    pec1985 committed May 6, 2013
    Configuration menu
    Copy the full SHA
    99af00f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/master' into timob-8814 

    Conflicts:
	src/tibb/NativeObjectFactory.cpp
    @pec1985
    pec1985 committed May 6, 2013
    Configuration menu
    Copy the full SHA
    0b4ecf5 View commit details
    Browse the repository at this point in the history

  3. added NativeAnimationObject back to NativeObjectFactory

    @pec1985
    pec1985 committed May 6, 2013
    Configuration menu
    Copy the full SHA
    f24cef1 View commit details
    Browse the repository at this point in the history

  4. added support for width and height

    @pec1985
    pec1985 committed May 6, 2013
    Configuration menu
    Copy the full SHA
    f110388 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2013

  1. removed comments

    @pec1985
    pec1985 committed May 7, 2013
    Configuration menu
    Copy the full SHA
    61b6a4e View commit details
    Browse the repository at this point in the history

Commits on May 14, 2013

  1. Addressed comments in pull request

    @pec1985
    pec1985 committed May 14, 2013
    Configuration menu
    Copy the full SHA
    bc621bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/master' into timob-8814 

    Conflicts:
	src/tibb/NativeObject.h
	src/tibb/TiUIObject.cpp
	src/tibb/TiUIObject.h
    @pec1985
    pec1985 committed May 14, 2013
    Configuration menu
    Copy the full SHA
    86dffcf View commit details
    Browse the repository at this point in the history

  3. Fixed merge

    @pec1985
    pec1985 committed May 14, 2013
    Configuration menu
    Copy the full SHA
    193b549 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/master' into timob-8814 

    Conflicts:
	src/tibb/NativeControlObject.cpp
	src/tibb/NativeControlObject.h
	src/tibb/NativeObjectFactory.cpp
    @pec1985
    pec1985 committed May 14, 2013
    Configuration menu
    Copy the full SHA
    968979d View commit details
    Browse the repository at this point in the history

  5. removed getStdString

    @pec1985
    pec1985 committed May 14, 2013
    Configuration menu
    Copy the full SHA
    ec142f9 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2013

  1. Merge branch 'refs/heads/master' into timob-8814 

    Conflicts:
	src/tibb/NativeObjectFactory.cpp
	src/tibb/TiUIObject.cpp
    @pec1985
    pec1985 committed May 17, 2013
    Configuration menu
    Copy the full SHA
    d5729da View commit details
    Browse the repository at this point in the history