Commit graph

700 commits

Author SHA1 Message Date
Chad Engler
ea52c488b0 Merge branch 'drkibitz-karma-fix' into dev 2014-01-12 10:08:10 -08:00
Chad Engler
1ed43e1dfd Merge branch 'karma-fix' of github.com:drkibitz/pixi.js into drkibitz-karma-fix 2014-01-12 10:07:58 -08:00
Chad Engler
9c002db93c Merge branch 'master' into dev 2014-01-12 10:07:22 -08:00
Chad Engler
8dab907467 Fix tavis yaml, manually merge #486 2014-01-12 09:54:12 -08:00
Chad Engler
c15f0b17f7 update jshint 2014-01-12 09:46:41 -08:00
Dr. Kibitz
7ac987230f Use jshint ignores option instead 2014-01-12 01:43:42 -08:00
Dr. Kibitz
6c6e7ca50f Add karma.conf.js to jshint 2014-01-12 01:34:07 -08:00
Dr. Kibitz
180eae99a7 Karma cleanup, spec reporter 2014-01-12 01:07:13 -08:00
Mat Groves
9da560524f pixie files update 2014-01-10 10:55:52 +00:00
Mat Groves
b7d79cb2d6 Merge branch 'dev' 2014-01-10 10:53:47 +00:00
Mat Groves
304a73faaf Modified package version to 1.4.2 2014-01-09 20:48:34 +00:00
Mat Groves
f80ad04012 Update README.md 2014-01-09 20:46:55 +00:00
Mat Groves
768ff10547 Republished main pixie files 2014-01-09 20:25:30 +00:00
Mat Groves
d69e780f9b Merge branch 'dev'
Conflicts:
	bin/pixi.dev.js
	bin/pixi.js
2014-01-09 20:24:00 +00:00
Mat Groves
c601e020b7 Merge pull request #481 from ekelokorpi/dev
CocoonJS fix on updateText
2014-01-09 04:03:18 -08:00
Eemeli Kelokorpi
5ca0f92818 CocoonJS fix on updateText 2014-01-09 13:58:47 +02:00
Mat Groves
507a28e22c Merge pull request #480 from ekelokorpi/dev
CocoonJS compatibility
2014-01-09 03:35:12 -08:00
Eemeli Kelokorpi
9bba647dd4 CocoonJS compatibility 2014-01-09 13:28:57 +02:00
Mat Groves
773b629a0a Update README.md 2014-01-09 09:15:06 +00:00
Mat Groves
68c476da25 Fixed final ie11 webGL masking issue
removed IE11 check in auto detect function
Added AlphaMaskFilter
2014-01-08 23:55:17 +00:00
Mat Groves
c613ee2ae6 Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev 2014-01-08 21:52:56 +00:00
Mat Groves
733aabf4fa Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev 2014-01-08 21:52:17 +00:00
Mat Groves
1536397391 tiny tweaks - removed replaced [] with length=0 in PIXI.destroyTexture 2014-01-08 21:40:34 +00:00
Mat Groves
6098e3b6c9 Merge branch 'DisplayObject-Cache' into dev
Conflicts:
	bin/pixi.js
2014-01-08 21:33:31 +00:00
Mat Groves
3afff7d51f Added cacheAsBitmap to PIXI.Graphics
Tweaked webGL graphics
Added generateTexture function to PIXI.Graphics
2014-01-08 21:31:40 +00:00
Chad Engler
8916212454 Merge pull request #478 from Nibbler999/dev
Remove redundant code, fix trimmed sprite sheets
2014-01-08 07:33:23 -08:00
Tommy Atkinson
5e8fca654b Remove redundant code, fix trimmed sprite sheets 2014-01-08 12:31:22 +01:00
Mat Groves
5d5f33f601 Removed this.worldVisible = true; line in PIXI.Stage fixes #477 2014-01-08 11:11:15 +00:00
Mat Groves
f0d63f7315 removed a few more unused variables
replaced [] with .length = 0; to reset arrays
2014-01-07 22:45:35 +00:00
Mat Groves
12c4b87b33 Removed unused variable PIXI.WebGLRenderer.gl 2014-01-07 22:06:46 +00:00
Mat Groves
556c292842 Fixed webGL destroyTexture function
added PIXI.glContexts to access to contexts when destroying textures
removed constant PIXI._defualtFrame as its no longer used
2014-01-07 22:05:22 +00:00
Mat Groves
29cdd079d3 Added setStageReference to DisplayObject
Removed unused reference to PIXI.gl (no longer used)
2014-01-07 20:58:08 +00:00
Mat Groves
c74d9615ca Fixed issue with setStageRefference and worldVisible function 2014-01-07 15:04:13 +00:00
Mat Groves
4d0eb366a1 Fixed issue with setStageRefference and worldVisible function 2014-01-07 14:55:33 +00:00
Mat Groves
e0dc3158c1 Merge branch 'dev' 2014-01-06 20:59:38 +00:00
Mat Groves
abb978dbf3 Added Tinting and BlendMode example 2014-01-06 20:58:03 +00:00
Mat Groves
c3dbf31c6e updated pixie file 2014-01-06 12:23:02 +00:00
Mat Groves
f3bf5874ed Merge branch 'dev' 2014-01-06 12:21:41 +00:00
Mat Groves
0f6bf01788 Fixed bug with interaction when setting internal stage reference 2014-01-06 12:00:17 +00:00
Mat Groves
9768a4c811 Update README.md 2014-01-05 23:29:44 +00:00
Mat Groves
e7205ad115 Tiling Texture fixed to allow any size texture
also accepts sprite sheet frame.
2014-01-05 21:56:33 +00:00
Chad Engler
ee7dcdf01a v1.4.1 builds 2014-01-05 10:54:48 -08:00
Chad Engler
c5b81fcd16 update version of packages to v1.4.1 2014-01-05 10:49:50 -08:00
Mat Groves
f7298b438a Merge branch 'dev' 2014-01-05 18:30:19 +00:00
Mat Groves
f8be5d6027 Doc updates 2014-01-05 18:30:05 +00:00
Mat Groves
b3677ea452 Added removeStageReference fix 2014-01-05 18:27:07 +00:00
Mat Groves
75c7880c93 Fixed bug where setText not working correctly
Docs updated
2014-01-05 18:16:17 +00:00
Chad Engler
8cd32d392c map file no longer used 2014-01-05 09:45:34 -08:00
Chad Engler
31e05f6f53 Merge bugfix from 'dev' 2014-01-05 09:35:54 -08:00
Mat Groves
94e5faa2f1 Fixed stage ref bug 2014-01-05 17:34:23 +00:00