{"shas":[["4ce149747cfefef38fd1d8b42390fc8db734fabf","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Merge branch 'master' into develop - Sprite list is broken\n\nConflicts:\n\tClasses/CSObjectController.h\n\tClasses/CSObjectController.m\n\tResources/English.lproj/MainMenu.xib\n\tcocoshop.xcodeproj/project.pbxproj","Stepan Generalov"],["4c028ced95b63c47f36f71a6b35ee5d8db566d4f","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Fixed Sprite Table - reloadData after adding Sprites.","Stepan Generalov"],["7133b185dedd603cedec93376a83a88d076f9067","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Trying to fix crashes - updateSprites from Cocos thread","Stepan Generalov"],["deabd2b65366ccd3e273a61c8bc58e542defa262","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Temporaly disabled position label due to crashes","Stepan Generalov"],["10c26c3c6c97f9e9ff81cbe1fe12ede09186ddc4","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Syncronized models spriteDictionary - crashes are fixed now","Stepan Generalov"],["18e22573e3ad1a1bfe756c17068875cf8b666fd3","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Revert \"Temporaly disabled position label due to crashes\"\n\nThis reverts commit deabd2b65366ccd3e273a61c8bc58e542defa262.","Stepan Generalov"],["f19c295e8066c51840d820f22c5d7a02e0a208ba","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Fixing crashes: Update positionLabel on Cocos2D thread","Stepan Generalov"],["c3e37cd04c8d3903a645feeb5fdf6d7a1345e6d7","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","More thread safety: add sprites on cocos2d thread only. Fixes crashes.","Stepan Generalov"],["19b02083502dc1d4bbe1d902dbdda4cb1c300fb7","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","GLView is stretchable now.","Stepan Generalov"],["ed527befd9f8316d234282b8250e96f409ccaa7f","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Added PRFilledPolygon. TODO: make it sctretchable too","Stepan Generalov"],["af6eb1a8af0fb8b2abd234abeaa0dad0ba15c541","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Added bounds check when deleting sprites. Fixes #$","Stepan Generalov"],["aca43770d3fef68fa7384010f0a7fc600dddb6cb","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Avoid unnecessary textures caching. Fixes #5\n\nTextures still will be cached, if any sprite will\nstill use them. So if user deletes sprite, changes\nit's source image and adds it again - he will see \nunmodified sprite. He will need to remove all \nsprites, that uses that texture and add them again.","Stepan Generalov"],["9b5523400cc8b8622eab19620df55f6172ffae56","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Revert \"Added PRFilledPolygon.\" Not needed, since GL_REPEAT is easier to implement\n\nThis reverts commit ed527befd9f8316d234282b8250e96f409ccaa7f.","Stepan Generalov"],["d211331dac3035754019e99f9a511130fc4f6db1","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Added background checkerboard.","Stepan Generalov"],["d5ac41fbe1e6e592ee7960427b32de3429858fb1","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Update checkerboard on view reshape. First part of #2","Stepan Generalov"],["32bac7941277edc7768fd317de63a2807d247c1a","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Fixed warnings.","Stepan Generalov"],["6accb221729a0817e71496d23b976af26ed16b80","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Do not release on Close Sprites Panel. Fixes #12","Stepan Generalov"],["d052d88c5b84b2fc6206dfdfe5923d6c708c738a","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Added Sprites List (CMD+L) menu item","Stepan Generalov"],["94c0abca206eb531cc2b83d0d70afa6d455ec465","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Enable editing Color & Opacity of background, when no sprite is selected.","Stepan Generalov"],["c26e0553799e524ad12d4e187b6d98374b9b2c39","0a96b47d8663667d902ca52682ad1e42f2ed1533@gmail.com","Added background color & opacity properties to cocosView_","Stepan Generalov"]],"ref":"refs/heads/master","size":154,"head":"632d45fe79f20a14fb40b991aa088d28567b2352","push_id":32417068}