Yair Morgenstern
548078fb37
Changes to Puppet - Annex - Liberate:
...
- From Conquer you can move either to Liberate, or to Puppet -> Annex -> Raze
- All unit actions at battle are completely independant of your decision what you do with the city, so they're not deffered until you decide
2019-09-23 17:29:05 +03:00
Yair Morgenstern
6d9543e07b
Added resistance icon in city screen
2019-09-23 16:19:53 +03:00
Yair Morgenstern
a1f5690e41
Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex
2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e
Duantao/liberate city ( #1097 )
...
* Allow to liberate city to its founder.
* Workaround : Avoid exception on conquering city with infantry unit.
* Liberate button actually works.
* Fix trade resources check.
* Postpone the 2nd part of postBattleActions until choice is made.
* Add puppet option.
* Puppet city cannot be controlled directly.
* Add annex and puppet happiness/culture/science bonus.
* Add courthouse. Icon is missing.
* Icon for courthouse.
* Update png.
2019-09-23 08:37:53 +03:00
Yair Morgenstern
a3889a549e
Iroquis can now use Forest and Jungles to connect cities
...
Persian +1 movement only activaes when in golden age
2019-09-20 10:26:15 +03:00
Smashfanful
12e3ae1761
Update Diplomacy,Trade,Nations.json
...
Corrections
2019-09-20 10:07:06 +03:00
Smashfanful
03087095f6
Update NewGame,SaveGame,LoadGame,Options.json
...
Added missing Italian translation
2019-09-19 20:54:01 +03:00
Smashfanful
1359c3eab3
Update TileImprovements.json
2019-09-19 20:52:41 +03:00
Smashfanful
1591215f4c
Update Buildings.json
...
Last Wonder lines translations
2019-09-19 20:52:10 +03:00
Smashfanful
ee1751a496
Update Techs.json
...
Added Medieval and Renaissance Tech quotes
2019-09-19 15:58:59 +03:00
Duan Tao
c4e4f3d2a3
Fix trade resources check.
2019-09-19 11:10:50 +03:00
Yair Morgenstern
2def82c4a6
When picking random city states for a map, first priority now goes to city states with starting locations defined in the map
2019-09-18 22:42:44 +03:00
Yair Morgenstern
753efe5f47
Added error popup when failed to download map
2019-09-18 22:28:16 +03:00
Yair Morgenstern
f4d828d5e4
Finished changing all unit promotion icons!
2019-09-18 22:15:37 +03:00
Duan Tao
45342a7d63
Remove redundant item is Logistics prequisition.
2019-09-18 08:43:17 +03:00
Duan Tao
0adeb68ea6
Invisible submarines are excluded from notification.
2019-09-18 08:42:47 +03:00
Yair Morgenstern
b86d11b5fa
Merge branch 'master' of https://github.com/yairm210/UnCiv
2019-09-17 22:40:09 +03:00
Yair Morgenstern
190d9f72fd
Resolved #1091 (spelling mistakes)
2019-09-17 22:39:21 +03:00
Yair Morgenstern
04127164bc
Added all remaining wonder quotes and more promotion icons
2019-09-17 22:39:08 +03:00
Smashfanful
9271fe22a4
Update Techs.json
...
Added quotes for Ancient and Classical Age techs
2019-09-17 20:41:03 +03:00
Smashfanful
11840de2ce
Update Nations.json
...
Two more City-States: Zanzibar and Singapore
2019-09-17 08:15:54 +03:00
Smashfanful
2ef533f57b
Update Credits.md ( #1087 )
...
* Update Credits.md
* Update Credits.md
2019-09-17 08:14:36 +03:00
Duan Tao
0f1f5bf746
Spaceship should not be bought.
2019-09-17 08:14:10 +03:00
Smashfanful
d7d7d9a7e6
Update Nations_Italian.json
2019-09-16 19:50:59 +03:00
Smashfanful
9b9dec952b
Update Nations_Italian.json
...
Persian and Irochese civs, and two new City-States
2019-09-16 19:50:59 +03:00
Smashfanful
4cd30d8301
Update Diplomacy,Trade,Nations.json
2019-09-16 19:50:06 +03:00
Smashfanful
2dccc6cf90
Update Buildings.json
...
Since the Persian Civilization is on the go, I guess we can work this out.
2019-09-16 19:49:43 +03:00
Smashfanful
1b4b326cf7
Update Units,Promotions.json
...
Italian Translations
2019-09-16 19:49:11 +03:00
lishaoxia1985
390254b584
instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen ( #1080 )
...
* systemProp
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* fix that researched tech can be picked when we pick a free tech
* update to master
* update
* Update TechPickerScreen.kt
* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.
* update
* language polish is wrong to be writing "polski"
* 显示教程
* update
* update
* update
* update
* update
* update
* update
* viewport
2019-09-16 19:48:41 +03:00
Yair Morgenstern
f03dfc10d6
Lakes provide 2 food, as per original Civ
2019-09-16 06:40:35 +03:00
Yair Morgenstern
48ad8f3f88
Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =)
2019-09-15 23:26:20 +03:00
Yair Morgenstern
479b751cb3
Gold and Science breakdowns are now much more detailed
2019-09-15 18:52:40 +03:00
Yair Morgenstern
b038e926a4
Idle units are much more visible on the map
...
Technically, nstead of fading out the entire unit with its background, we just fade out its central icon, that way it remains much more visible on the map
2019-09-15 18:15:57 +03:00
Yair Morgenstern
3084a5bc33
Added Persian civilization
2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782
Changed some border icons to filled icons, which look way better in-game
2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478
Added Iroquois civilization
2019-09-15 12:13:14 +03:00
Yair Morgenstern
bad10370de
innerColor and outerColor function name changes
2019-09-14 23:17:52 +03:00
Yair Morgenstern
f6323edbc8
Victory screen no longer shows every turn on "one more turn" mode
...
Moved Nation jsons
2019-09-14 23:06:34 +03:00
Smashfanful
3688622d06
Update Buildings.json
...
Added translations for Wonder Quotes
2019-09-14 21:04:39 +03:00
Smashfanful
610795beef
Update Buildings.json
2019-09-14 21:04:19 +03:00
pikkolpk
90e9cf056c
Update Diplomacy,Trade,Nations.json
2019-09-14 21:03:57 +03:00
Yair Morgenstern
656c94a2a3
Revert "Nubian Pitati Archer and Australian Digger"
...
This reverts commit 00f66a785f
2019-09-12 19:46:56 +03:00
Yair Morgenstern
fe3cd222ef
Revert "Australian Outback Station"
...
This reverts commit dbdf2d819f
2019-09-12 19:46:22 +03:00
Smashfanful
dbdf2d819f
Australian Outback Station
2019-09-12 19:44:04 +03:00
Smashfanful
00f66a785f
Nubian Pitati Archer and Australian Digger
2019-09-12 19:43:48 +03:00
lishaoxia1985
5f43c93846
MrUldiggg delete some words which are necessary. please update immediately ( #1069 )
...
* systemProp
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* fix that researched tech can be picked when we pick a free tech
* update to master
* update
* Update TechPickerScreen.kt
* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.
* update
* language polish is wrong to be writing "polski"
* 显示教程
* update
* update
* update
2019-09-12 19:42:29 +03:00
lishaoxia1985
6e34f4743a
update translation ( #1067 )
...
* systemProp
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* update
* fix that researched tech can be picked when we pick a free tech
* update to master
* update
* Update TechPickerScreen.kt
* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.
* update
* language polish is wrong to be writing "polski"
* 显示教程
2019-09-12 13:05:58 +03:00
Yair Morgenstern
05a77a9a68
Fixed "units deselect after next turn" problem
...
Popup alerts now come before trade request popups
2019-09-11 21:18:01 +03:00
MrUldiggg
ed807551eb
Philipinnes.json
...
Philippines Civilization
2019-09-11 19:42:19 +03:00
Smashfanful
9d9aebc35a
Australian Civilization ( #1066 )
2019-09-11 19:40:54 +03:00
