Skip to content
Permalink
Branch: master
Commits on Oct 22, 2013
  1. Merge pull request #1 from jefftimesten/patch-1

    proalias committed Oct 22, 2013
    include SpriteDataParser
    
    (fixed missing include)
  2. include SpriteDataParser

    jeffcrouse committed Oct 22, 2013
Commits on Oct 15, 2013
  1. Merge branch 'master' of github.com:proalias/cinderblock-spritesheet

    proalias committed Oct 15, 2013
    Conflicts:
    	cinderblock.xml
  2. Fixed file pathing issue

    proalias committed Oct 15, 2013
Commits on Oct 11, 2013
  1. Added icon file

    proalias committed Oct 11, 2013
  2. Tidied

    proalias committed Oct 11, 2013
  3. Tidying...

    proalias committed Oct 11, 2013
  4. Updated vc11 project

    proalias committed Oct 11, 2013
  5. Added new project files

    proalias committed Oct 11, 2013
Commits on Oct 9, 2013
Commits on Feb 27, 2013
  1. Merge branch 'master' of https://github.com/proalias/cinderblock-spri…

    proalias committed Feb 27, 2013
    …tesheet
    
    Conflicts:
    	src/SpriteDataParser.cpp
    	src/SpriteSheet.cpp
    	src/SpriteSheet.h
Commits on Jan 22, 2013
  1. Fixed issue with alpha.

    proalias committed Jan 22, 2013
Commits on Jan 21, 2013
Commits on Jan 18, 2013
  1. Updates on playback

    proalias committed Jan 18, 2013
Commits on Dec 17, 2012
  1. Merge branch 'master' of https://github.com/proalias/cinderblock-spri…

    proalias committed Dec 17, 2012
    …tesheet
    
    Conflicts:
    	samples/SpriteSheetBunnyWalk/src/BunnyWalkSpriteSheetApp.cpp
    	src/SpriteSheet.cpp
    	src/SpriteSheet.h
  2. Added new properties etc.

    proalias committed Dec 17, 2012
Commits on Nov 28, 2012
Commits on Nov 12, 2012
  1. Removed suo

    proalias committed Nov 12, 2012
  2. Merge branch 'master' of https://github.com/proalias/cinderblock-spri…

    jonathoncurtis committed Nov 12, 2012
    …tesheet
    
    Conflicts:
    	samples/SpriteSheetBunnyWalk/vc10/BunnyWalkSpriteSheet.suo
  3. resources loading

    jonathoncurtis committed Nov 12, 2012
  4. aDDAD

    proalias committed Nov 12, 2012
  5. Almost there...

    proalias committed Nov 12, 2012
Commits on Nov 11, 2012
Commits on Nov 9, 2012
Older
You can’t perform that action at this time.