Skip to content

Commit 1746afe

Browse files
photonstormphotonstorm
committed
Merged 1.2 branch into master for the final Phaser v2.0.0 release.
2 parents 4f0c764 + 901a7f1 commit 1746afe

File tree

2,217 files changed

+381088
-308310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,217 files changed

+381088
-308310
lines changed

‎.jshintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"globals" : { "Phaser": false, "PIXI": false },
2+
"globals" : { "Phaser": false, "PIXI": false, "p2": false },
33
// Ignore Environment Globals
44
"browser" : true, // Standard browser globals e.g. `window`, `document`.
55
"couch" : false,

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It's important to us that you feel you can contribute towards the evolution of P
1111

1212
2. **Create an isolated and reproducible test case.** If you are reporting a bug, make sure you also have a minimal, runnable, code example that reproduces the problem you have.
1313

14-
3. **Include a live example.** After narrowing your code down to only the problem areas, make use of[jsFiddle][1], [jsBin][2], or a link to your live site so that we can view a live example of the problem.
14+
3. **Include a live example.** After narrowing your code down to only the problem areas, make use of [jsFiddle][1], [jsBin][2], or a link to your live site so that we can view a live example of the problem.
1515

1616
4. **Share as much information as possible.** Include browser version affected, your OS, version of the library, steps to reproduce, etc. "X isn't working!!!1!" will probably just be closed.
1717

@@ -35,7 +35,7 @@ The dev branch of Phaser is our 'current working' version. It is always ahead of
3535

3636
To take advantage of our grunt build script and jshint config it will be easiest for you if you have node.js and grunt installed locally.
3737

38-
You can download node.js from[nodejs.org][3]. After it has been installed open a console and run `npm i - g grunt - cli` to install the global `grunt` executable.
38+
You can download node.js from [nodejs.org][3]. After it has been installed open a console and run `npm i - g grunt - cli` to install the global `grunt` executable.
3939

4040
After that you can clone the repository and run `npm i` inside the cloned folder. This will install dependencies necessary for building the project. Once that is ready,
4141
make your changes and submit a Pull Request:

0 commit comments

Comments
 (0)