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.

Sign up for GitHub

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

Jump to bottom

Games #24

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

Games #24

wants to merge 52 commits into from

Commits on Oct 14, 2017

  1. add smapi data and mp4 importer

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    826276e View commit details
    Browse the repository at this point in the history

  2. fix path

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    9e2f51d View commit details
    Browse the repository at this point in the history

  3. Adds a demo using an audio analyser to size a box entity

    @maxrpeterson
    maxrpeterson committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    1b4bcfa View commit details
    Browse the repository at this point in the history

  4. Made special ball that follows you...

    @srobertson421
    srobertson421 committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    1a58c30 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'audio-analyser'

    @maxrpeterson
    maxrpeterson committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    baab9d6 View commit details
    Browse the repository at this point in the history

  6. made ball stay with camera

    @srobertson421
    srobertson421 committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    e33c707 View commit details
    Browse the repository at this point in the history

  7. push vids

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    68be709 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of github.com:nbcnews/aframe-boilerplate

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    a85f447 View commit details
    Browse the repository at this point in the history

  9. add Quantiphi vids

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    d56387e View commit details
    Browse the repository at this point in the history

  10. add tmp

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    dd63fcc View commit details
    Browse the repository at this point in the history

  11. merged master

    @srobertson421
    srobertson421 committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    faf4fca View commit details
    Browse the repository at this point in the history

  12. add rhonyc tags, sprout vid

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    882f689 View commit details
    Browse the repository at this point in the history

  13. Add room

    @kaitlynreese
    kaitlynreese committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    e8c0ac8 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'room'

    @kaitlynreese
    kaitlynreese committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    9cdb07a View commit details
    Browse the repository at this point in the history

  15. Updates to aframe v0.7.0

    @maxrpeterson
    maxrpeterson committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    251386c View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of github.com:nbcnews/aframe-projects

    @maxrpeterson
    maxrpeterson committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    f7fb187 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of github.com:nbcnews/aframe-projects into games

    @srobertson421
    srobertson421 committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    f00c327 View commit details
    Browse the repository at this point in the history

  18. rel path change

    @bradoyler
    bradoyler committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    45edf76 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2017

  1. Adds a cursor

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    e2690f2 View commit details
    Browse the repository at this point in the history

  2. Makes the cursor a little smaller

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    50033e7 View commit details
    Browse the repository at this point in the history

  3. Merge in voice-control work

    Xinran Wang authored and Xinran Wang committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    22a3a37 View commit details
    Browse the repository at this point in the history

  4. Added hoop and stuff

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    259eae7 View commit details
    Browse the repository at this point in the history

  5. ROOM

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    bf3499b View commit details
    Browse the repository at this point in the history

  6. update path

    @bradoyler
    bradoyler committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    eedb3d7 View commit details
    Browse the repository at this point in the history

  7. add data

    @bradoyler
    bradoyler committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    564c9f6 View commit details
    Browse the repository at this point in the history

  8. Add speaker

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    25bffc3 View commit details
    Browse the repository at this point in the history

  9. Adds the built-in collada loader, STANDING=FALSE, SIT DOWN MF'ER

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    9b7c76a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'updates-to-room-view'

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    19fe095 View commit details
    Browse the repository at this point in the history

  11. updates to collada-loaders

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    1043a39 View commit details
    Browse the repository at this point in the history

  12. altered view of camera

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    71e9a1c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of github.com:nbcnews/aframe-projects into games

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    2fc2c3f View commit details
    Browse the repository at this point in the history

  14. fixed camera issue with standing component

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    c9a74ab View commit details
    Browse the repository at this point in the history

  15. Adds a tv component with click handler

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    8499295 View commit details
    Browse the repository at this point in the history

  16. Add meet the press analysis

    Xinran Wang authored and Xinran Wang committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    9b2fc1a View commit details
    Browse the repository at this point in the history

  17. NEWSroom!

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    adebca5 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/nbcnews/aframe-projects 

    # Conflicts:
#	index.html
    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    2de3d44 View commit details
    Browse the repository at this point in the history

  19. Rotate/move things

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    6efcc33 View commit details
    Browse the repository at this point in the history

  20. added scoreboard

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    1ecd1f1 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of github.com:nbcnews/aframe-projects into games

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    5f1d943 View commit details
    Browse the repository at this point in the history

  22. fixes the cursor

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    ccb2325 View commit details
    Browse the repository at this point in the history

  23. Attempt at full set

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    332bcfe View commit details
    Browse the repository at this point in the history

  24. add news vids

    @bradoyler
    bradoyler committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    4602369 View commit details
    Browse the repository at this point in the history

  25. adds lights to the scene

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    150e92d View commit details
    Browse the repository at this point in the history

  26. Merge branch 'add-lights'

    @maxrpeterson
    maxrpeterson committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    e77e98b View commit details
    Browse the repository at this point in the history

  27. Update set, add favicon

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    ba63537 View commit details
    Browse the repository at this point in the history

  28. Dim ambient

    @kaitlynreese
    kaitlynreese committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    89acfcc View commit details
    Browse the repository at this point in the history

  29. Added logos for game

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    cf8eb34 View commit details
    Browse the repository at this point in the history

  30. Basic scrolling content and a plane to surprise and delight

    Alex Fiuk committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    5536c47 View commit details
    Browse the repository at this point in the history

  31. demo controls

    @bradoyler
    bradoyler committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    8bff959 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'master' of github.com:nbcnews/aframe-projects into games

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    3fc103a View commit details
    Browse the repository at this point in the history

  33. fixed multiple objects issue

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    92c42cf View commit details
    Browse the repository at this point in the history

  34. changed background

    @srobertson421
    srobertson421 committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    00ca533 View commit details
    Browse the repository at this point in the history