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

environments: add Winter and Underwater; update Meadow; rename Island -> Offworld (for issue #1037) #1038

Merged
merged 7 commits into from Mar 22, 2019
Merged

environments: add Winter and Underwater; update Meadow; rename Island -> Offworld (for issue #1037) #1038

merged 7 commits into from Mar 22, 2019

Conversation

cvan
Copy link
Contributor

@cvan cvan commented Mar 21, 2019 •
edited

for issue #1037

FYI: blocked on #1037 (comment)

@cvan cvan added enhancement This issue is a new feature or request blocked labels Mar 21, 2019
@cvan cvan added this to the v1.1.4 milestone Mar 21, 2019
@cvan cvan self-assigned this Mar 21, 2019
@ghost ghost added the in progress label Mar 21, 2019
@cvan cvan mentioned this pull request Mar 21, 2019
Closed
@cvan
Copy link
Contributor Author

cvan commented Mar 22, 2019 •
edited

per earlier discussion today, I've hidden Meadow from the Environments list until the assets are polished + finished by the artist.

cvan
cvan commented Mar 22, 2019
View reviewed changes
app/src/main/cpp/BrowserWorld.cpp Outdated
@@ -123,7 +123,7 @@ SurfaceObserver::SurfaceTextureDestroyed(const std::string& aName) {

void
SurfaceObserver::SurfaceTextureCreationError(const std::string& aName, const std::string& aReason) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will remove

@cvan
Copy link
Contributor Author

cvan commented Mar 22, 2019

I know it's known, but just so it's clear here. blocked on this: #1037 (comment)

@ghost ghost assigned MortimerGoro Mar 22, 2019
@MortimerGoro MortimerGoro merged commit e14805a into master Mar 22, 2019
@ghost ghost removed the in progress label Mar 22, 2019
cvan
cvan commented Mar 22, 2019
View reviewed changes
app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
String env = mPrefs.getString(mContext.getString(R.string.settings_key_env), ENV_DEFAULT);
// Remove when the meadow is ready
if (env.equalsIgnoreCase("meadow")) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

smart, thanks 👍

@cvan cvan deleted the environment-updates branch March 22, 2019 21:57
@cvan cvan modified the milestones: v1.1.4, v1.1.3 Mar 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cvan cvan

@MortimerGoro MortimerGoro

Labels
blocked enhancement This issue is a new feature or request
Projects
None yet
Milestone
v1.1.3
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cvan @MortimerGoro