Skip to content

Planet and Texture select #7

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

Merged
5GameMaker merged 5 commits into from
May 9, 2026
Merged

Planet and Texture select #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b334ed
planetBackground
RE-AST May 7, 2026
eb21f8c
Merge remote-tracking branch 'origin/master'
RE-AST May 7, 2026
c2f306c
fix
RE-AST May 7, 2026
0fcf81e
Texture
RE-AST May 9, 2026
02d8b5f
Merge branch 'master' into master
RE-AST May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/mindurka/ui/OCustomRulesDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class OCustomRulesDialog extends CustomRulesDialog {
private RevealedContentDialog<Block> revealedBlocks = new RevealedContentDialog<>("@revealedblocks", ContentType.block, b -> !b.name.startsWith("tmp-"));
private BannedContentDialog<UnitType> bannedUnits = new BannedContentDialog<>("@bannedunits", ContentType.unit, u -> true);
private EnvDialog envDialog = new EnvDialog();
private PlanetBackgroundDialog backgroundDialog = new PlanetBackgroundDialog();
private Table main;
private RulesWrite writeRoot;

Expand Down Expand Up @@ -181,6 +182,7 @@ void build() {

write.button("rules.env", () -> envDialog.show());
write.button("rules.weather", () -> Reflect.invoke(CustomRulesDialog.class, this, "weatherDialog", Util.noargs));
write.button("rules.planetbackground", () -> backgroundDialog.show());

write = writeRoot.category("planet");
write.selection("rules.title.planet", addItem -> {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/mindurka/ui/OEditorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,13 +787,15 @@ private void buildMenu() {
"@editor.importimage", "@editor.importimage.description", Icon.fileImage, (Runnable)() ->
Vars.platform.showFileChooser(true, "png", file ->
Vars.ui.loadAnd(() -> {
Pixmap pixmap = null;
try{
Pixmap pixmap = new Pixmap(file);
pixmap = new Pixmap(file);
editor.OBeginEdit(pixmap);
pixmap.dispose();
}catch(Exception e){
Vars.ui.showException("@editor.errorload", e);
Log.err(e);
}finally{
if(pixmap != null) pixmap.dispose();
}
})))
);
Expand Down
Loading
Loading