From 2da0862cb25e34937ee2f7cc587259eb8cf2b5be Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 10 Sep 2018 13:14:43 -0400 Subject: [PATCH] Fill.polyTri replaced --- build.gradle | 2 +- core/assets-raw/sprites/shapes/shape-3.png | Bin 200 -> 0 bytes core/assets-raw/sprites/shapes/shape-4.png | Bin 254 -> 0 bytes core/assets-raw/sprites/shapes/shape-5.png | Bin 215 -> 0 bytes core/assets-raw/sprites/shapes/shape-6.png | Bin 205 -> 0 bytes core/assets-raw/sprites/shapes/shape-7.png | Bin 214 -> 0 bytes .../world/blocks/defense/ForceProjector.java | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 core/assets-raw/sprites/shapes/shape-3.png delete mode 100644 core/assets-raw/sprites/shapes/shape-4.png delete mode 100644 core/assets-raw/sprites/shapes/shape-5.png delete mode 100644 core/assets-raw/sprites/shapes/shape-6.png delete mode 100644 core/assets-raw/sprites/shapes/shape-7.png diff --git a/build.gradle b/build.gradle index 597daf446a..97595af258 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '484d62ff4bfe109c6af654f612debdb5ca27df76' + uCoreVersion = '92770a6b462953cb183e7d204f4fc8226b66b2a8' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png deleted file mode 100644 index 358facf7db2fe057f81245354beeccac6dd2eb4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0y~yV6X>a4mJh`hVXcS`wR>W{hlt4Ar-gYUO3I$U?6bx zz?b`9nz_SOrtsgqak=sCtSvElH$Jp~JW_CnA*UuT;c&lvL+^R^W5S2~r5k$v*>fs> zGT!*XlVW4I2c$slP+Pt|gY^8?9`&|-Qw4jYc@qDAGvw5mCD|C(ylluhQ<3!J3*(I+ yA|U>Y29Y!y!#&juW_IkElTsd%dIU{GKa4mJh`hVXcS`wR>WM?GB}Ln>~)o#idmY`}B0 z=D+v;yj`hWCM`!Msu7VKU+h>GBJOUgMg*6QGEAM}+d;a(E=ll19=RU7gw>a4mJh`hVXcS`wR>W^E_P~Ln>~)y>*(m!9d{1 zg)jHN6g*|?N|?OnE#Ezl4u6TmYqs1ubjXnTiEBi~X+|SKp}R>fH4;L#S2#2|xbNpR z=a4mJh`hVXcS`wR>WQ#@T9Ln>~)y}eQJfC3MT z(<@9{X6qv|Jgf? j$5y&7y6+|tlr7%SklTB>zAKc0fq}u()z4*}Q$iB}HYio^ diff --git a/core/assets-raw/sprites/shapes/shape-7.png b/core/assets-raw/sprites/shapes/shape-7.png deleted file mode 100644 index 7fa595765a887f21d8efecc56ae0a1f255d8e5df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0y~yV6X>a4mJh`hVXcS`wR>Wb3I)gLn>~)y>(Eq$w9#N z;92{ZhK&4Pod@>SNq+gx(7Jirm+jAdJ->WYKGQhq#qoXv^(ij*>sod$Q2F&q@L8Mc z#pQhl{JOpWPcnS?VE89Tz{aMAy{>|x;)g_?8IPRYKIZ=r4%5NIhsz(-RrXuG|7MqV z;CIQ}{kv@0JmS++&Iik=TxIi^zu3}g4ex_*Vs<7C)xU2scu)EgtFOnmB_!h39}flw O1_n=8KbLh*2~7aizgav0 diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 67e482a6f9..74592de7a4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -222,7 +222,7 @@ public class ForceProjector extends Block { @Override public void draw(){ Draw.color(Palette.accent); - Fill.polyTri(x, y, 6, realRadius(entity)); + Fill.poly(x, y, 6, realRadius(entity)); Draw.color(); } @@ -231,7 +231,7 @@ public class ForceProjector extends Block { Draw.color(Color.WHITE); Draw.alpha(entity.hit); - Fill.polyTri(x, y, 6, realRadius(entity)); + Fill.poly(x, y, 6, realRadius(entity)); Draw.color(); }