Skip to content

Commit 29d7cc3

Browse files
committed
Merge branch 'gamepadsupport' of https://github.com/karlmacklin/phaser into karlmacklin-gamepadsupport
Conflicts: README.md
1 parent ba74bea commit 29d7cc3

19 files changed

Lines changed: 3541 additions & 0 deletions

build/config.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@
7676
<script src="$path/src/input/MSPointer.js"></script>
7777
<script src="$path/src/input/Pointer.js"></script>
7878
<script src="$path/src/input/Touch.js"></script>
79+
<script src="$path/src/input/Gamepad.js"></script>
80+
<script src="$path/src/input/SinglePad.js"></script>
81+
<script src="$path/src/input/GamepadButton.js"></script>
7982
<script src="$path/src/input/InputHandler.js"></script>
8083
8184
<script src="$path/src/gameobjects/Events.js"></script>

examples/_site/examples.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,30 @@
388388
"file": "game+scale.js",
389389
"title": "game scale"
390390
},
391+
{
392+
"file": "gamepad+analog+button.js",
393+
"title": "gamepad analog button"
394+
},
395+
{
396+
"file": "gamepad+debug.js",
397+
"title": "gamepad debug"
398+
},
399+
{
400+
"file": "gamepad+hotkeys.js",
401+
"title": "gamepad hotkeys"
402+
},
403+
{
404+
"file": "gamepad+multiple+pads.js",
405+
"title": "gamepad multiple pads"
406+
},
407+
{
408+
"file": "gamepad+tanks.js",
409+
"title": "gamepad tanks"
410+
},
411+
{
412+
"file": "gamepad.js",
413+
"title": "gamepad"
414+
},
391415
{
392416
"file": "key.js",
393417
"title": "key"
@@ -439,6 +463,10 @@
439463
{
440464
"file": "snap+on+drag.js",
441465
"title": "snap on drag"
466+
},
467+
{
468+
"file": "touch+joystick.js",
469+
"title": "touch joystick"
442470
}
443471
],
444472
"loader": [

0 commit comments

Comments
 (0)