mark/pixi.js

Fork: 0

mark / pixi.js

2016-09-21	3aaab2c Browse files » Merge branch 'dev-es6' into dev ... # Conflicts: # .editorconfig # CONTRIBUTING.md # src/core/display/DisplayObject.js # src/core/graphics/Graphics.js # src/core/renderers/webgl/WebGLRenderer.js # src/core/sprites/Sprite.js # src/core/text/Text.js # src/core/textures/VideoBaseTexture.js # src/filters/colormatrix/ColorMatrixFilter.js # src/mesh/Mesh.js Mat Groves committed on 21 Sep 2016
	40c15c8 Browse files » Update Contributing Guide with new branch flow. (#2983) ... * Update Contributing Guide with new branch flow. Added more details, links to GitHub docs about forking, and the new branching flow. As a bonus, also changed some minor things in the editorconfig. * Fix typo. * a couple more minor details Chad Engler authored on 21 Sep 2016 Mat Groves committed on 21 Sep 2016
	b3990a1 Browse files » Jsdoc fixes - marking relevant functions as @private (#2978) ... * Adding private jsdoc tag * Added jsdoc @private tag to relevant functions * moved private variables to above the setter, but out of the way of getting jsdocced Dave authored on 21 Sep 2016 Chad Engler committed on 21 Sep 2016
	2796a9d Browse files » Set attributes to play videos without going full screen on iOS10 (#2982) Dave authored on 21 Sep 2016 Mat Groves committed on 21 Sep 2016
	6efd16b Browse files » Merge branch 'dev' into dev-es6 Matt Karl committed on 21 Sep 2016
	d1aa835 Browse files » version update Mat Groves committed on 21 Sep 2016
	933b586 Browse files » webpack temp fix (#2981) ... * webpack temp fix * use minified version Mat Groves authored on 21 Sep 2016 GitHub committed on 21 Sep 2016
	1bb1f2d Browse files » Update LICENSE Mat Groves authored on 21 Sep 2016 GitHub committed on 21 Sep 2016
	fdab0ea Browse files » Merge branch 'dev' into dev-es6 ... # Conflicts: # src/accessibility/AccessibilityManager.js # src/core/text/Text.js Matt Karl committed on 21 Sep 2016
2016-09-20	8fe0ad2 Browse files » Merge pull request #2946 from themoonrat/cocoon-fixes ... Fixes for PIXI + Cocoon Chad Engler authored on 20 Sep 2016 GitHub committed on 20 Sep 2016
2016-09-20	0790471 Browse files » some more es6 changes (#2969) ... * some more es6 changes - const instead of let if possible - arrow functions - string templates - argument defaults * object property shorthand * some more es6 changes - const instead of let if possible - arrow functions - string templates - argument defaults * Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb" This reverts commit `8d3af81`, reversing changes made to `e8b9948`. * Revert "Merge branch 'dev-es6' into dev-es6-sb" This reverts commit `3eeaf79`, reversing changes made to `fb69536`. * Revert "Revert "Merge branch 'dev-es6-sb' of github.com:stbaer/pixi.js into dev-es6-sb"" This reverts commit `c860228`. * fix RenderTexture, incomplete merge * fix for text font properties * reverted some changes * checked out License, Readme and Contributinf from dev-es6 * editorconfig updated: 2 spaces for .eslintrc * added eslint rule: spaces around fat arrow * used eslint fix for consistent spaces around fat arrow * don't allow scale.x or scale.y to be 0 in displayObject setTransform * removed jshint comments (again) Steffen Bär authored on 20 Sep 2016 Matt Karl committed on 20 Sep 2016
2016-09-18	5c0974e Browse files » Fixed Ticker's internal _tick method Matt Karl committed on 18 Sep 2016
	11773ee Browse files » Fixes lint error Matt Karl committed on 18 Sep 2016
	8659f45 Browse files » Merge remote-tracking branch 'origin/dev-es6' into dev-es6 Matt Karl committed on 18 Sep 2016
	ebe2e8b Browse files » Merged with 'dev' ... # Conflicts: # src/core/Shader.js # src/core/graphics/Graphics.js # src/core/math/shapes/Rectangle.js # src/core/renderers/webgl/managers/FilterManager.js # src/core/sprites/webgl/generateMultiTextureShader.js Matt Karl committed on 18 Sep 2016
	ce8d050 Browse files » Merge pull request #2973 from stbaer/dev-es6-jshint-cleanup ... removed old jshint comments; replaced jshint in CONTRIBUTING.md with … Matt Karl authored on 18 Sep 2016 GitHub committed on 18 Sep 2016
	a92e933 Browse files » removed old jshint comments; replaced jshint in CONTRIBUTING.md with eslint Steffen Baer committed on 18 Sep 2016
2016-09-17	8416bf3 Browse files » Merge pull request #2962 from pixijs/dev-es6-updates ... fixed filter issue Matt Karl authored on 17 Sep 2016 GitHub committed on 17 Sep 2016
	abdf1fa Browse files » typo Matt Karl committed on 17 Sep 2016
	3db826d Browse files » Merge pull request #2964 from pixijs/master ... Derp merge master-dev Ivan Popelyshev authored on 17 Sep 2016 GitHub committed on 17 Sep 2016
	09c2715 Browse files » Merge pull request #2963 from gameofbombs/dev4 ... Multiple renerers for Graphics fastRect, solution that will work for sure Ivan Popelyshev authored on 17 Sep 2016 GitHub committed on 17 Sep 2016
	5bbf258 Browse files » fixed filter issue Mat Groves committed on 17 Sep 2016
	5078d11 Browse files » Multiple renerers for Graphics fastRect, solution that will work for sure. Ivan Popelyshev committed on 17 Sep 2016
2016-09-16	b597557 Browse files » Merge pull request #2960 from pixijs/dev-es6-updates ... Small updates to fix some es6 conversion issues Matt Karl authored on 16 Sep 2016 GitHub committed on 16 Sep 2016
	f70d8b3 Browse files » Small updates to fix some es6 conversion issues ... - Removed some require references that were preventing mixins like interaction from working. - Fixed Text Mat Groves committed on 16 Sep 2016
	0ced0a9 Browse files » fix filter offset issue Mat Groves committed on 16 Sep 2016
	92c532a Browse files » Remove reporter Matt Karl committed on 16 Sep 2016
	c75b6d0 Browse files » Merge branch 'master' into dev Mat Groves committed on 16 Sep 2016
	10a4db7 Browse files » Replaces jshint with eslint, using babel in loose mode Matt Karl committed on 16 Sep 2016
2016-09-13	7799275 Browse files » Update imports and exports, getters and setters Matt Karl committed on 13 Sep 2016