Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest aframe master #163

Merged
merged 2 commits into from Dec 22, 2016

Conversation

machenmusik
Copy link
Contributor

per discussion on #159

@machenmusik machenmusik mentioned this pull request Dec 11, 2016
@fernandojsg
Copy link
Member

Cool! I'll give it a try later when I'll arrive home. Could you squash the commits? Thanks!

@machenmusik
Copy link
Contributor Author

yesterday @dmarcos said github does that for you, ran into rebase/squash issues yesterday doing touch support for 0.4.0... but I think squash only will probably be ok.

@machenmusik machenmusik force-pushed the use-latest-aframe-master branch 2 times, most recently from aceed01 to 5c5fe58 Compare December 18, 2016 15:48
@machenmusik
Copy link
Contributor Author

(@fernandojsg squashed for you.)

@fernandojsg
Copy link
Member

@machenmusik I've just tried this PR and the controllers doesn't move, which aframe.min.js are you using? the current 0.4.0 dist?

@machenmusik
Copy link
Contributor Author

it occurs to me that although I split the original Touch support into 3, I didn't test that this worked independently. Now that we have the official 0.4.0 build, let me quickly check and redo. May need to merge this back together with the Oculus Touch support PR...

@machenmusik
Copy link
Contributor Author

running into merge issues now. if you already updated master to 0.4.0, you may only need 3967487

@machenmusik
Copy link
Contributor Author

ok redone and tested on Vive

@fernandojsg
Copy link
Member

@machenmusik cool! it's working, thanks for the work here 👍

@fernandojsg fernandojsg merged commit 12f5367 into aframevr:master Dec 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants