Skip to content
This repository has been archived by the owner on Feb 23, 2023. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
adireddy committed Apr 4, 2016
2 parents 0924531 + 150ce19 commit df71c43
Show file tree
Hide file tree
Showing 54 changed files with 479 additions and 495 deletions.
10 changes: 10 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
engines:
haxe-checkstyle:
enabled: true

exclude_paths:
- libs/**/*

ratings:
paths:
- "**.hx"
80 changes: 52 additions & 28 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,74 @@
# Contributor Code of Conduct
# Contributor Covenant Code of Conduct

As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating
documentation, submitting pull requests or patches, and other activities.
## Our Pledge

We are committed to making participation in this project a harassment-free
experience for everyone, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal appearance,
body size, race, ethnicity, age, religion, or nationality.
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or unprofessional conduct
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.
## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer at adiinteractive@gmail.com. All
reported by contacting the project team at adiinteractive@gmail.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
[version]: http://contributor-covenant.org/version/1/4/
33 changes: 11 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![Haxelib version](https://badge.fury.io/gh/pixijs%2Fpixi-haxe.svg)](http://lib.haxe.org/p/pixijs) [![npm version](https://badge.fury.io/js/hxpixijs.svg)](http://badge.fury.io/js/hxpixijs) [![Build Status](https://travis-ci.org/pixijs/pixi-haxe.svg?branch=master)](https://travis-ci.org/pixijs/pixi-haxe) [![Stories in Ready](https://badge.waffle.io/pixijs/pixi-haxe.png?label=ready&title=Ready)](https://waffle.io/pixijs/pixi-haxe) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
[![Haxelib Version](https://badge.fury.io/gh/pixijs%2Fpixi-haxe.svg)](http://lib.haxe.org/p/pixijs) [![npm version](https://badge.fury.io/js/hxpixijs.svg)](http://badge.fury.io/js/hxpixijs) [![Build Status](https://travis-ci.org/pixijs/pixi-haxe.svg?branch=dev)](https://travis-ci.org/pixijs/pixi-haxe)[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
=========
![haxe pixi logo](https://raw.githubusercontent.com/pixijs/pixi-haxe/master/logo.png)
![haxe pixi logo](logo.png)

Externs of Pixi.js v3.x for Haxe - A fast and lightweight 2D javascript rendering library that works across all devices.
Externs of Pixi.js v4.x for Haxe - A fast and lightweight 2D javascript rendering library that works across all devices.

### Installation ###
### Installation

```
haxelib install pixijs
Expand All @@ -14,21 +14,16 @@ or via npm
npm install hxpixijs
```

### API Documentation ###

[Documentation](http://adireddy.github.io/docs/pixi-haxe/)

### Issues ###
### Issues

Found any bug? Please create a new [issue](https://github.com/pixijs/pixi-haxe/issues/new).

### Demos ###
### Demos

* [Basics](http://adireddy.github.io/demos/pixi-haxe/basics.html)
* [Graphics](http://adireddy.github.io/demos/pixi-haxe/graphics.html)
* [Movieclip](http://adireddy.github.io/demos/pixi-haxe/movieclip.html)
* [Spritesheet](http://adireddy.github.io/demos/pixi-haxe/spritesheet.html)
* [Texture Swap](http://adireddy.github.io/demos/pixi-haxe/textureswap.html)
* [Rope](http://adireddy.github.io/demos/pixi-haxe/rope.html)
* [Dragging](http://adireddy.github.io/demos/pixi-haxe/dragging.html)
* [Tiling](http://adireddy.github.io/demos/pixi-haxe/tiling.html)
Expand All @@ -40,23 +35,17 @@ Found any bug? Please create a new [issue](https://github.com/pixijs/pixi-haxe/i
* [Loader](http://adireddy.github.io/demos/pixi-haxe/loader.html)
* [Video](http://adireddy.github.io/demos/pixi-haxe/video.html)
* [Nape](http://adireddy.github.io/demos/pixi-haxe/nape.html)
* [Device Info](http://adireddy.github.io/demos/pixi-haxe/deviceinfo.html)
* [Device Detection](http://adireddy.github.io/demos/pixi-haxe/devicedetection.html)

**Plugins**

* [Spine](http://adireddy.github.io/demos/pixi-haxe/spine.html)

**Filters (WebGL only)**

* [ColorMatrix](http://adireddy.github.io/demos/pixi-haxe/colormatrix.html)
* [Blur](http://adireddy.github.io/demos/pixi-haxe/blur.html)

**[COHERE](http://adireddy.github.io/cohere/)** - Sample MVC application using haxe and pixi.js
**[COHERE](http://adireddy.github.io/cohere/)** - Sample MVC application using Haxe and Pixi.js

Look at the `samples` folder for the source code of above examples.

### Usage ###
### Usage

```haxe
Expand Down Expand Up @@ -106,7 +95,7 @@ class Main {
}
```

### Licensing Information ###
### Licensing Information

<a rel="license" href="http://opensource.org/licenses/MIT">
<img alt="MIT license" height="40" src="http://upload.wikimedia.org/wikipedia/commons/c/c3/License_icon-mit.svg" /></a>
Expand All @@ -115,6 +104,6 @@ This content is released under the [MIT](http://opensource.org/licenses/MIT) Lic

[Pixi.js](https://github.com/GoodBoyDigital/pixi.js) is licensed under the [MIT](http://opensource.org/licenses/MIT) License.

### Contributor Code of Conduct ###
### Contributor Code of Conduct

[Code of Conduct](https://github.com/CoralineAda/contributor_covenant) is adapted from [Contributor Covenant, version 1.3.0](http://contributor-covenant.org/version/1/3/0/)
[Code of Conduct](https://github.com/CoralineAda/contributor_covenant) is adapted from [Contributor Covenant, version 1.4](http://contributor-covenant.org/version/1/4)
10 changes: 5 additions & 5 deletions docs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14928,7 +14928,7 @@
* @param [properties.alpha=false] {Bool} When true, alpha be uploaded and applied.
* @param [batchSize=15000] {Int} Number of particles per batch.]]></haxe_doc>
</new>
<meta><m n=":native"><e>"PIXI.ParticleContainer"</e></m></meta>
<meta><m n=":native"><e>"PIXI.particles.ParticleContainer"</e></m></meta>
</class>
<class path="pixi.core.renderers.Detector" params="" file="src/pixi/core/renderers/Detector.hx" extern="1">
<autoDetectRenderer public="1" set="method" static="1">
Expand Down Expand Up @@ -18370,22 +18370,22 @@
* Can be found in libs folder. "libs/stats.min.js" <script type="text/javascript" src="libs/stats.min.js"></script>
* @param [parentDom] - By default canvas will be appended to body or it can be appended to custom element if passed]]></haxe_doc>
</start>
<resumeRendering public="1" set="method" line="222"><f a=""><x path="Void"/></f></resumeRendering>
<_onWindowResize set="method" line="227">
<resumeRendering public="1" set="method" line="223"><f a=""><x path="Void"/></f></resumeRendering>
<_onWindowResize set="method" line="228">
<f a="event">
<c path="js.html.Event"/>
<x path="Void"/>
</f>
<meta><m n=":noCompletion"/></meta>
</_onWindowResize>
<_onRequestAnimationFrame set="method" line="237">
<_onRequestAnimationFrame set="method" line="238">
<f a="elapsedTime">
<x path="Float"/>
<x path="Void"/>
</f>
<meta><m n=":noCompletion"/></meta>
</_onRequestAnimationFrame>
<addStats public="1" set="method" line="247">
<addStats public="1" set="method" line="248">
<f a=""><x path="Void"/></f>
<meta><m n=":has_untyped"/></meta>
</addStats>
Expand Down
6 changes: 3 additions & 3 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"extern",
"web"
],
"description": "Externs of pixi.js v3 for Haxe - JavaScript 2D webGL renderer with canvas fallback.",
"description": "Externs of pixi.js v4.x for Haxe - JavaScript 2D webGL renderer with canvas fallback.",
"contributors": [
"adireddy"
],
"releasenote": "minor bug fix in Application class",
"version": "3.1.0",
"releasenote": "v4 update",
"version": "4.0.0-rc.1",
"url": "https://github.com/pixijs/pixi-haxe",
"dependencies": {
"perf.js": ""
Expand Down
19 changes: 9 additions & 10 deletions libs/pixi.min.js

Large diffs are not rendered by default.

Binary file modified logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pixijs",
"version": "3.1.0",
"description": "Externs of pixi.js v3.x for Haxe - a fast and lightweight 2D rendering library that works across all devices",
"version": "4.0.0-rc.1",
"description": "Externs of pixi.js v4.x for Haxe - a fast and lightweight 2D rendering library that works across all devices",
"author": "Adi Reddy Mora",
"homepage": "http://adireddy.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion samples/_output/alphamask.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/alphamask.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/_output/audio.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/audio.js.map

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions samples/_output/bitmapfont.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/bitmapfont.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/_output/blur.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/blur.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/_output/bunnymark.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/bunnymark.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/_output/colormatrix.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/colormatrix.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/_output/devicedetection.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/devicedetection.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/_output/deviceinfo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions samples/_output/deviceinfo.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit df71c43

Please sign in to comment.