this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

minor bugfixes

clover 32352f6e d5fc48e7

+19 -9
+8
CHANGELOG.md
··· 2 2 3 3 All notable changes to this project will be documented in this file. 4 4 5 + ## [0.10.1] - 2025-04-01 6 + 7 + ### Fixed 8 + - (Sprite Editor) Imported sprites from old versions now load rasters properly 9 + - (Sprite Editor) Component rendering is now sorted in the correct order 10 + - (Map Editor) Push block grid indices are now saved 11 + 5 12 ## [0.10.0] - 2025-03-13 6 13 7 14 ### Added ··· 24 31 25 32 ### Fixed 26 33 - (Map Editor) Importing/exporting 34 + - (Map Editor) Camera target override toggles now save properly 27 35 28 36 ## [0.9.4] - 2025-02-21 29 37
+1 -1
app.properties
··· 1 - version=0.10.0 1 + version=0.10.1
+1
src/main/java/game/map/MapKey.java
··· 75 75 ATTR_EXTRACTED ("extracted"), 76 76 77 77 TAG_MARKER_GRID ("Grid"), 78 + ATTR_MARKER_GRID_INDEX ("index"), 78 79 ATTR_MARKER_GRID_SIZE ("size"), 79 80 ATTR_MARKER_GRID_OCC ("gridContent"), 80 81 ATTR_MARKER_GRID_GRAV ("blockGravity"),
+5 -1
src/main/java/game/map/marker/GridComponent.java
··· 9 9 import org.w3c.dom.Element; 10 10 11 11 import app.input.InputFileException; 12 + import common.commands.AbstractCommand; 12 13 import common.commands.EditableField; 13 14 import common.commands.EditableField.EditableFieldFactory; 14 15 import common.commands.EditableField.StandardBoolName; ··· 16 17 import game.map.BoundingBox; 17 18 import game.map.editor.MapEditor; 18 19 import game.map.editor.camera.MapEditViewport; 19 - import common.commands.AbstractCommand; 20 20 import game.map.editor.render.PresetColor; 21 21 import game.map.editor.render.Renderer; 22 22 import game.map.editor.render.RenderingOptions; ··· 92 92 public void toXML(XmlWriter xmw) 93 93 { 94 94 XmlTag compTag = xmw.createTag(TAG_MARKER_GRID, true); 95 + xmw.addInt(compTag, ATTR_MARKER_GRID_INDEX, gridIndex.get()); 95 96 xmw.addIntArray(compTag, ATTR_MARKER_GRID_SIZE, gridSizeX.get(), gridSizeZ.get(), gridSpacing.get()); 96 97 97 98 int[] gridContent = new int[gridOccupants.size() * 3]; ··· 114 115 public void fromXML(XmlReader xmr, Element markerElem) 115 116 { 116 117 Element gridElem = xmr.getUniqueRequiredTag(markerElem, TAG_MARKER_GRID); 118 + 119 + if (xmr.hasAttribute(gridElem, ATTR_MARKER_GRID_INDEX)) // optional to allow loading old versions 120 + gridIndex.set(xmr.readInt(gridElem, ATTR_MARKER_GRID_INDEX)); 117 121 118 122 int[] grid = xmr.readIntArray(gridElem, ATTR_MARKER_GRID_SIZE, 3); 119 123 gridSizeX.set(grid[0]);
+1 -3
src/main/java/game/sprite/SpriteComponent.java
··· 450 450 int y = (parent != null) ? parent.getY() + getY() : getY(); 451 451 int z = (parent != null) ? parent.getZ() + getZ() : getZ(); 452 452 453 - float depth = z / 100.0f; 454 - 455 453 float w = face.asset.img.width / 2; 456 454 float h = face.asset.img.height; 457 455 corners[0].set(-w, 0, 0); ··· 476 474 if (scaleX != 100 || scaleY != 100 || scaleZ != 100) 477 475 mtx.scale(renderScaleX, renderScaleY, renderScaleZ); 478 476 479 - mtx.translate(x, y, depth); 477 + mtx.translate(x, y, z); 480 478 481 479 for (int i = 0; i < 4; i++) 482 480 corners[i] = mtx.applyTransform(corners[i]);
+1 -1
src/main/java/game/sprite/editor/SpriteCamera.java
··· 149 149 { 150 150 float halfW = zoom * glViewSizeX / 2.0f; 151 151 float halfH = zoom * glViewSizeY / 2.0f; 152 - projMatrix.ortho(-halfW, halfW, -halfH, halfH, 1, Float.MAX_VALUE); 152 + projMatrix.ortho(-halfW, halfW, -halfH, halfH, 1, 0x2000); 153 153 glLoadProjection(); 154 154 } 155 155
+2 -3
src/main/java/game/sprite/editor/animators/command/SetImage.java
··· 48 48 49 49 // FFF is valid, so sign extend (implicit cast to int) 50 50 int id = (s0 << 20) >> 20; 51 + 51 52 if (id < 0 || id >= sprite.rasters.size()) 52 - img = null; 53 - else 54 - img = sprite.rasters.get(id); 53 + imgIndex = id; 55 54 } 56 55 57 56 public SetImage(CommandAnimator animator, SpriteRaster img)