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

Jplayer preload #540

Merged
merged 4 commits into from
Apr 21, 2015
Merged

Jplayer preload #540

merged 4 commits into from
Apr 21, 2015

Conversation

n8xm
Copy link

@n8xm n8xm commented Apr 21, 2015

Modified videoController.js to support the changes made in #489. Also added (commented out) code in scenario_dummy for testing of the preloading functionality.

Depends on #489.

@kadst43
Copy link
Contributor

kadst43 commented Apr 21, 2015

Not sure what this PR is doing. Looks like there are some setHeading calls for the rover - maybe because it needs a rebase? Also, looks like most of the code that might actually do something is commented out.

Is there a corresponding VWF-side PR?

@kadst43
Copy link
Contributor

kadst43 commented Apr 21, 2015

Ahhh, read the comment now.

This is fine to check in, I guess - but the job is only half done. Each scenario should specify which cutscene to have preloaded, and then this functionality should be used to make that happen.

n8xm pushed a commit that referenced this pull request Apr 21, 2015
@n8xm n8xm merged commit 1326bfb into mars-game-development Apr 21, 2015
@n8xm n8xm deleted the jplayer-preload branch April 21, 2015 18:10
@n8xm n8xm restored the jplayer-preload branch April 23, 2015 14:17
@kadst43 kadst43 deleted the jplayer-preload branch May 19, 2015 19:47
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