Commit graph

1234 commits

Author SHA1 Message Date
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
Duan Tao
57dce317ea Code cleanup. 2019-01-09 21:17:05 +08:00
Duan Tao
2f22b1d576 City bombardment is counted as ranged. 2019-01-09 18:56:52 +08:00
Yair Morgenstern
c7dbad1085
Merge pull request #412 from ninjatao/auto_fix_pillage
Avoid pillaged great improvement from being replaced by resource impr…
2019-01-09 07:53:24 +02:00
Duan Tao
f237adef4b Avoid pillaged great improvement from being replaced by resource improvement. 2019-01-09 11:09:57 +08:00
Duan Tao
730111993e Code cleanup and bug fix. 2019-01-09 10:12:00 +08:00
Yair Morgenstern
a7bbea106c Resolved #407 - units cannot pillage when at full health 2019-01-08 18:45:06 +02:00
Yair Morgenstern
2fdd3e2628 Fixed #402 - couldn't build wonder if it was being built by a rival civ 2019-01-08 18:43:06 +02:00
Yair Morgenstern
c282ffb423 Resolved #410 - land units on lake aren't shown as embarked 2019-01-08 15:43:54 +02:00
Duan Tao
a2764d7b91 Ai uses bombardment. 2019-01-08 20:16:18 +08:00
Duan Tao
0f16a25cc6 You can actually Bombard! But ai cannot yet. 2019-01-08 19:55:35 +08:00
Duan Tao
7a17779bf4 Mark bombard targets. 2019-01-08 18:35:14 +08:00
Duan Tao
9054496940 Select city before entering city screen. 2019-01-08 15:34:32 +08:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
b8aa4932a0 Added unique ability for Egypt and France 2019-01-07 18:44:42 +02:00
Yair Morgenstern
911bd6fc67
Merge pull request #406 from ninjatao/fix_automate
chooseImprovement returns null when there is already better improvement.
2019-01-07 08:12:50 +02:00
Duan Tao
b11c96ce3f chooseImprovement returns null when there is already better improvement. 2019-01-07 11:58:57 +08:00
Yair Morgenstern
84007533fc Resolved #311 - translate victory screen 2019-01-06 22:48:24 +02:00
Yair Morgenstern
567786c125 Resolved #399 - lakes act differently than in original game 2019-01-06 22:41:03 +02:00
Yair Morgenstern
e3e6ab16b9
Merge pull request #405 from VioPet/patch-1
Update Translations.json
2019-01-06 22:24:10 +02:00
VioPet
2b2cf68933
Update Translations.json
Review and update all Romanian translations. Also, check and comment on some original entries.
2019-01-05 23:16:14 +01:00
Yair Morgenstern
c538abd9fd
Merge pull request #401 from ninjatao/autobuild_road
Idle worker try to connect cities with roads.
2019-01-05 18:39:12 +02:00
Duan Tao
ae210e05f3 Idle worker try to connect cities with roads. 2019-01-05 23:13:59 +08:00
Yair Morgenstern
19906ade75 Added Babylonian civ unique 2019-01-04 11:51:44 +02:00
Yair Morgenstern
2f5b6e7be5 Resolved #396 - save game start parameters and use for subsequent games
Later, we could use this info to display to the user in the load game screen
Solved #394 - couldn't scroll map far on edges, some tiles were hard to get to
2019-01-04 10:59:47 +02:00
Yair Morgenstern
f8b13095db
Merge pull request #397 from ninjatao/improve_improvement
Constucting a great improvement remove unfinished improvement.
2019-01-04 10:32:20 +02:00
Duan Tao
39d2b5d60c Constucting a great improvement remove unfinished improvement. 2019-01-04 14:15:25 +08:00
Yair Morgenstern
b776bd777c Google suspended the app because of "Impersonation" violation =(
Changed library name from com.unciv.game to com.unciv.app for app change
2019-01-02 22:07:47 +02:00
Yair Morgenstern
a1e7e168b3
Update README.md 2019-01-02 20:00:55 +02:00
Yair Morgenstern
0567eb442d
Merge pull request #391 from ninjatao/submarine
Submarine, resolves #388
2018-12-31 17:13:21 +02:00
Yair Morgenstern
7f9ca0fd3d
Merge pull request #386 from ninjatao/worker_automate
Worker automation uses more resource.
2018-12-31 14:49:20 +02:00
Yair Morgenstern
8de9b5d37a
Merge pull request #390 from ninjatao/paper_maker
Fix paper maker icon
2018-12-31 14:44:41 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Duan Tao
ed96534d34 Fix paper maker icon 2018-12-31 19:56:28 +08:00
Duan Tao
de5610180f Add WaterSubmarine unit type. 2018-12-31 19:42:20 +08:00
Duan Tao
fd742c9859 Fix paper maker icon 2018-12-31 18:22:09 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
5f3da79484 Fix evalutate peace treaty bug. 2018-12-30 19:22:40 +08:00
Duan Tao
be80aaecda Worker automation leaves great tile improvement alone. 2018-12-30 19:19:06 +08:00
Yair Morgenstern
11066b84e6
Merge pull request #387 from ninjatao/chinese_unique
Chinese unique ability.
2018-12-30 07:58:19 +02:00