JPlayer Updates from Mars Game#526

Open

BrettASwift wants to merge 31 commits intodevelopmentfrom

branch/jplayer

Commits on Dec 15, 2015

Got the jPlayer driver to load...

Nathan Marshak
authored and
Brett Swift
committed
Got the new videoManager dropped in. Doesn't break TDG.

Nathan Marshak
authored and
Brett Swift
committed
Got the changes to the jPlayer model driver merged in. It loads and

Nathan Marshak
authored and
Brett Swift
committed
Removed unnecessary method which sets z-index.

Nathan Marshak
authored and
Brett Swift
committed
Debugged calling "play" along with passing in the URL.

Nathan Marshak
authored and
Brett Swift
committed
Got more stuff using "vwf." rather than this.kernel.

Nathan Marshak
authored and
Brett Swift
committed
Now it appears that we can inject divs dynamically?

Nathan Marshak
authored and
Brett Swift
committed
Div injection now works (I think?)

Nathan Marshak
authored and
Brett Swift
committed
Changed default names of jPlayer div container and player container BACK

Nathan Marshak
authored and
Brett Swift
committed
Corrected tabs vs spaces in the view driver.

Nathan Marshak
authored and
Brett Swift
committed
Fix prototype ids for jPlayer
Brett Swift
committed
Div injection now works (I think?)

Nathan Marshak
authored and
Brett Swift
committed
Instead of creating a new mediaObject for every case of file format, we now create a single mediaObject and augment as necessary.

Spencer Frazier
authored and
Brett Swift
committed
Beginnings of consuming an array of video input URLs is there...

Nathan Marshak
authored and
Brett Swift
committed
Adding multi-format support appears to work!

Nathan Marshak
authored and
Brett Swift
committed
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)

Spencer Frazier
authored and
Brett Swift
committed
Adding some comments to explain what I commented out.

Spencer Frazier
authored and
Brett Swift
committed
Removed two unnecessary lines of code.

Nathan Marshak
authored and
Brett Swift
committed
Cleaned up the video URL. Now we are ready to test if it's a string or a

Nathan Marshak
authored and
Brett Swift
committed
Added check to see if we're parsing a string or an array.

Nathan Marshak
authored and
Brett Swift
committed
Cleand up the code a little bit - in setURL, we now determine if we're

Nathan Marshak
authored and
Brett Swift
committed
Fixed spacing and removed some debug code.

Nathan Marshak
authored and
Brett Swift
committed
Now we are checking if the URL exists.

Nathan Marshak
authored and
Brett Swift
committed
Separated setting the URL from playing the video. This should allow us

Nathan Marshak
authored and
Brett Swift
committed
"load" now works in the jPlayer model.

Nathan Marshak
authored and
Brett Swift
committed
Got the load functionality into the jPlayer driver...

Nathan Marshak
authored and
Brett Swift
committed
Now we can pre-load the correct cutscenes in the scenario1* series of scenarios.

Nathan Marshak
authored and
Brett Swift
committed
Now the jPlayer driver doesn't set the URL (which may cause a load to

Nathan Marshak
authored and
Brett Swift
committed
Update jPlayer.js

Nathan Marshak
authored and
Brett Swift
committed
Update jPlayer.js

Nathan Marshak
authored and
Brett Swift
committed
kernel prototypes change
Brett Swift
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JPlayer Updates from Mars Game#526

JPlayer Updates from Mars Game#526
BrettASwift wants to merge 31 commits intodevelopmentfrom
branch/jplayer

Commits on Dec 15, 2015

Got the jPlayer driver to load...

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

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

Removed unnecessary method which sets z-index.

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

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

Now it appears that we can inject divs dynamically?

Div injection now works (I think?)

Changed default names of jPlayer div container and player container BACK

Corrected tabs vs spaces in the view driver.

Fix prototype ids for jPlayer

Div injection now works (I think?)

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

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

Adding multi-format support appears to work!

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)

Adding some comments to explain what I commented out.

Removed two unnecessary lines of code.

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

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

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

Fixed spacing and removed some debug code.

Now we are checking if the URL exists.

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

"load" now works in the jPlayer model.

Got the load functionality into the jPlayer driver...

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

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

Update jPlayer.js

Update jPlayer.js

kernel prototypes change