jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source
This commit is contained in:
Mat Groves 2014-02-11 11:37:36 +00:00
commit f2c6d1427b
6 changed files with 397 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
Pixi Renderer [![Build Status](https://travis-ci.org/GoodBoyDigital/pixi.js.png?branch=dev)](https://travis-ci.org/GoodBoyDigital/pixi.js) Pixi Renderer
============= =============
![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png) ![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png)

486
bin/pixi.dev.js
View file

File diff suppressed because it is too large Load diff

14
bin/pixi.js
View file

File diff suppressed because one or more lines are too long

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "pixi.js", "name": "pixi.js",
"version": "1.4.3", "version": "1.5.0",
"main": "bin/pixi.js", "main": "bin/pixi.js",

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "pixi.js", "name": "pixi.js",
"version": "1.4.3", "version": "1.5.0",
"description": "Pixi.js is a fast lightweight 2D library that works across all devices.", "description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
"author": "Mat Groves", "author": "Mat Groves",

5
src/pixi/InteractionManager.js
View file

@ -270,9 +270,6 @@ PIXI.InteractionManager.prototype.update = function()
// loop through interactive objects! // loop through interactive objects!
var length = this.interactiveItems.length; var length = this.interactiveItems.length;
var cursor = 'inherit'; var cursor = 'inherit';
var over = false; var over = false;
@ -298,7 +295,6 @@ PIXI.InteractionManager.prototype.update = function()
if(!item.__isOver) if(!item.__isOver)
{ {
if(item.mouseover)item.mouseover(this.mouse); if(item.mouseover)item.mouseover(this.mouse);
item.__isOver = true; item.__isOver = true;
} }
@ -319,7 +315,6 @@ PIXI.InteractionManager.prototype.update = function()
this.currentCursorStyle = cursor; this.currentCursorStyle = cursor;
this.interactionDOMElement.style.cursor = cursor; this.interactionDOMElement.style.cursor = cursor;
} }
}; };
/** /**