Code

JPlayer Updates from Mars Game#526

Code

Open

BrettASwift wants to merge 31 commits intodevelopmentvirtual-world-framework/vwf:developmentfrom branch/jplayervirtual-world-framework/vwf:branch/jplayerCopy head branch name to clipboard

+205-45

Commits

Commits on Dec 15, 2015

• Got the jPlayer driver to load...

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  11ada8a

  Copy full SHA for 11ada8a

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  1722312

  Copy full SHA for 1722312

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

  Show description for d433d90
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  d433d90

  Copy full SHA for d433d90

• Removed unnecessary method which sets z-index.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  ef5613d

  Copy full SHA for ef5613d

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  42a1676

  Copy full SHA for 42a1676

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  12a23cc

  Copy full SHA for 12a23cc

• Now it appears that we can inject divs dynamically?

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  c6b6bae

  Copy full SHA for c6b6bae

• Div injection now works (I think?)

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  93b46ab

  Copy full SHA for 93b46ab

• Changed default names of jPlayer div container and player container BACK

  Show description for febf021
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  febf021

  Copy full SHA for febf021

• Corrected tabs vs spaces in the view driver.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  2603289

  Copy full SHA for 2603289

• Fix prototype ids for jPlayer

  

  Brett Swift

  committed
  4de359e

  Copy full SHA for 4de359e

• Div injection now works (I think?)

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  8eb23d2

  Copy full SHA for 8eb23d2

• Instead of creating a new mediaObject for every case of file format, we now create a single mediaObject and augment as necessary.

  

  spencerfrazier

  authored and

  Brett Swift

  committed
  5f1b308

  Copy full SHA for 5f1b308

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  159f2e0

  Copy full SHA for 159f2e0

• Adding multi-format support appears to work!

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  ad03d93

  Copy full SHA for ad03d93

• 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

  authored and

  Brett Swift

  committed
  3a0a2fb

  Copy full SHA for 3a0a2fb

• Adding some comments to explain what I commented out.

  

  spencerfrazier

  authored and

  Brett Swift

  committed
  19b4ada

  Copy full SHA for 19b4ada

• Removed two unnecessary lines of code.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  e5f0d43

  Copy full SHA for e5f0d43

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

  Show description for 63f49b7
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  63f49b7

  Copy full SHA for 63f49b7

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  e657c2b

  Copy full SHA for e657c2b

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

  Show description for 6610428
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  6610428

  Copy full SHA for 6610428

• Fixed spacing and removed some debug code.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  f17cf61

  Copy full SHA for f17cf61

• Now we are checking if the URL exists.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  b28b108

  Copy full SHA for b28b108

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

  Show description for 0fb486e
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  0fb486e

  Copy full SHA for 0fb486e

• "load" now works in the jPlayer model.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  324e877

  Copy full SHA for 324e877

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  567290a

  Copy full SHA for 567290a

• Now we can pre-load the correct cutscenes in the scenario1* series of scenarios.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  8815fcf

  Copy full SHA for 8815fcf

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

  Show description for dae264d
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  dae264d

  Copy full SHA for dae264d

• Update jPlayer.js

  Show description for aefead2
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  aefead2

  Copy full SHA for aefead2

• Update jPlayer.js

  Show description for f31f6a3
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  f31f6a3

  Copy full SHA for f31f6a3

• kernel prototypes change

  

  Brett Swift

  committed
  cbf764c

  Copy full SHA for cbf764c