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

GSOC 2018: First batch of UI changes for multi-world #3399

Merged
merged 72 commits into from
Jun 18, 2018
Merged

Conversation

Cervator
Copy link
Member

@Cervator Cervator commented Jun 18, 2018

Setting up PR to merge from its topic branch to develop.

In short this batch overhauls the create game UI workflow, fixing some issues with previewing worlds in the process, but temporarily disabling support for advanced configuring of Heightmap. Going straight to playing a gameplay template that defaults to a heightmap world works fine, just more work is needed to hook up a new-style preview for those.

Another tiny but hugely wonderful change: the game now starts when there's more daylight! 🌞

Disclaimer: While the UI suggests multiple worlds can currently be added only the selected world will be available for the player with this PR. I might add a quick note about that to the UI while merging.

See https://forum.terasology.org/threads/gsoc-2018-multiple-worlds.2168 and the linked blog entries for further GSOC project details :-)

@Cervator Cervator added Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc. Topic: UI/UX Requests, Issues and Changes related to screens, artwork, sound and overall user experience labels Jun 18, 2018
@GooeyHub
Copy link
Member

Hooray Jenkins reported success with all tests good!

@Cervator Cervator mentioned this pull request Jun 18, 2018
16 tasks
@Cervator Cervator merged commit f23c0f1 into develop Jun 18, 2018
Cervator added a commit that referenced this pull request Jun 18, 2018
# Conflicts:
#	engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/SelectGameScreen.java - minor conflicts vs @ar0ne's select game / game details work
#	engine/src/main/resources/assets/i18n/menu.lang
#	engine/src/main/resources/assets/i18n/menu_en.lang
@Cervator Cervator added this to the v2.0.1 milestone Jun 18, 2018
@Cervator
Copy link
Member Author

Tested out some more and resolved conflicts. See 1bbc740 for some of the extra work beyond basic conflict resolution.

Merged and have also closed affected issues. Thank you @TheFlash98, @msteiger from past work, @nihal111 from helping out, and so on! :-)

@Cervator Cervator deleted the create-game-v2 branch June 18, 2018 02:28
@TheFlash98
Copy link
Member

theflash98 & multi-world

1 similar comment
@TheFlash98
Copy link
Member

theflash98 & multi-world

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc. Topic: UI/UX Requests, Issues and Changes related to screens, artwork, sound and overall user experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants