mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 08:49:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Made atlas textures use mipmaps again (#4187)

Browse Source 
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.
This commit is contained in:
Arthur van der Staaij
2021-06-18 08:25:11 +02:00
committed by GitHub
parent fc7e07aa7f
commit d7865f4a81
11 changed files with 853 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
android/assets/BuildingIcons.atlas
View File

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

BIN
android/assets/BuildingIcons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 248 KiB

After

Width:  |  Height:  |  Size: 249 KiB

60
android/assets/FlagIcons.atlas
View File

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

BIN
android/assets/FlagIcons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 129 KiB

12
android/assets/Skin.atlas
View File

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

BIN
android/assets/Skin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

200
android/assets/UnitIcons.atlas
View File

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

BIN
android/assets/UnitIcons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 KiB

After

Width:  |  Height:  |  Size: 306 KiB

1198
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 962 KiB

After

Width:  |  Height:  |  Size: 982 KiB

6
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -146,6 +146,12 @@ internal object DesktopLauncher {
settings.combineSubdirectories = true settings.combineSubdirectories = true
settings.pot = true settings.pot = true
settings.fast = 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 if (File("../Images").exists()) { // So we don't run this from within a fat JAR
packImagesIfOutdated(settings, "../Images", ".", "game") packImagesIfOutdated(settings, "../Images", ".", "game")