jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions
429 commits 3 branches 10 tags 18 MiB
Commit graph

429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chad Engler
c4a2a9e4ee Merge pull request #462 from anvaka/typo-fix 
Fixed small typo
 2014-01-02 07:36:59 -08:00
anvaka
a1de947e40 Fixed small typo 2014-01-01 23:31:46 -08:00
Mat Groves
04ef255dd7 Update StripShader.js 2014-01-01 19:43:54 +00:00
Mat Groves
13177f08e7 Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev 2013-12-29 22:27:40 +00:00
Chad Engler
00cfcdbcd6 update path to jshint file 2013-12-27 08:14:44 -08:00
Chad Engler
6b7b61f54f Merge pull request #457 from photonstorm/dev 
Fix for addChild when parent is null
 2013-12-27 08:03:25 -08:00
Mat Groves
3014ef57af Update WebGLGraphics.js 
fixed issue where rogue semicolon casing lots of circles to be drawn.
 2013-12-26 23:54:07 +00:00
Mat Groves
abb731ec4a Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev 
Conflicts:
	src/pixi/renderers/webgl/WebGLFilterManager.js
	src/pixi/textures/BaseTexture.js
 2013-12-23 17:38:46 +00:00
photonstorm
a180e1dd2d Previously addChild was checking this: if(child.parent != undefined) but testing just for 'undefined' isn't enough, as the parent is set to 'null' in DisplayObject.js, so this condition fails and throws an error as it tries to removeChild from null. 2013-12-23 03:18:18 +00:00
Chad Engler
eb1d1b54fd bump dev version to v1.4.0 2013-12-20 07:57:11 -08:00
Chad Engler
49c6ec954c change elipse -> ellipse in test 2013-12-20 07:46:33 -08:00
Chad Engler
920bc07bae Merge branch 'drkibitz-upstream-jshint' into dev 2013-12-20 07:43:56 -08:00
Dr. Kibitz
1d41d4bddd Use stable version of karma 2013-12-19 22:43:20 -08:00
Chad Engler
0b06305c61 change travis script 2013-12-19 11:36:31 -08:00
Chad Engler
7f30ea53a2 update travis file to be more explicit 2013-12-19 11:34:07 -08:00
Chad Engler
ce8add7c62 merge in jshint fixes 2013-12-19 11:30:30 -08:00
Chad Engler
50d3dd7f2c merge texture scaling, fixes #201 and #378 2013-12-19 11:04:32 -08:00
Chad Engler
ffc68fc5b6 Merge pull request #452 from lachenmayer/ellipse 
Fix el(l)ipse spelling error
 2013-12-18 15:21:11 -08:00
Chad Engler
786d2868b7 Add contributing information 2013-12-18 15:14:29 -08:00
Harry Lachenmayer
576ff71683 Fix el(l)ipse spelling error 2013-12-19 00:05:32 +01:00
Mat Groves
c9f79ea4d9 Merge pull request #444 from MKelm/dev-atlas 
Atlas spritesheet file loader
 2013-12-16 13:32:59 -08:00
Florian Landerl
dd0974c941 Check for webserved files by looking at the protocol 
Previously it would assume a file is being served from the web as long as href happened to include the string 'http' anywhere - not just at the beginning.
 2013-12-15 08:50:39 -08:00
Martin Kelm
b41af9f14d revert Spine.js 2013-12-14 12:15:18 +01:00
Martin Kelm
dc49c7b396 merge upstream/dev 2013-12-14 12:09:25 +01:00
Chad Engler
5794c688ce Merge pull request #442 from photonstorm/dev 
Fixed IE11 check. IE11 no longer has MSIE in the userAgent, you need to ...
 2013-12-13 07:40:10 -08:00
photonstorm
da868e7f41 Fixed IE11 check. IE11 no longer has MSIE in the userAgent, you need to check for Trident/7.0 instead. 2013-12-13 13:51:55 +00:00
Mat Groves
7e3a2b39df updateSourceImage added, new flterbounds function added 2013-12-10 12:47:17 +00:00
Chad Engler
812fb076de remove build badge until pixi is on travis-ci 2013-12-08 17:37:09 -08:00
Chad Engler
13cf18ce39 some small changes to tests 2013-12-08 17:33:42 -08:00
Chad Engler
2f5d3a450a no longer need that 2013-12-08 17:11:40 -08:00
Chad Engler
6dafb2524d moar jshint fixes for tests 2013-12-08 17:00:30 -08:00
Chad Engler
5d516cfb81 remove some trailing whitespace 2013-12-08 16:14:18 -08:00
Chad Engler
648a9bd33e a million and one jshint fixes 2013-12-08 15:42:56 -08:00
Chad Engler
5e08abcc31 remove some comments 2013-12-08 09:39:05 -08:00
Chad Engler
12943e6390 update some modules 2013-12-08 09:11:11 -08:00
Chad Engler
a423216a8c change the way jshint runs a bit 2013-12-08 09:11:05 -08:00
Chad Engler
eb1d191a06 more up-to-date jshintrc 2013-12-08 08:52:14 -08:00
Chad Engler
a60de480ff Merge #302 from @drkibitz, and fix conflicts 2013-12-08 08:44:50 -08:00
Chad Engler
d979e1611d Merge #304 from @drkibitz, and fix conflicts 2013-12-08 08:34:59 -08:00
Chad Engler
9a0560608b Merge and close #347, use inherit for cursor style instead of default 2013-12-08 08:11:06 -08:00
Chad Engler
8cb5e1351f fix conflicts 2013-12-08 08:01:01 -08:00
Chad Engler
d854f5c699 Merge pull request #415 from mattdesl/basetex-destroy2 
Cleaning up BaseTexture Destroy
 2013-12-08 07:58:38 -08:00
josh shepard
5d45bbfc4b fix incorrect width property for multi-line BitmapText 
BitmapText.updateText() was setting this.width to the width of the last line of multi-line text, rather than that of the longest line. this made it impossible to center multi-line strings. (found working in Phaser)
 2013-12-08 07:51:47 -08:00
alexpusch
b6f51b34b0 Fix setText documentation attribute 2013-12-08 07:48:25 -08:00
Chad Engler
05ca70e128 Merge pull request #431 from namuol/swapChildren 
`swapChildren` implementation
 2013-12-06 11:00:18 -08:00
Louis Acresti
6a7a33c898 style consistency 2013-12-06 00:55:01 -05:00
Louis Acresti
2c97041de8 check for invalid children 2013-12-06 00:49:06 -05:00
Louis Acresti
99bf7d62f1 early-out for self-swap 2013-12-06 00:45:37 -05:00
Louis Acresti
6a40554309 removed example from main swap branch 2013-12-05 21:05:57 -05:00
Louis Acresti
8c5f4a6d77 simple swapChildren example/test 2013-12-05 20:54:47 -05:00