Commit graph

1123 commits

Author SHA1 Message Date
Duan Tao
ddcf3dd83e Remove unit list for barbarians. 2019-01-26 18:58:12 +08:00
Duan Tao
c18cc2476f Generate different type of barbarians. 2019-01-26 18:48:29 +08:00
Yair Morgenstern
478a9e6996 Resolved #429 - display era names only once in tech picker screen 2019-01-23 20:52:26 +02:00
Yair Morgenstern
a4175438a3 Resolved #424 - added confirm box when declaring war 2019-01-23 20:16:34 +02:00
Yair Morgenstern
b60df3ce85 Resolved #428 - missing characters in German translation 2019-01-23 20:07:13 +02:00
Yair Morgenstern
d7324ab30f
Merge pull request #433 from ninjatao/fix_seige_units_targets
Fix seige units finding targets bug.
2019-01-23 18:17:28 +02:00
Duan Tao
0f1221e033 Fix seige units finding targets bug. 2019-01-23 21:10:25 +08:00
Yair Morgenstern
0e5c1843fe
Merge pull request #432 from ninjatao/ai_exchange_tech
Ai exchange tech
2019-01-23 11:28:48 +02:00
Duan Tao
a141cb1f1c Rearrange code for pruchasing stuff. 2019-01-23 16:09:18 +08:00
Duan Tao
fa8c948c04 Allow ai to spend money for building & unit. 2019-01-23 16:09:08 +08:00
Duan Tao
53c0bbb0a3 AI exchange techs strategy change. 2019-01-23 16:08:52 +08:00
Duan Tao
d11cb4779b AIs trade techs. Also modified AI tech choose strategy. 2019-01-23 16:08:37 +08:00
Yair Morgenstern
1a6089ead1
Merge pull request #431 from ninjatao/fix_city_defeated_info
Fix city defeated info.
2019-01-23 09:56:12 +02:00
Duan Tao
a03482477d Fix city defeated info. 2019-01-23 15:27:37 +08:00
Yair Morgenstern
9605ad6060
Merge pull request #430 from ninjatao/fix_building_bonus
Fix building bonus replaced bug.
2019-01-23 08:22:29 +02:00
Duan Tao
7b83776bfa Fix building bonus replaced bug. 2019-01-23 11:26:05 +08:00
Yair Morgenstern
baed1e50cd Returned tile info table in the city screen, construction scroll now translated, added city screen translations to translations file - #417 2019-01-22 21:48:30 +02:00
Yair Morgenstern
2267d2945d
Merge pull request #427 from ninjatao/fix_cityscreen
Fix city screen info windows.
2019-01-22 13:19:52 +02:00
Duan Tao
2d69fa9804 Fix city screen info windows. 2019-01-22 19:09:46 +08:00
Yair Morgenstern
9ba73c4a6f No height difference between hills and hills with jungle/forest 2019-01-21 23:10:03 +02:00
Yair Morgenstern
d7067d2835 Resolved #409 - rewrite line-of-sight rules 2019-01-21 22:41:22 +02:00
Yair Morgenstern
d1de589e4f Resolved #422 - can no longer move through units of other civs we're at war with 2019-01-21 20:17:48 +02:00
Yair Morgenstern
811ed5a7a2 Better AI build order for #416 2019-01-20 23:05:08 +02:00
Yair Morgenstern
effec4856c Resolved #424 and upgraded gradle 2019-01-20 22:44:09 +02:00
Yair Morgenstern
f765566cbc
Merge pull request #421 from ninjatao/city_screen_info
Fix city screen population info.
2019-01-20 16:27:04 +02:00
Duan Tao
a0ee9b6bd7 Fix city screen population info. 2019-01-20 21:22:00 +08:00
Yair Morgenstern
fa8f9deb2c Solved #420 - viewable tiles not updated when trading cities, kudos zivvel! 2019-01-19 23:49:46 +02:00
Yair Morgenstern
2ca894b05f City construction picking now done through a scroll on the city screen, like in the original =D
Also resolved #417 on the way
2019-01-19 23:43:28 +02:00
Yair Morgenstern
a371aedf23 Changes to city screen - city summary in top-left corner like original 2019-01-19 21:01:47 +02:00
Yair Morgenstern
61d2d3499a
Merge pull request #419 from reijin90/master
Added last bit of German translation (it is now complete).
2019-01-19 18:52:38 +02:00
Benedikt Tröster
5bd35df607 Added last bit of German translation (it is now complete).
Is proof read once
Added gerneral tips on translation
2019-01-18 16:36:05 +01:00
Yair Morgenstern
8840f42c5b
Merge pull request #418 from reijin90/master
Added to about 90% of all German translations. And fixed some typos
2019-01-17 20:46:43 +02:00
Benedikt Tröster
0e57402817 Added to about 90% of all German translations. And fixed some typos 2019-01-17 19:38:17 +01:00
Yair Morgenstern
e16bb2b8a7 Added Tank, Anti-Tank Gun units 2019-01-16 23:15:02 +02:00
Yair Morgenstern
e573368d18 Added CN Tower, Pentagon #245 2019-01-16 22:24:29 +02:00
Yair Morgenstern
eeaca08f57 Added Alhambra #245 2019-01-16 21:45:46 +02:00
Yair Morgenstern
49ed7570f8 Added Hubble Space Telescope wonder, Stable unique ability
Added missing translations
2019-01-16 21:26:14 +02:00
Yair Morgenstern
2df64861d1 Added Infantry, Machine Gun units
Added Railroad, Ballistics techs
Added Statue of Liberty wonder
2019-01-15 22:17:34 +02:00
Yair Morgenstern
ee278586e7 Solved #413 probable (ANR trying to load super-huge autosave game) by disabling the update() in the initialize, instead setting shouldUpdate to true by default so it'll update in the rendering thread 2019-01-14 21:57:09 +02:00
Yair Morgenstern
53c5c6d5ab Can now choose to start a game with multiple human players! 2019-01-14 20:48:30 +02:00
Yair Morgenstern
92888c82dd
Merge pull request #415 from ninjatao/bombard2
Adjust city attack strength. Also shown in unittable when selected.
2019-01-12 18:20:10 +02:00
Duan Tao
c198db0641 Adjust city attack strength. Also shown in unittable when selected. 2019-01-12 20:33:30 +08:00
Yair Morgenstern
abd9d6d9a4 Decreased bombard strength as per Civ V
Don't display empty stats in city detail table
2019-01-11 12:12:19 +02:00
Yair Morgenstern
8e478d2d71 Added intermediate screen between players on the same phone, so they won't see each other's screens 2019-01-11 12:10:27 +02:00
Yair Morgenstern
640f2fa338
Merge pull request #411 from ninjatao/bombard
Bombard!
2019-01-11 10:56:56 +02:00
Yair Morgenstern
3ddacff4f4
Merge branch 'master' into bombard 2019-01-11 10:56:34 +02:00
Yair Morgenstern
401aa942eb Can now play with multiple human players!
Need to find a way for all human players to choose their civs in a simple manner
2019-01-11 09:58:32 +02:00
Yair Morgenstern
8bf84393fc More changes to enable multiplayer - save the current player in the civInfo, distinguish between "current player" and "human player" 2019-01-10 21:29:24 +02:00
Yair Morgenstern
d19861b348 Maybe solved an ANR caused by resume(), it's hard to tell 2019-01-10 20:43:32 +02:00
Duan Tao
4e77edcec0 Code cleanup 2. 2019-01-10 11:30:33 +08:00