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

Fix for NPE when no theme prefs had been set and a few themes for variety #1226

Merged
merged 17 commits into from
Feb 2, 2020

Conversation

Phergus
Copy link
Contributor

@Phergus Phergus commented Feb 2, 2020

When no theme had previously been chosen an NPE was thrown on startup. Fixed #1225

Added a few themes just to provide something to choose from. #921


This change is Reviewable

JamzTheMan and others added 15 commits January 27, 2020 18:26
 * Same tools used as VBL with extra button that defines which layer(s) the polygons are drawn on.

Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
 * Same tools used as VBL with extra button that defines which layer(s) the polygons are drawn on.
 * Changes included (and to be tested) include client/server commands to properly send VBL/MBL to other clients
 * AppPreferences persist last ToolbarPanel presses
 * TODO: Make AI buttons for GM persist over to Player clients and disable buttons on Player clients when server is running

Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Feature MBL Branch

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…plification

Feature token vbl simplification
Fixes NPE when no them had previously been selected.  Added a few themes for variety.
 into develop"

This reverts commit fd65dea, reversing
changes made to 80af7b2.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Copy link
Member

@JamzTheMan JamzTheMan left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 9 of 12 files at r6.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Azhrei and @cwisniew)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@JamzTheMan JamzTheMan merged commit 803cafe into RPTools:develop Feb 2, 2020
@Phergus Phergus deleted the themeStuff branch May 19, 2020 12: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