wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
872 commits 7 branches 304 tags 288 MiB
Commit graph

705 commits

Author SHA1 Message Date
Yair Morgenstern
7ee76771f5 Added some missing translations 
aab/apk now doesn't einclude local debug files
Maybe solved resume problem on Chrome OS (see issue 322), needs to be checked
 2018-12-10 14:09:01 +02:00
yairm210
2dd32b9a2c
Merge pull request #326 from ninjatao/fix_free_tech 
Fix research queue when getting free tech.
 2018-12-10 12:28:39 +02:00
Duan Tao
dc314fa315 Fix research queue when getting free tech. 2018-12-10 17:50:46 +08:00
Yair Morgenstern
6dbf6232e9 Hidden tiles no longer visible from inside the city screen - kudos flecheapolinienne! 2018-12-10 11:40:34 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00
Yair Morgenstern
70d6697f16 Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles 2018-12-10 11:04:40 +02:00
yairm210
4ea09a71b6
Merge pull request #312 from ninjatao/auto_specialist 
Allow auto assign population to specialists.
 2018-12-10 10:52:57 +02:00
Yair Morgenstern
1ba0929869 Font download now preceded by a "requires fonts, do you want to download?" message that allows you to opt out 2018-12-10 10:41:13 +02:00
Duan Tao
d364f3896c Allow ai city to re-assign specialists. 2018-12-10 11:34:30 +08:00
Yair Morgenstern
d1df5a2fdf Chinese font downloaded per-use basis - makes the android app require Internet permissions, but that was coming anyway 2018-12-09 19:47:21 +02:00
Duan Tao
bb12fc7cdb Code style improvement. 2018-12-09 19:05:33 +08:00
Yair Morgenstern
ff29448e06 Added translations for Ancient Ruins bonus notifications 2018-12-07 12:20:23 +02:00
Yair Morgenstern
4491ae1859 Movable tiles shown again for Civilian units 2018-12-07 12:01:31 +02:00
Yair Morgenstern
0a5ba19c6d Translation update: more things are translated, more are translatable, translation function moved 2018-12-07 11:24:55 +02:00
Duan Tao
ca3172b2cf Give food a little bit more weight. 2018-12-07 15:59:05 +08:00
Yair Morgenstern
01ece11185 Added Camel Archer, Arabian unique unit 2018-12-06 23:08:11 +02:00
Yair Morgenstern
6672b9e7bd Added Minuteman, American unique, and England special ability 2018-12-06 22:02:03 +02:00
Yair Morgenstern
20994cb908 Dev: Save & Load screens put into separate package 2018-12-06 20:19:16 +02:00
Duan Tao
173a773271 Allow auto assign population to specialists. 2018-12-07 00:39:15 +08:00
Yair Morgenstern
7cacff0a37 Can no longer see diplomatic staus of civs you haven't met in Diplomacy Overview 2018-12-06 16:12:31 +02:00
Yair Morgenstern
37dc952fe6 MoveHereButton dissapears after unit has moved 2018-12-06 15:55:28 +02:00
Yair Morgenstern
9b07120080 Added Destroyer, late-game naval melee unit 
Caravel upgrades to ironclad
 2018-12-06 15:47:35 +02:00
Yair Morgenstern
5d56b930c1 Added Diplomacy overview! 2018-12-06 13:33:10 +02:00
Yair Morgenstern
44d5017f6f MoveHereButton creation deferred to main thread, in order to LibGDX errors caused by concurrent UI alteration 2018-12-06 12:30:02 +02:00
yairm210
eb4844c48d
Merge pull request #308 from ninjatao/fix_free_building 
Free culture building now generates culture. Add map size option.
 2018-12-06 11:44:06 +02:00
Yair Morgenstern
e53f8d8933 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-06 11:41:49 +02:00
Duan Tao
fbfde0d9fb Add resistance icon. 2018-12-06 14:44:18 +08:00
Duan Tao
fc5fc48f7d Better addCultureBuilding. 2018-12-06 11:17:35 +08:00
Duan Tao
d1a86079a2 Add city resistance. 2018-12-06 01:03:23 +08:00
Duan Tao
b25f8751e6 Free culture building now generates culture. Add map size option. 2018-12-05 23:42:18 +08:00
Yair Morgenstern
ed1753d4ad Added small black spinning circle around selected unit, so it will be more noticable 2018-12-05 15:01:42 +02:00
Yair Morgenstern
67625321b8 Great merchant trade mission gold increases with era (as per original civ) 
Added Great People actions translations
 2018-12-05 13:48:23 +02:00
Yair Morgenstern
d530740d35 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-05 10:31:20 +02:00
Yair Morgenstern
13ff4843c0 Civilopeida entries sorted alphabetically 2018-12-05 10:30:50 +02:00
yairm210
7800a003db
Merge pull request #305 from ninjatao/fix_acquire 
Add icon for aquirable tiles in city screen.
 2018-12-05 10:23:05 +02:00
Yair Morgenstern
93646cd74b Missing French accentuated characters now shown 2018-12-05 10:21:14 +02:00
Duan Tao
f1c27ca0ea Add icon for aquirable tiles in city screen. 2018-12-05 15:13:06 +08:00
Yair Morgenstern
c706fa455a Code inspection and other general fixes - gotta clean up when there are guests ;) 2018-12-04 23:21:57 +02:00
Yair Morgenstern
7410cb8efe BuildingTable and UnitTable texts translated! 2018-12-04 22:41:54 +02:00
Yair Morgenstern
c359616824 General code cleanup - performance improvements on order in ||, StringBuilders replaced with line lists, added missing translations 2018-12-04 21:23:25 +02:00
Yair Morgenstern
d087a3f69a Solved 2 edge cases - one where Unciv.resume() is called with an empty GameInfo, and the other where the MoveHereButton in TileMapHolder can throw an exception if the board changed between 2 actions. 
Both impossible to replicate, both will work if the user tries again, but still better solved than unsolved.
 2018-12-04 20:47:37 +02:00
yairm210
bb78673edc
Merge pull request #302 from ninjatao/fix_acquire 
Fix : can acquire tiles that already belong to the city.
 2018-12-04 20:22:40 +02:00
Duan Tao
26a4a37389 Fix : can acquire tiles that already belong to the city. 2018-12-04 22:26:05 +08:00
Yair Morgenstern
3fe6bbeecc Unhappiness combat penalty capped at 90% - kudos anh pham-vu! 2018-12-04 13:09:38 +02:00
yairm210
eba64d38ee
Merge pull request #299 from ninjatao/fix_conquered_population 
Fix : city might have negative free population after been conquered.
 2018-12-04 12:32:25 +02:00
Duan Tao
6934ed0b0d Unassign population before conquered city given to conquerer. 2018-12-04 18:21:05 +08:00
yairm210
a2a2c2ca00
Merge pull request #300 from ninjatao/allow_tranfer_tile 
Allow city to acuqire nearby tiles from friendly cities.
 2018-12-04 12:14:45 +02:00
Duan Tao
76ecec8511 Remove wraping method for transfering tile. 2018-12-04 18:09:17 +08:00
Yair Morgenstern
bc1b1e7672 Solved a super-rare bug where the game would get stuck if you expanded the city onto a tile with an enemy that couldn't be teleported anywhere else - kudos Groundless Name! 2018-12-04 11:45:16 +02:00
Duan Tao
7c0179b268 Only connected tiles are acquirable. 2018-12-04 14:07:14 +08:00