added gamepad support to html5. Added gamepad example to bananas/skn3.

[skn3]

Hey Mark,

I have added support to html5 for gamepad. It only maps to standard mapped gamepads, so if the browser cant recognise it then the code will ignore it. Seems to work ok for me on xbox 360 pad!

[therevills]

This is great! Top work skn3!

@marksibly any chance of adding this officially?

[StingerGames]

Yes please! Would be great for the NES jam.

On 10/16/2015 8:55 PM, therevills wrote:

This is great! Top work skn3!

@marksibly https://github.com/marksibly any chance of adding this officially?

— Reply to this email directly or view it on GitHub https://github.com/blitz-research/monkey/pull/83#issuecomment-148883896.

[blitz-research]

I have attempted to merge this! Appears to work well, although I have also only tested with an xbox360 controller. You do get to use both triggers though!

Think the merge worked, but could someone who knows more about git clarify something?

I followed the command line instructions to merge it locally here first for testing, but was a bit confused by the step that looked like this (which you do after creating a branch):

git pull https://github.com/skn3-develop.git develop

(may not have been this exactly)

To me, this appears to pull skn3-develop 'develop' branch changes - but I only want to pull this one pull request.

So what happens if the skn3-develop develop branch has changed since the pull request was made?

Also, should I do a new release for game jamming purposes?

[ImmutableOctet]

@blitz-research Any thoughts on the jarring GLFW input bottleneck? I don't think we need to know if a controller was plugged in every frame.

Also, not sure if they would be useful, but the git docs may help: https://git-scm.com/docs/git-pull

[skn3]

Well by default the pull request will include any further commits that I have made since requesting to pull.

So the ideal situation would be for me to work in my own Dev branch and then have merged into my own master. I then pull request from master. I would then be free to mangle the Dev branch without it farking the pull request. But I generally don't commit anything but these tweaks to the monkey repo, so didn't bother.

Sent from my iPhone

On 18 Oct 2015, at 21:48, Mark Sibly notifications@github.com wrote:

I have attempted to merge this!

Should a do a new release for game jamming purposes?

Think it worked, but could someone who knows more about git clarify something?

I followed the command line instructions to merge it locally here first for testing, but was a bit confused by the step that looked like this (which you do after creating a branch):

git pull https://github.com/skn3-develop.git develop

(may not have been this exactly)

To me, this appears to pull skn3-develop 'develop' branch changes - but I only want to pull this one pull request.

So what happens if the skn3-develop develop branch has changed since the pull request was made?

— Reply to this email directly or view it on GitHub.

[blitz-research]

Well by default the pull request will include any further commits that I have made since requesting to pull.

Thanks for that. For some reason I was under the impression that pull requests were some kind of separate thing, like a discrete package of patches or something.

[skn3]

No problem. I thought so too at first (just because that would have made complete logic sense), but turns out nope. Comes in handy as a result but just have to be more mindful of commits when working In larger teams.

Sent from my iPhone

On 19 Oct 2015, at 05:36, Mark Sibly notifications@github.com wrote:

Well by default the pull request will include any further commits that I have made since requesting to pull.

Thanks for that. For some reason I was under the impression that pull requests were some kind of separate thing, like a discrete package of patches or something.

— Reply to this email directly or view it on GitHub.