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

Ticket #15 - inheritance / composition #165

Merged
merged 8 commits into from
Mar 3, 2013
Merged

Ticket #15 - inheritance / composition #165

merged 8 commits into from
Mar 3, 2013

Commits on Feb 13, 2013

  1. ticket #15 : first pass update

    obiot committed Feb 13, 2013
    3 Configuration menu
    Copy the full SHA
    340c817 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2013

  1. backporting some change to avoid merge conflict with main branch

    obiot committed Feb 27, 2013
    Configuration menu
    Copy the full SHA
    c8ab858 View commit details
    Browse the repository at this point in the history

  2. manually merging changes from main branch

    obiot committed Feb 27, 2013
    Configuration menu
    Copy the full SHA
    69dfca8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ticket-15 

    Conflicts:
	src/entity/entity.js
    Jason Oster committed Feb 27, 2013
    Configuration menu
    Copy the full SHA
    86c110e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2013

  1. further commits on ticket#15 

    - rename the `anim` property to `renderable`
- new `me.Renderable` class from which `me.SpriteObject` inherits
- renderable ojbect position is relative to the entity position
- fix small issue with uipdate function when flickering
    obiot committed Mar 3, 2013
    Configuration menu
    Copy the full SHA
    d7231a0 View commit details
    Browse the repository at this point in the history

  2. renamed this variable

    obiot committed Mar 3, 2013
    Configuration menu
    Copy the full SHA
    62b317d View commit details
    Browse the repository at this point in the history

  3. Removed the me.InvisibleEntity as it does not contain anything anymore

    obiot committed Mar 3, 2013
    Configuration menu
    Copy the full SHA
    54960a6 View commit details
    Browse the repository at this point in the history

  4. updated other examples

    obiot committed Mar 3, 2013
    Configuration menu
    Copy the full SHA
    76715a9 View commit details
    Browse the repository at this point in the history