Yair Morgenstern
89a720f7b2
Cities now only take ownership of _unowned_ tiles around them
2019-04-01 22:38:36 +03:00
Yair Morgenstern
9a72623499
Merge pull request #625 from Smashfanful/patch-84
...
Update Tutorials_Italian.json
2019-04-01 19:14:58 +03:00
Smashfanful
bf33bcaffc
Update Tutorials_Italian.json
...
Some minor corrections
2019-04-01 17:57:47 +02:00
Yair Morgenstern
19a78587de
Merge pull request #622 from B5656/patch-5
...
Update BattleDamage.kt
2019-04-01 16:20:53 +03:00
Yann
1a8708576d
Update BattleDamage.kt
...
To solve Issue #621
2019-04-01 11:37:36 +02:00
Yair Morgenstern
e433eefc05
Merge pull request #618 from ninjatao/future_tech
...
Avoid future tech blocking ending turn.
2019-04-01 07:23:11 +03:00
Duan Tao
0bbcc39eca
Avoid future tech blocking ending turn.
2019-04-01 09:54:59 +08:00
Yair Morgenstern
6796c1868b
Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game
2019-04-01 00:05:11 +03:00
Yair Morgenstern
9eb9176b2a
Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions
2019-03-29 18:03:18 +03:00
Yair Morgenstern
a5e1978a71
Added popup for "move and attack" bug that I can't figure out
2019-03-29 15:38:22 +03:00
Yair Morgenstern
f38da59fe9
Resolved #614 - bug withpillaged water tiles
2019-03-29 15:26:31 +03:00
Yair Morgenstern
b0830ba487
Resolved #613 - policy choice & city conquer collision
2019-03-29 15:20:30 +03:00
Yair Morgenstern
38f732b461
Merge branch 'master' of https://github.com/yairm210/UnCiv
2019-03-29 15:18:17 +03:00
Yair Morgenstern
12719c1e0e
Added Great Wall wonder
2019-03-29 15:17:58 +03:00
Yair Morgenstern
18f96dd207
Merge pull request #611 from B5656/patch-3
...
Create BasicHelp_French.json
2019-03-29 15:10:55 +03:00
Yair Morgenstern
02ff04309d
Merge pull request #612 from B5656/patch-4
...
Update GreatPeopleNames.json
2019-03-29 15:10:19 +03:00
Yann
08c7671c68
Update GreatPeopleNames.json
...
little update, a " was missing
2019-03-29 12:01:33 +01:00
Yann
d0dac336b6
Create BasicHelp_French.json
...
add french version of the basic help
2019-03-29 11:50:38 +01:00
Yair Morgenstern
064488ca37
Solved a crash situation when clicking on "Future Tech" when it has already been researched
2019-03-28 23:51:39 +02:00
Yair Morgenstern
0b47289c3d
Resolved #601 - gold luxury not accepted in trades
...
Organized trade buy/sell logic - should be much easier to understand now!
Split into Evaluation and the current trade deal, evaluation split into buying and selling
2019-03-28 23:05:50 +02:00
Yair Morgenstern
81d8dda111
Merge pull request #608 from B5656/patch-2
...
Update Translations.json
2019-03-27 16:19:47 +02:00
Yair Morgenstern
2f889fb57f
Merge branch 'master' into patch-2
2019-03-27 16:18:17 +02:00
Yair Morgenstern
d3afb6e574
Merge pull request #605 from Smashfanful/patch-80
...
Update Translations.json
2019-03-27 16:15:52 +02:00
Smashfanful
e4b9597fb1
Update Translations.json
2019-03-27 11:45:37 +01:00
Yair Morgenstern
3295753d2d
Resolved #581 - Turns to production values are now always accurate and don't depend on bonuses to the current production
2019-03-25 19:52:29 +02:00
Smashfanful
5f344c5299
Update Translations.json
...
Also added some translation you should add
2019-03-25 18:31:25 +01:00
Yann
d0b65da424
Update Translations.json
...
Update French version
2019-03-25 11:27:37 +01:00
Yair Morgenstern
e43c22a74b
Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them.
2019-03-24 20:27:00 +02:00
Smashfanful
0ff3d7a5fd
Update Nations_Italian.json
2019-03-24 15:41:47 +01:00
Yair Morgenstern
bba6f43943
Changed "Combat Unit" to Military Unit" for naming consistency
2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31
Resolved #593 - Show/Hide resources and improvements button wasn't working
2019-03-22 10:57:18 +02:00
Yair Morgenstern
a3542597ae
Merge pull request #599 from ninjatao/wonder_priority
...
wonder building priority.
2019-03-22 07:38:14 +02:00
Duan Tao
22253af842
Work boat should have lower priority than other buildings, not higher.
2019-03-22 12:07:11 +08:00
Duan Tao
e2f650a512
wonder building priority.
2019-03-22 11:50:03 +08:00
Yair Morgenstern
9b7a796a03
Merge pull request #597 from Am-per-Sand/master
...
Frigate <-> Caravel icons swap
2019-03-22 00:59:12 +02:00
Yair Morgenstern
4001526aea
Construction choices are now more standardized and easier to understand
...
Construction choice depends on how much work is left towards construction and not initial cost
2019-03-22 00:49:08 +02:00
Yair Morgenstern
34a3b614b0
Map no longer zooms whe being created
2019-03-22 00:10:27 +02:00
Yair Morgenstern
dcd64bf58f
Can see all production icons in debug mode
2019-03-22 00:09:56 +02:00
Yair Morgenstern
dddda38d57
City tiles no longer show "ground" area
2019-03-21 23:59:02 +02:00
Yair Morgenstern
69d3703543
Resolved #595 - Added release version to options table
2019-03-21 22:46:49 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap
2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png
2019-03-21 15:19:17 +01:00
Am-per-Sand
c6ca334271
Delete Caravel.png
2019-03-21 15:19:07 +01:00
Yair Morgenstern
1dc6a2cf2d
Merge pull request #585 from ninjatao/build_order2
...
Redo build order AI.
2019-03-21 13:42:20 +02:00
Yair Morgenstern
e4c7a2698f
Clearer population toggle in cities
2019-03-21 13:17:10 +02:00
Yair Morgenstern
775055902f
Continuation of #590 - "Machu Picchu" instead of "Machu Pichu"
...
Changed info in saved games to fit the change
2019-03-21 12:53:41 +02:00
Yair Morgenstern
3f6dead4c6
Merge pull request #590 from Am-per-Sand/master
...
"Machu Picchu" typo
2019-03-21 12:30:24 +02:00
Duan Tao
90f8421777
Avoid building many wonders at the same time.
2019-03-21 08:00:11 +08:00
Yair Morgenstern
644f933c24
Merge pull request #594 from Smashfanful/patch-77
...
Update Translations.json
2019-03-20 23:37:57 +02:00
Yair Morgenstern
080a2f7e9a
Merge branch 'master' into patch-77
2019-03-20 23:37:20 +02:00
