Made atlas textures use mipmaps again (#4187)

A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.

Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.

android/assets/BuildingIcons.atlas

@@ -2,781 +2,781 @@
 BuildingIcons.png
 size: 2048, 1024
 format: RGBA8888
-filter: Nearest, Nearest
+filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 Alhambra
   rotate: false
-  xy: 2, 920
+  xy: 4, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Angkor Wat
   rotate: false
-  xy: 2, 818
+  xy: 4, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Apollo Program
   rotate: false
-  xy: 104, 920
+  xy: 112, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Aqueduct
   rotate: false
-  xy: 2, 716
+  xy: 4, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Armory
   rotate: false
-  xy: 104, 818
+  xy: 112, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Arsenal
   rotate: false
-  xy: 206, 920
+  xy: 220, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bank
   rotate: false
-  xy: 2, 614
+  xy: 4, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Barracks
   rotate: false
-  xy: 104, 716
+  xy: 112, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bazaar
   rotate: false
-  xy: 206, 818
+  xy: 220, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Big Ben
   rotate: false
-  xy: 308, 920
+  xy: 328, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Brandenburg Gate
   rotate: false
-  xy: 2, 512
+  xy: 4, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Broadcast Tower
   rotate: false
-  xy: 104, 614
+  xy: 112, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Burial Tomb
   rotate: false
-  xy: 206, 716
+  xy: 220, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 CN Tower
   rotate: false
-  xy: 308, 818
+  xy: 328, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Castle
   rotate: false
-  xy: 410, 920
+  xy: 436, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Chichen Itza
   rotate: false
-  xy: 2, 410
+  xy: 4, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Circus
   rotate: false
-  xy: 104, 512
+  xy: 112, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Circus Maximus
   rotate: false
-  xy: 206, 614
+  xy: 220, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Colosseum
   rotate: false
-  xy: 308, 716
+  xy: 328, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Colossus
   rotate: false
-  xy: 410, 818
+  xy: 436, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Courthouse
   rotate: false
-  xy: 512, 920
+  xy: 544, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cristo Redentor
   rotate: false
-  xy: 2, 308
+  xy: 4, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Eiffel Tower
   rotate: false
-  xy: 104, 410
+  xy: 112, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Factory
   rotate: false
-  xy: 206, 512
+  xy: 220, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Floating Gardens
   rotate: false
-  xy: 308, 614
+  xy: 328, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Forbidden Palace
   rotate: false
-  xy: 410, 716
+  xy: 436, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Forge
   rotate: false
-  xy: 512, 818
+  xy: 544, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Garden
   rotate: false
-  xy: 614, 920
+  xy: 652, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Granary
   rotate: false
-  xy: 2, 206
+  xy: 4, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Wall
   rotate: false
-  xy: 104, 308
+  xy: 112, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hagia Sophia
   rotate: false
-  xy: 206, 410
+  xy: 220, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hanging Gardens
   rotate: false
-  xy: 308, 512
+  xy: 328, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hanse
   rotate: false
-  xy: 410, 614
+  xy: 436, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Harbor
   rotate: false
-  xy: 512, 716
+  xy: 544, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hermitage
   rotate: false
-  xy: 614, 818
+  xy: 652, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Heroic Epic
   rotate: false
-  xy: 716, 920
+  xy: 760, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Himeji Castle
   rotate: false
-  xy: 2, 104
+  xy: 4, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hospital
   rotate: false
-  xy: 104, 206
+  xy: 112, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hubble Space Telescope
   rotate: false
-  xy: 206, 308
+  xy: 220, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hydro Plant
   rotate: false
-  xy: 308, 410
+  xy: 328, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ironworks
   rotate: false
-  xy: 410, 512
+  xy: 436, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Kremlin
   rotate: false
-  xy: 512, 614
+  xy: 544, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Krepost
   rotate: false
-  xy: 614, 716
+  xy: 652, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Leaning Tower of Pisa
   rotate: false
-  xy: 716, 818
+  xy: 760, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Library
   rotate: false
-  xy: 818, 920
+  xy: 868, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Lighthouse
   rotate: false
-  xy: 2, 2
+  xy: 112, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Longhouse
   rotate: false
-  xy: 104, 104
+  xy: 220, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Machu Picchu
   rotate: false
-  xy: 206, 206
+  xy: 328, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Manhattan Project
   rotate: false
-  xy: 308, 308
+  xy: 436, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Market
   rotate: false
-  xy: 410, 410
+  xy: 544, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mausoleum of Halicarnassus
   rotate: false
-  xy: 512, 512
+  xy: 652, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Medical Lab
   rotate: false
-  xy: 614, 614
+  xy: 760, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Military Academy
   rotate: false
-  xy: 716, 716
+  xy: 868, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Military Base
   rotate: false
-  xy: 818, 818
+  xy: 976, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mint
   rotate: false
-  xy: 920, 920
+  xy: 220, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Monastery
   rotate: false
-  xy: 104, 2
+  xy: 328, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Monument
   rotate: false
-  xy: 206, 104
+  xy: 436, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mud Pyramid Mosque
   rotate: false
-  xy: 308, 206
+  xy: 544, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mughal Fort
   rotate: false
-  xy: 410, 308
+  xy: 652, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Museum
   rotate: false
-  xy: 512, 410
+  xy: 760, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 National College
   rotate: false
-  xy: 614, 512
+  xy: 868, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 National Epic
   rotate: false
-  xy: 716, 614
+  xy: 976, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 National Treasury
   rotate: false
-  xy: 818, 716
+  xy: 1084, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Neuschwanstein
   rotate: false
-  xy: 920, 818
+  xy: 328, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Notre Dame
   rotate: false
-  xy: 1022, 920
+  xy: 436, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Nuclear Plant
   rotate: false
-  xy: 206, 2
+  xy: 544, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Observatory
   rotate: false
-  xy: 308, 104
+  xy: 652, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Opera House
   rotate: false
-  xy: 410, 206
+  xy: 760, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Oxford University
   rotate: false
-  xy: 512, 308
+  xy: 868, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Palace
   rotate: false
-  xy: 614, 410
+  xy: 976, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Paper Maker
   rotate: false
-  xy: 716, 512
+  xy: 1084, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Pentagon
   rotate: false
-  xy: 818, 614
+  xy: 1192, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Petra
   rotate: false
-  xy: 920, 716
+  xy: 436, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Porcelain Tower
   rotate: false
-  xy: 1022, 818
+  xy: 544, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Public School
   rotate: false
-  xy: 1124, 920
+  xy: 652, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Research Lab
   rotate: false
-  xy: 308, 2
+  xy: 760, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 SS Booster
   rotate: false
-  xy: 410, 104
+  xy: 868, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 SS Cockpit
   rotate: false
-  xy: 512, 206
+  xy: 976, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 SS Engine
   rotate: false
-  xy: 614, 308
+  xy: 1084, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 SS Stasis Chamber
   rotate: false
-  xy: 716, 410
+  xy: 1192, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Satrap's Court
   rotate: false
-  xy: 818, 512
+  xy: 1300, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Seaport
   rotate: false
-  xy: 920, 614
+  xy: 544, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Sistine Chapel
   rotate: false
-  xy: 1022, 716
+  xy: 652, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Solar Plant
   rotate: false
-  xy: 1124, 818
+  xy: 760, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Spaceship Factory
   rotate: false
-  xy: 1226, 920
+  xy: 868, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stable
   rotate: false
-  xy: 410, 2
+  xy: 976, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stadium
   rotate: false
-  xy: 512, 104
+  xy: 1084, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Statue of Liberty
   rotate: false
-  xy: 614, 206
+  xy: 1192, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Statue of Zeus
   rotate: false
-  xy: 716, 308
+  xy: 1300, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stock Exchange
   rotate: false
-  xy: 818, 410
+  xy: 1408, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stone Works
   rotate: false
-  xy: 920, 512
+  xy: 652, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stonehenge
   rotate: false
-  xy: 1022, 614
+  xy: 760, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Sydney Opera House
   rotate: false
-  xy: 1124, 716
+  xy: 868, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Taj Mahal
   rotate: false
-  xy: 1226, 818
+  xy: 976, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Temple
   rotate: false
-  xy: 1328, 920
+  xy: 1084, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Temple of Artemis
   rotate: false
-  xy: 512, 2
+  xy: 1192, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Terracotta Army
   rotate: false
-  xy: 614, 104
+  xy: 1300, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 The Great Library
   rotate: false
-  xy: 716, 206
+  xy: 1408, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 The Great Lighthouse
   rotate: false
-  xy: 818, 308
+  xy: 1516, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 The Louvre
   rotate: false
-  xy: 920, 410
+  xy: 760, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 The Oracle
   rotate: false
-  xy: 1022, 512
+  xy: 868, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 The Pyramids
   rotate: false
-  xy: 1124, 614
+  xy: 976, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Theatre
   rotate: false
-  xy: 1226, 716
+  xy: 1084, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 University
   rotate: false
-  xy: 1328, 818
+  xy: 1192, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Utopia Project
   rotate: false
-  xy: 1430, 920
+  xy: 1300, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Walls
   rotate: false
-  xy: 614, 2
+  xy: 1408, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Walls of Babylon
   rotate: false
-  xy: 716, 104
+  xy: 1516, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Wat
   rotate: false
-  xy: 818, 206
+  xy: 1624, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Water Mill
   rotate: false
-  xy: 920, 308
+  xy: 868, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Windmill
   rotate: false
-  xy: 1022, 410
+  xy: 976, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Workshop
   rotate: false
-  xy: 1124, 512
+  xy: 1084, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0

android/assets/FlagIcons.atlas

@@ -2,207 +2,207 @@
 FlagIcons.png
 size: 2048, 512
 format: RGBA8888
-filter: Nearest, Nearest
+filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 Brazilian_Portuguese
   rotate: false
-  xy: 2, 262
+  xy: 4, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Bulgarian
   rotate: false
-  xy: 2, 132
+  xy: 4, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Czech
   rotate: false
-  xy: 132, 262
+  xy: 140, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Dutch
   rotate: false
-  xy: 2, 2
+  xy: 4, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 English
   rotate: false
-  xy: 132, 132
+  xy: 140, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Finnish
   rotate: false
-  xy: 262, 262
+  xy: 276, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 French
   rotate: false
-  xy: 132, 2
+  xy: 140, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 German
   rotate: false
-  xy: 262, 132
+  xy: 276, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Hungarian
   rotate: false
-  xy: 392, 262
+  xy: 412, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Indonesian
   rotate: false
-  xy: 262, 2
+  xy: 276, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Italian
   rotate: false
-  xy: 392, 132
+  xy: 412, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Japanese
   rotate: false
-  xy: 522, 262
+  xy: 548, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Korean
   rotate: false
-  xy: 392, 2
+  xy: 412, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Lithuanian
   rotate: false
-  xy: 522, 132
+  xy: 548, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Malay
   rotate: false
-  xy: 652, 262
+  xy: 684, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Persian_(Pinglish-DIN)
   rotate: false
-  xy: 522, 2
+  xy: 548, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Persian_(Pinglish-UN)
   rotate: false
-  xy: 522, 2
+  xy: 548, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Polish
   rotate: false
-  xy: 652, 132
+  xy: 684, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Portuguese
   rotate: false
-  xy: 782, 262
+  xy: 820, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Romanian
   rotate: false
-  xy: 652, 2
+  xy: 684, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Russian
   rotate: false
-  xy: 782, 132
+  xy: 820, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Simplified_Chinese
   rotate: false
-  xy: 912, 262
+  xy: 956, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Spanish
   rotate: false
-  xy: 782, 2
+  xy: 820, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Swedish
   rotate: false
-  xy: 912, 132
+  xy: 956, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Thai
   rotate: false
-  xy: 1042, 262
+  xy: 1092, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Traditional_Chinese
   rotate: false
-  xy: 912, 2
+  xy: 956, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Turkish
   rotate: false
-  xy: 1042, 132
+  xy: 1092, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Ukrainian
   rotate: false
-  xy: 1172, 262
+  xy: 1228, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 Vietnamese
   rotate: false
-  xy: 1042, 2
+  xy: 1092, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0

android/assets/Skin.atlas

@@ -6,42 +6,42 @@ filter: Linear, Linear
 repeat: none
 checkbox
   rotate: false
-  xy: 140, 26
+  xy: 160, 23
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
   index: -1
 checkbox-pressed
   rotate: false
-  xy: 173, 26
+  xy: 199, 23
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
   index: -1
 rectangleWithOutline
   rotate: false
-  xy: 2, 2
+  xy: 64, 13
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 roundedEdgeRectangle
   rotate: false
-  xy: 2, 7
+  xy: 4, 4
   size: 52, 50
   orig: 52, 50
   offset: 0, 0
   index: -1
 select-box
   rotate: false
-  xy: 56, 27
+  xy: 64, 24
   size: 40, 30
   orig: 40, 30
   offset: 0, 0
   index: -1
 select-box-pressed
   rotate: false
-  xy: 98, 27
+  xy: 112, 24
   size: 40, 30
   orig: 40, 30
   offset: 0, 0

android/assets/UnitIcons.atlas

@@ -1,691 +1,691 @@
 
 UnitIcons.png
-size: 2048, 512
+size: 2048, 1024
 format: RGBA8888
-filter: Nearest, Nearest
+filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 Anti-Aircraft Gun
   rotate: false
-  xy: 2, 410
+  xy: 4, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Anti-Tank Gun
   rotate: false
-  xy: 2, 308
+  xy: 4, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Archer
   rotate: false
-  xy: 104, 410
+  xy: 112, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Artillery
   rotate: false
-  xy: 2, 206
+  xy: 4, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 B17
   rotate: false
-  xy: 104, 308
+  xy: 112, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ballista
   rotate: false
-  xy: 206, 410
+  xy: 220, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Battleship
   rotate: false
-  xy: 2, 104
+  xy: 4, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Berserker
   rotate: false
-  xy: 2, 2
+  xy: 112, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bomber
   rotate: false
-  xy: 104, 206
+  xy: 220, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Bowman
   rotate: false
-  xy: 206, 308
+  xy: 328, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Brute
   rotate: false
-  xy: 308, 410
+  xy: 4, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Camel Archer
   rotate: false
-  xy: 104, 104
+  xy: 112, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cannon
   rotate: false
-  xy: 104, 2
+  xy: 220, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Caravel
   rotate: false
-  xy: 206, 206
+  xy: 328, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Carrier
   rotate: false
-  xy: 308, 308
+  xy: 436, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Catapult
   rotate: false
-  xy: 410, 410
+  xy: 4, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cavalry
   rotate: false
-  xy: 206, 104
+  xy: 112, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Chariot Archer
   rotate: false
-  xy: 206, 2
+  xy: 220, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Chu-Ko-Nu
   rotate: false
-  xy: 308, 206
+  xy: 328, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Companion Cavalry
   rotate: false
-  xy: 410, 308
+  xy: 436, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Composite Bowman
   rotate: false
-  xy: 512, 410
+  xy: 544, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Conquistador
   rotate: false
-  xy: 308, 104
+  xy: 4, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Cossack
   rotate: false
-  xy: 308, 2
+  xy: 112, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Crossbowman
   rotate: false
-  xy: 410, 206
+  xy: 220, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Destroyer
   rotate: false
-  xy: 512, 308
+  xy: 328, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Fighter
   rotate: false
-  xy: 614, 410
+  xy: 436, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Foreign Legion
   rotate: false
-  xy: 410, 104
+  xy: 544, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Frigate
   rotate: false
-  xy: 410, 2
+  xy: 652, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Galleass
   rotate: false
-  xy: 512, 206
+  xy: 4, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Gatling Gun
   rotate: false
-  xy: 614, 308
+  xy: 112, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Artist
   rotate: false
-  xy: 716, 410
+  xy: 220, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Engineer
   rotate: false
-  xy: 512, 104
+  xy: 328, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great General
   rotate: false
-  xy: 614, 212
+  xy: 436, 550
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 Great Merchant
   rotate: false
-  xy: 512, 2
+  xy: 544, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great Scientist
   rotate: false
-  xy: 716, 308
+  xy: 652, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great War Bomber
   rotate: false
-  xy: 818, 410
+  xy: 760, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Great War Infantry
   rotate: false
-  xy: 614, 110
+  xy: 4, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Guided Missile
   rotate: false
-  xy: 716, 206
+  xy: 112, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Helicopter Gunship
   rotate: false
-  xy: 818, 308
+  xy: 220, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hoplite
   rotate: false
-  xy: 920, 410
+  xy: 328, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Horseman
   rotate: false
-  xy: 614, 8
+  xy: 436, 442
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Hwach'a
   rotate: false
-  xy: 716, 104
+  xy: 544, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Infantry
   rotate: false
-  xy: 716, 2
+  xy: 652, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ironclad
   rotate: false
-  xy: 818, 206
+  xy: 760, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Jaguar
   rotate: false
-  xy: 920, 308
+  xy: 868, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Janissary
   rotate: false
-  xy: 1022, 410
+  xy: 112, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Jet Fighter
   rotate: false
-  xy: 818, 104
+  xy: 220, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Keshik
   rotate: false
-  xy: 818, 2
+  xy: 328, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Khan
   rotate: false
-  xy: 920, 206
+  xy: 436, 334
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Knight
   rotate: false
-  xy: 1022, 308
+  xy: 544, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Lancer
   rotate: false
-  xy: 1124, 410
+  xy: 652, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Landship
   rotate: false
-  xy: 920, 104
+  xy: 760, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Landsknecht
   rotate: false
-  xy: 920, 2
+  xy: 868, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Legion
   rotate: false
-  xy: 1022, 206
+  xy: 976, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Longbowman
   rotate: false
-  xy: 1124, 308
+  xy: 220, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Longswordsman
   rotate: false
-  xy: 1226, 410
+  xy: 328, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Machine Gun
   rotate: false
-  xy: 1022, 104
+  xy: 436, 226
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mandekalu Cavalry
   rotate: false
-  xy: 1022, 2
+  xy: 544, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Maori Warrior
   rotate: false
-  xy: 1124, 206
+  xy: 652, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Marine
   rotate: false
-  xy: 1226, 308
+  xy: 760, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mechanized Infantry
   rotate: false
-  xy: 1328, 410
+  xy: 868, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Minuteman
   rotate: false
-  xy: 1124, 104
+  xy: 976, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mobile SAM
   rotate: false
-  xy: 1124, 2
+  xy: 1084, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Modern Armor
   rotate: false
-  xy: 1226, 206
+  xy: 328, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Mohawk Warrior
   rotate: false
-  xy: 1328, 308
+  xy: 436, 118
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Musketeer
   rotate: false
-  xy: 1430, 410
+  xy: 544, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Musketman
   rotate: false
-  xy: 1226, 105
+  xy: 652, 329
   size: 100, 99
   orig: 100, 99
   offset: 0, 0
   index: -1
 Naresuan's Elephant
   rotate: false
-  xy: 1328, 206
+  xy: 760, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Norwegian Ski Infantry
   rotate: false
-  xy: 1430, 308
+  xy: 868, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Nuclear Missile
   rotate: false
-  xy: 1532, 410
+  xy: 976, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Panzer
   rotate: false
-  xy: 1226, 3
+  xy: 1084, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Paratrooper
   rotate: false
-  xy: 1328, 104
+  xy: 1192, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Persian Immortal
   rotate: false
-  xy: 1328, 2
+  xy: 436, 10
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Pikeman
   rotate: false
-  xy: 1430, 206
+  xy: 544, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Rifleman
   rotate: false
-  xy: 1532, 308
+  xy: 652, 221
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Rocket Artillery
   rotate: false
-  xy: 1634, 410
+  xy: 760, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Samurai
   rotate: false
-  xy: 1430, 104
+  xy: 868, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Scout
   rotate: false
-  xy: 1430, 2
+  xy: 976, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Settler
   rotate: false
-  xy: 1532, 206
+  xy: 1084, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Ship of the Line
   rotate: false
-  xy: 1634, 308
+  xy: 1192, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Sipahi
   rotate: false
-  xy: 1736, 410
+  xy: 1300, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Slinger
   rotate: false
-  xy: 1532, 104
+  xy: 652, 113
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Spearman
   rotate: false
-  xy: 1532, 2
+  xy: 760, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Stealth Bomber
   rotate: false
-  xy: 1634, 206
+  xy: 868, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Submarine
   rotate: false
-  xy: 1736, 308
+  xy: 976, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Swordsman
   rotate: false
-  xy: 1838, 410
+  xy: 1084, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Tank
   rotate: false
-  xy: 1634, 104
+  xy: 1192, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Tercio
   rotate: false
-  xy: 1634, 2
+  xy: 1300, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Trebuchet
   rotate: false
-  xy: 1736, 206
+  xy: 1408, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Triplane
   rotate: false
-  xy: 1838, 308
+  xy: 868, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Trireme
   rotate: false
-  xy: 1940, 409
+  xy: 976, 327
   size: 100, 101
   orig: 100, 101
   offset: 0, 0
   index: -1
 Turtle Ship
   rotate: false
-  xy: 1736, 104
+  xy: 1084, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 War Chariot
   rotate: false
-  xy: 1736, 2
+  xy: 1192, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 War Elephant
   rotate: false
-  xy: 1838, 206
+  xy: 1300, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Warrior
   rotate: false
-  xy: 1940, 307
+  xy: 1408, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Work Boats
   rotate: false
-  xy: 1838, 104
+  xy: 1516, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Worker
   rotate: false
-  xy: 1838, 2
+  xy: 1084, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 Zero
   rotate: false
-  xy: 1940, 205
+  xy: 1192, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0

desktop/src/com/unciv/app/desktop/DesktopLauncher.kt

@@ -146,6 +146,12 @@ internal object DesktopLauncher {
         settings.combineSubdirectories = true
         settings.pot = true
         settings.fast = true
+        // Set some additional padding and enable duplicatePadding to prevent image edges from bleeding into each other due to mipmapping
+        settings.paddingX = 8
+        settings.paddingY = 8
+        settings.duplicatePadding = true
+        settings.filterMin = Texture.TextureFilter.MipMapLinearLinear
+        settings.filterMag = Texture.TextureFilter.MipMapLinearLinear // I'm pretty sure this doesn't make sense for magnification, but setting it to Linear gives strange results
 
         if (File("../Images").exists()) { // So we don't run this from within a fat JAR
             packImagesIfOutdated(settings, "../Images", ".", "game")