Yair Morgenstern b4d56e1474 Merge branch 'master' of https://github.com/yairm210/UnCiv ...

# Conflicts:
#	android/assets/jsons/Translations.json

2018-10-18 23:12:21 +03:00

..

assets

Merge branch 'master' of https://github.com/yairm210/UnCiv

2018-10-18 23:12:21 +03:00

Images

Added Optics and Lighthouse

2018-10-16 21:13:29 +03:00

ImagesToNotAddToGame

AI units now go out and explore unseen areas

2018-09-16 23:14:35 +03:00

res

Lots off background work for future water tiles

2018-09-11 23:07:12 +03:00

src/com/unciv/game

Fixed crash caused by trebuchet listing "cannon" as upgrade, but the cannon doesn't exist yet 0_0

2018-05-28 22:03:56 +03:00

AndroidManifest.xml

Changed icons to the new and non-suable version!

2018-08-27 14:35:49 +03:00

build.gradle

Added Optics and Lighthouse

2018-10-16 21:13:29 +03:00

ic_launcher-web.png

…

pngcrush-dir.cmd

Icons shrunk (slightly) with pngCrush

2018-05-18 15:30:29 +03:00

proguard-rules.pro

…

project.properties

…