diff --git a/annotations/src/main/resources/revisions/Bullet/1.json b/annotations/src/main/resources/revisions/Bullet/1.json new file mode 100644 index 0000000000..c2d8c52eb2 --- /dev/null +++ b/annotations/src/main/resources/revisions/Bullet/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/EffectState/1.json b/annotations/src/main/resources/revisions/EffectState/1.json new file mode 100644 index 0000000000..0ccd683257 --- /dev/null +++ b/annotations/src/main/resources/revisions/EffectState/1.json @@ -0,0 +1 @@ +{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png index c8fa691c60..8e16f6f330 100644 Binary files a/core/assets-raw/sprites/ui/button.9.png and b/core/assets-raw/sprites/ui/button.9.png differ diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 777149c9ed..f6051b2ac7 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 12af129d0e..267b61862d 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index e8edc22e22..a8caf77d8c 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -249,10 +249,10 @@ public class MapEditorDialog extends Dialog implements Disposable{ state.rules = Gamemode.editor.apply(lastSavedRules.copy()); state.rules.sector = null; state.map = new Map(StringMap.of( - "name", "Editor Playtesting", - "width", editor.width(), - "height", editor.height() - )); + "name", "Editor Playtesting", + "width", editor.width(), + "height", editor.height() + )); world.endMapLoad(); //add entities so they update. is this really needed? for(Tile tile : world.tiles){ diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 70a09d55ae..3e620e50f0 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -17,29 +17,6 @@ import static mindustry.Vars.*; public class Drawf{ - //an experiment, to be removed - public static void runes(float x, float y, int[] text){ - int height = 6, width = 5; - float scale = 3; - float th = height * scale, tw = width * scale; - float skewx = width * scale, skewy = 0; - - Draw.color(Pal.accent); - - for(int i = 0; i < text.length; i++){ - float ox = x + i*tw*width; - - for(int j = 0; j < width * height; j++){ - int cx = j % width, cy = j / width; - float rx = ox + cx * tw + skewx * cy, ry = y + cy * th; - - if((text[i] & (1 << j)) != 0){ - Fill.quad(rx, ry, rx + tw, ry, rx + tw + skewx, ry + th + skewy, rx + skewx, ry + th + skewy); - } - } - } - } - public static float text(){ float z = Draw.z(); if(renderer.pixelator.enabled()){