Merge branch 'gamepadsupport' of https://github.com/karlmacklin/phaser into karlmacklin-gamepadsupport

Conflicts:
	README.md
This commit is contained in:
photonstorm
2013-12-31 00:44:11 +00:00
parent ba74bea4b4
commit 29d7cc36a0
19 changed files with 3541 additions and 0 deletions
+28
View File
@@ -388,6 +388,30 @@
"file": "game+scale.js",
"title": "game scale"
},
{
"file": "gamepad+analog+button.js",
"title": "gamepad analog button"
},
{
"file": "gamepad+debug.js",
"title": "gamepad debug"
},
{
"file": "gamepad+hotkeys.js",
"title": "gamepad hotkeys"
},
{
"file": "gamepad+multiple+pads.js",
"title": "gamepad multiple pads"
},
{
"file": "gamepad+tanks.js",
"title": "gamepad tanks"
},
{
"file": "gamepad.js",
"title": "gamepad"
},
{
"file": "key.js",
"title": "key"
@@ -439,6 +463,10 @@
{
"file": "snap+on+drag.js",
"title": "snap on drag"
},
{
"file": "touch+joystick.js",
"title": "touch joystick"
}
],
"loader": [