diff --git a/core/assets-raw/sprites/ui/icons/icon-chat.png b/core/assets-raw/sprites/ui/icons/icon-chat.png new file mode 100644 index 0000000000..b7c02421aa Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-chat.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index ffea1561d6..ccf3c265bd 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -34,42 +34,42 @@ blocks/blackrockshadow1 index: -1 blocks/blackstone1 rotate: false - xy: 856, 485 + xy: 868, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 866, 485 + xy: 878, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 876, 485 + xy: 888, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 886, 485 + xy: 898, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 896, 485 + xy: 908, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 906, 485 + xy: 918, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -83,7 +83,7 @@ blocks/blackstoneedge index: -1 blocks/block rotate: false - xy: 926, 485 + xy: 938, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,112 +118,112 @@ blocks/chainturret-icon index: -1 blocks/coal1 rotate: false - xy: 946, 485 + xy: 958, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 956, 485 + xy: 968, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 966, 485 + xy: 978, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 976, 485 + xy: 988, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 986, 485 + xy: 998, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 996, 485 + xy: 1008, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 1006, 485 + xy: 841, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 841, 473 + xy: 841, 463 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 841, 463 + xy: 851, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 482, 85 + xy: 851, 463 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 492, 82 + xy: 851, 453 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 502, 82 + xy: 861, 473 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 512, 82 + xy: 861, 463 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 522, 82 + xy: 861, 453 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 851, 473 + xy: 871, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 851, 463 + xy: 871, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,42 +237,42 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 851, 453 + xy: 881, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 861, 475 + xy: 871, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 861, 465 + xy: 881, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 871, 475 + xy: 891, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 861, 455 + xy: 881, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 871, 465 + xy: 891, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -286,7 +286,7 @@ blocks/dirtedge index: -1 blocks/door rotate: false - xy: 881, 475 + xy: 901, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,7 +300,7 @@ blocks/door-large index: -1 blocks/door-large-icon rotate: false - xy: 871, 455 + xy: 891, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,7 +314,7 @@ blocks/door-large-open index: -1 blocks/door-open rotate: false - xy: 881, 465 + xy: 901, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ blocks/doubleturret index: -1 blocks/duriumwall rotate: false - xy: 891, 475 + xy: 911, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,14 +342,14 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 881, 455 + xy: 901, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/enemyspawn rotate: false - xy: 891, 465 + xy: 911, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -363,42 +363,42 @@ blocks/flameturret index: -1 blocks/fluxpump rotate: false - xy: 891, 455 + xy: 911, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 901, 465 + xy: 921, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 911, 475 + xy: 931, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 901, 455 + xy: 921, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 911, 465 + xy: 931, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 921, 475 + xy: 941, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -412,21 +412,21 @@ blocks/grassedge index: -1 blocks/ice1 rotate: false - xy: 911, 455 + xy: 931, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 921, 465 + xy: 941, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 931, 475 + xy: 951, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -440,98 +440,98 @@ blocks/iceedge index: -1 blocks/icerock1 rotate: false - xy: 921, 455 + xy: 941, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 931, 465 + xy: 951, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 941, 475 + xy: 961, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 941, 475 + xy: 961, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 931, 455 + xy: 951, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 931, 455 + xy: 951, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 961, 455 + xy: 981, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 971, 465 + xy: 991, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 981, 475 + xy: 1001, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 971, 455 + xy: 991, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 981, 465 + xy: 1001, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 991, 475 + xy: 1001, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 398, 93 + xy: 410, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 981, 455 + xy: 1011, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -545,63 +545,63 @@ blocks/lavaedge index: -1 blocks/lavasmelter rotate: false - xy: 991, 465 + xy: 1011, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 1001, 475 + xy: 1011, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 991, 455 + xy: 492, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 1001, 465 + xy: 502, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 410, 93 + xy: 422, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 422, 93 + xy: 434, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 434, 93 + xy: 446, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 1011, 475 + xy: 522, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 1011, 475 + xy: 522, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -622,7 +622,7 @@ blocks/nuclearreactor-center index: -1 blocks/nuclearreactor-icon rotate: false - xy: 1011, 455 + xy: 811, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -643,7 +643,7 @@ blocks/nuclearreactor-small index: -1 blocks/oil rotate: false - xy: 312, 79 + xy: 821, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -657,182 +657,182 @@ blocks/oiledge index: -1 blocks/oilrefinery rotate: false - xy: 322, 79 + xy: 831, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 332, 79 + xy: 841, 444 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 446, 93 + xy: 458, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/playerspawn rotate: false - xy: 342, 79 + xy: 851, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 352, 79 + xy: 861, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 362, 83 + xy: 871, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 372, 83 + xy: 881, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 382, 83 + xy: 891, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 392, 83 + xy: 901, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 402, 83 + xy: 911, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 412, 83 + xy: 921, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 422, 83 + xy: 931, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 432, 83 + xy: 941, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 442, 83 + xy: 951, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 458, 93 + xy: 470, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 462, 83 + xy: 971, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 472, 83 + xy: 981, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 482, 75 + xy: 991, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 492, 72 + xy: 1001, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 502, 72 + xy: 1011, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 512, 72 + xy: 527, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 522, 72 + xy: 527, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 801, 443 + xy: 524, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 811, 445 + xy: 736, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 821, 445 + xy: 740, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 831, 445 + xy: 740, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -846,91 +846,91 @@ blocks/sandedge index: -1 blocks/shadow rotate: false - xy: 470, 93 + xy: 492, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 851, 443 + xy: 740, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 492, 92 + xy: 504, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 881, 445 + xy: 798, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 891, 445 + xy: 302, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 901, 445 + xy: 312, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 504, 92 + xy: 516, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 911, 445 + xy: 322, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 921, 445 + xy: 332, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 931, 445 + xy: 342, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 941, 445 + xy: 352, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 951, 445 + xy: 362, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 961, 445 + xy: 372, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -944,28 +944,28 @@ blocks/snowedge index: -1 blocks/sorter rotate: false - xy: 971, 445 + xy: 382, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 981, 445 + xy: 392, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 991, 445 + xy: 402, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 1001, 445 + xy: 412, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -979,56 +979,56 @@ blocks/steelwall-large index: -1 blocks/steelwall-large-icon rotate: false - xy: 1011, 445 + xy: 422, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 527, 126 + xy: 432, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 527, 116 + xy: 442, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 524, 106 + xy: 452, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 736, 381 + xy: 462, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 740, 371 + xy: 472, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 740, 361 + xy: 482, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 740, 351 + xy: 492, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1042,35 +1042,35 @@ blocks/stoneedge index: -1 blocks/stoneformer rotate: false - xy: 740, 341 + xy: 502, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 740, 331 + xy: 512, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 740, 321 + xy: 522, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 798, 393 + xy: 528, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 362, 73 + xy: 534, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1084,56 +1084,56 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 516, 92 + xy: 786, 391 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 372, 73 + xy: 538, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 382, 73 + xy: 532, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 392, 73 + xy: 532, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 402, 73 + xy: 542, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 412, 73 + xy: 542, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 422, 73 + xy: 746, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 432, 73 + xy: 750, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1147,49 +1147,49 @@ blocks/titaniumwall-large index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 442, 73 + xy: 750, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 786, 391 + xy: 844, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 472, 73 + xy: 750, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 482, 65 + xy: 750, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 492, 62 + xy: 740, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 502, 62 + xy: 750, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 512, 62 + xy: 734, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1203,14 +1203,14 @@ blocks/wateredge index: -1 blocks/waveturret rotate: false - xy: 844, 483 + xy: 856, 483 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 936, 485 + xy: 948, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,63 +1476,63 @@ enemies/titanenemy-t3 index: -1 enemyarrow rotate: false - xy: 302, 80 + xy: 482, 86 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 941, 465 + xy: 961, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 951, 475 + xy: 971, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 941, 455 + xy: 961, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-sand rotate: false - xy: 951, 465 + xy: 971, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 961, 475 + xy: 981, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 951, 455 + xy: 971, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 961, 465 + xy: 981, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 971, 475 + xy: 991, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1574,28 +1574,28 @@ mechs/ship-standard index: -1 shell rotate: false - xy: 841, 444 + xy: 740, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 861, 445 + xy: 740, 331 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 871, 445 + xy: 740, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 452, 73 + xy: 750, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1701,7 +1701,7 @@ ui/clear index: -1 ui/cursor rotate: false - xy: 531, 140 + xy: 734, 311 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -1783,6 +1783,13 @@ ui/icons/icon-cancel orig: 14, 14 offset: 0, 0 index: -1 +ui/icons/icon-chat + rotate: false + xy: 194, 85 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 ui/icons/icon-check rotate: false xy: 551, 195 @@ -1813,21 +1820,21 @@ ui/icons/icon-close-over index: -1 ui/icons/icon-crafting rotate: false - xy: 194, 85 + xy: 206, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-cursor rotate: false - xy: 206, 85 + xy: 218, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-defense rotate: false - xy: 218, 85 + xy: 230, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1841,7 +1848,7 @@ ui/icons/icon-discord index: -1 ui/icons/icon-distribution rotate: false - xy: 230, 85 + xy: 242, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1911,14 +1918,14 @@ ui/icons/icon-grid index: -1 ui/icons/icon-hold rotate: false - xy: 242, 85 + xy: 254, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-holdDelete rotate: false - xy: 254, 85 + xy: 266, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1939,7 +1946,7 @@ ui/icons/icon-host index: -1 ui/icons/icon-info rotate: false - xy: 266, 85 + xy: 278, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1981,21 +1988,21 @@ ui/icons/icon-loading index: -1 ui/icons/icon-menu rotate: false - xy: 278, 85 + xy: 290, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-none rotate: false - xy: 290, 85 + xy: 302, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-pause rotate: false - xy: 302, 89 + xy: 314, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2016,7 +2023,7 @@ ui/icons/icon-pick index: -1 ui/icons/icon-play rotate: false - xy: 314, 89 + xy: 326, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2030,14 +2037,14 @@ ui/icons/icon-play-2 index: -1 ui/icons/icon-power rotate: false - xy: 326, 89 + xy: 338, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-production rotate: false - xy: 338, 89 + xy: 350, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2121,7 +2128,7 @@ ui/icons/icon-save-map index: -1 ui/icons/icon-settings rotate: false - xy: 350, 89 + xy: 362, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2142,14 +2149,14 @@ ui/icons/icon-tools index: -1 ui/icons/icon-touch rotate: false - xy: 362, 93 + xy: 374, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icons/icon-touchDelete rotate: false - xy: 374, 93 + xy: 386, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2177,7 +2184,7 @@ ui/icons/icon-undo index: -1 ui/icons/icon-weapon rotate: false - xy: 386, 93 + xy: 398, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2357,42 +2364,42 @@ ui/window-empty index: -1 weapons/blaster rotate: false - xy: 916, 485 + xy: 928, 485 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/flamer rotate: false - xy: 901, 475 + xy: 921, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 1001, 455 + xy: 512, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 1011, 465 + xy: 801, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 452, 83 + xy: 961, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 462, 73 + xy: 750, 341 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 098c331d77..090660964e 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/net/Syncable.java b/core/src/io/anuke/mindustry/net/Syncable.java index a5fee2b06b..62e07e26d8 100644 --- a/core/src/io/anuke/mindustry/net/Syncable.java +++ b/core/src/io/anuke/mindustry/net/Syncable.java @@ -10,7 +10,7 @@ import io.anuke.ucore.entities.Entity; import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; -//TODO clean up this giant mess +//TODO clean up this mess public interface Syncable { public Interpolator getInterpolator(); @@ -20,6 +20,7 @@ public interface Syncable { public abstract void read(T entity, float[] data); public abstract void update(T entity, Interpolator interpolator); + //TODO write dashing state so particles appear public static final SyncType player = new SyncType() { @Override public float[] write(Player entity) { @@ -78,7 +79,7 @@ public interface Syncable { }; } - public static class Interpolator { + class Interpolator { public SyncType type; public Vector2 target = new Vector2(); public Vector2 last = new Vector2(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 8cf72e324f..637c868799 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -65,9 +65,19 @@ public class HudFragment implements Fragment{ }).get(); pause = new imagebutton("icon-pause", isize, ()->{ - GameState.set(GameState.is(State.paused) ? State.playing : State.paused); - }).update(i -> i.getStyle().imageUp = Core.skin.getDrawable(GameState.is(State.paused) ? "icon-play" : "icon-pause")).cell - .disabled(b -> Net.active()).get(); + if(Net.active() && Vars.android){ + //TODO open android chat + }else { + GameState.set(GameState.is(State.paused) ? State.playing : State.paused); + } + }).update(i ->{ + if(Net.active() && Vars.android){ + i.getStyle().imageUp = Core.skin.getDrawable("icon-chat"); + }else { + i.setDisabled(Net.active()); + i.getStyle().imageUp = Core.skin.getDrawable(GameState.is(State.paused) ? "icon-play" : "icon-pause"); + } + }).get(); }}.end();