OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 23:57:25 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

v0.6.15 released.

Browse Source 
Includes a way to view which tileset a tile is from on a map. It is
shown in the tooltip from the "Testing" tab of the map editor.
This commit is contained in:
Zukero
2019-05-31 10:28:16 +02:00
parent 92e07e76d2
commit d04fd7cc3f
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ATCS_JAR.jardesc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<jardesc>
<jar path="ATContentStudio/ATCS_v0.6.14.jar"/>
<jar path="ATContentStudio/ATCS_v0.6.15.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>

2
packaging/ATCS_latest
View File

@@ -1 +1 @@
v0.6.14
v0.6.15

4
packaging/Windows/ATCS_Installer.nsi
View File

@@ -1,7 +1,7 @@
!include MUI2.nsh
!define VERSION "0.6.14"
!define TRAINER_VERSION "0.1.4"
!define VERSION "0.6.15"
!define TRAINER_VERSION "0.1.5"
!define JAVA_BIN "javaw"
Name "Andor's Trail Content Studio v${VERSION}"

2
src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
View File

@@ -43,7 +43,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
public class ATContentStudio {
public static final String APP_NAME = "Andor's Trail Content Studio";
public static final String APP_VERSION = "v0.6.14";
public static final String APP_VERSION = "v0.6.15";
public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";

43
src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
View File

@@ -2463,10 +2463,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
return false;
}
JLabel noTileGround = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
JLabel noTileObjects = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
JLabel noTileAbove = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
JLabel noTileTop = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
JLabel noTileGround = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
JLabel noTileObjects = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
JLabel noTileAbove = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
JLabel noTileTop = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
{
noTileGround.setPreferredSize(new Dimension(32, 32));
noTileObjects.setPreferredSize(new Dimension(32, 32));
@@ -2491,16 +2491,19 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
JPanel content = new JPanel();
content.setLayout(new JideBoxLayout(content, JideBoxLayout.PAGE_AXIS));
if (tooltippedTile != null) {
Image tile;
tiled.core.Tile tile;
Image tileImage;
JLabel label;
if (top != null && top.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
tile = top.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
tile = top.getTileAt(tooltippedTile.x, tooltippedTile.y);
tileImage = tile.getImage();
} else {
tile = null;
tileImage = null;
}
if (tile != null) {
label = new JLabel(new ImageIcon(tile));
if (tileImage != null) {
label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
label.setPreferredSize(new Dimension(32,32));
content.add(label, JideBoxLayout.FIX);
//Fix when (if?) Top is advertised publicly.
@@ -2509,12 +2512,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
}
if (above != null && above.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
tile = above.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
tile = above.getTileAt(tooltippedTile.x, tooltippedTile.y);
tileImage = tile.getImage();
} else {
tile = null;
tileImage = null;
}
if (tile != null) {
label = new JLabel(new ImageIcon(tile));
if (tileImage != null) {
label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
label.setPreferredSize(new Dimension(32,32));
content.add(label, JideBoxLayout.FIX);
} else {
@@ -2522,12 +2527,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
}
if (objects != null && objects.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
tile = objects.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
tile = objects.getTileAt(tooltippedTile.x, tooltippedTile.y);
tileImage = tile.getImage();
} else {
tile = null;
tileImage = null;
}
if (tile != null) {
label = new JLabel(new ImageIcon(tile));
if (tileImage != null) {
label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
label.setPreferredSize(new Dimension(32,32));
content.add(label, JideBoxLayout.FIX);
} else {
@@ -2535,12 +2542,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
}
if (ground != null && ground.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
tile = ground.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
tile = ground.getTileAt(tooltippedTile.x, tooltippedTile.y);
tileImage = tile.getImage();
} else {
tile = null;
tileImage = null;
}
if (tile != null) {
label = new JLabel(new ImageIcon(tile));
if (tileImage != null) {
label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
label.setPreferredSize(new Dimension(32,32));
content.add(label, JideBoxLayout.FIX);
} else {