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

PiGui Station Lobby view #4651

Closed
wants to merge 3 commits into from

Conversation

vakhoir
Copy link
Contributor

@vakhoir vakhoir commented Jul 27, 2019

Takes into account @mike-f1 hyperspace range fix from #4650
Was branched from #4624, so it also contains it's commits

EDIT: Will also close #4545

Screenshot from 2019-07-27 17-48-18

@vakhoir vakhoir force-pushed the feature/station_lobby branch 2 times, most recently from 8aa0d34 to ac0f8a7 Compare July 27, 2019 17:29
@robothauler
Copy link
Contributor

After a quick check I noticed that the lobby window is empty when there is no hyperdrive. (Start at Barnard's Star)

@vakhoir
Copy link
Contributor Author

vakhoir commented Jul 28, 2019

Well, that was a stupid place to put a null check... that wasn't even necessary to begin with.

Thanks for testing! Fixed.

@vakhoir vakhoir force-pushed the feature/station_lobby branch 2 times, most recently from f804b7b to 52e2bfa Compare July 30, 2019 20:21
@vakhoir
Copy link
Contributor Author

vakhoir commented Aug 1, 2019

Hey @impaktor, I'm almost done with the Commodity Market as well. Should I keep opening PRs, or is it better to merge everything uder one?

@impaktor
Copy link
Member

impaktor commented Aug 1, 2019

I dunno. Who's feeling up to reviewing this? @Web-eWorks, @ecraven ? what do you guys prefer?

At least, don't stop development, keep hacking away, on a new branch out of this PR's branch, I guess?, we can always cherry pick commits, or merge stuff, but if the Commodity market shares dependencies with thei PR, ideally we should test and merge this ASAP.

I don't have any pioneer/internet time until next week, sorry.

@mike-f1
Copy link
Contributor

mike-f1 commented Aug 2, 2019

@vakhoir , if you want/have time you could add the second line changed in #4650 and we save a one-line merge.

PiGui Image widget
Fixed old Gui blinking-in the first tab of tab-views
@vakhoir
Copy link
Contributor Author

vakhoir commented Aug 2, 2019

Done, I rebased your branch into mine

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.

Incorrect hyperspace range shown in comm screen
4 participants