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

JPlayer Updates from Mars Game #526

Open
wants to merge 31 commits into
base: development
Choose a base branch
from
Open

JPlayer Updates from Mars Game #526

wants to merge 31 commits into from

Commits on Dec 15, 2015

  1. Got the jPlayer driver to load...

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    11ada8a View commit details
    Browse the repository at this point in the history

  2. Got the new videoManager dropped in. Doesn't break TDG.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    1722312 View commit details
    Browse the repository at this point in the history

  3. Got the changes to the jPlayer model driver merged in. It loads and 

    nothing breaks horifically.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    d433d90 View commit details
    Browse the repository at this point in the history

  4. Removed unnecessary method which sets z-index.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ef5613d View commit details
    Browse the repository at this point in the history

  5. Debugged calling "play" along with passing in the URL.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    42a1676 View commit details
    Browse the repository at this point in the history

  6. Got more stuff using "vwf." rather than this.kernel.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    12a23cc View commit details
    Browse the repository at this point in the history

  7. Now it appears that we can inject divs dynamically?

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    c6b6bae View commit details
    Browse the repository at this point in the history

  8. Div injection now works (I think?)

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    93b46ab View commit details
    Browse the repository at this point in the history

  9. Changed default names of jPlayer div container and player container BACK 

    so that TDG doesn't break!
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    febf021 View commit details
    Browse the repository at this point in the history

  10. Corrected tabs vs spaces in the view driver.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    2603289 View commit details
    Browse the repository at this point in the history

  11. Fix prototype ids for jPlayer

    Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    4de359e View commit details
    Browse the repository at this point in the history

  12. Div injection now works (I think?)

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8eb23d2 View commit details
    Browse the repository at this point in the history

  13. Instead of creating a new mediaObject for every case of file format, … 

    …we now create a single mediaObject and augment as necessary.
    @spencerfrazier
    spencerfrazier authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    5f1b308 View commit details
    Browse the repository at this point in the history

  14. Beginnings of consuming an array of video input URLs is there...

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    159f2e0 View commit details
    Browse the repository at this point in the history

  15. Adding multi-format support appears to work!

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ad03d93 View commit details
    Browse the repository at this point in the history

  16. Now, mars-game appears to pass both test cases: playing on a browser … 

    …without h.264 support, but with webM support (Chromium) and vice versa (Safari)
    @spencerfrazier
    spencerfrazier authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    3a0a2fb View commit details
    Browse the repository at this point in the history

  17. Adding some comments to explain what I commented out.

    @spencerfrazier
    spencerfrazier authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    19b4ada View commit details
    Browse the repository at this point in the history

  18. Removed two unnecessary lines of code.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    e5f0d43 View commit details
    Browse the repository at this point in the history

  19. Cleaned up the video URL. Now we are ready to test if it's a string or a 

    list.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    63f49b7 View commit details
    Browse the repository at this point in the history

  20. Added check to see if we're parsing a string or an array.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    e657c2b View commit details
    Browse the repository at this point in the history

  21. Cleand up the code a little bit - in setURL, we now determine if we're 

    feeding it an array or a single string.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6610428 View commit details
    Browse the repository at this point in the history

  22. Fixed spacing and removed some debug code.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    f17cf61 View commit details
    Browse the repository at this point in the history

  23. Now we are checking if the URL exists.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b28b108 View commit details
    Browse the repository at this point in the history

  24. Separated setting the URL from playing the video. This should allow us 

    to preload.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    0fb486e View commit details
    Browse the repository at this point in the history

  25. "load" now works in the jPlayer model.

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    324e877 View commit details
    Browse the repository at this point in the history

  26. Got the load functionality into the jPlayer driver...

    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    567290a View commit details
    Browse the repository at this point in the history

  27. Now we can pre-load the correct cutscenes in the scenario1* series of… 

    … scenarios.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8815fcf View commit details
    Browse the repository at this point in the history

  28. Now the jPlayer driver doesn't set the URL (which may cause a load to 

    trigger) if its being set to the same URL as before.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    dae264d View commit details
    Browse the repository at this point in the history

  29. Update jPlayer.js 

    Got rid of unnecessary, commented-out code.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    aefead2 View commit details
    Browse the repository at this point in the history

  30. Update jPlayer.js 

    Got rid of another commented-out block that has no relevance.
    Nathan Marshak authored and Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    f31f6a3 View commit details
    Browse the repository at this point in the history

  31. kernel prototypes change

    Brett Swift committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    cbf764c View commit details
    Browse the repository at this point in the history