Yair Morgenstern
cf9194f767
Other civ you're at war with is always at least Enemy, if not Unforgivable
2019-05-11 23:39:00 +03:00
Yair Morgenstern
24a71b16f2
Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation
2019-05-11 23:32:12 +03:00
lishaoxia1985
20d05aa8e0
all chinese font will show well ( #739 )
...
* update some diplomacy words in chinese
* all chinese font can be show well
* Update Fonts.kt
* update chinese language
2019-05-11 22:20:41 +03:00
Yann
7c146f4aea
Update French Version + mark duplicated & translation that didn't work ( #728 )
...
* Update French Version + mark duplicated & translation that didn't work
duplication mark : //duplicated
translation mark : //Don't translate in diplomacy view
or //You misses this translation, said Smashfanful
* Update Other.json
2019-05-11 22:16:16 +03:00
Duan Tao
0e68a23d29
Fix crash.
2019-05-11 22:13:41 +03:00
Duan Tao
4ab118273b
Transfer unique bulidings properly.
2019-05-11 22:13:41 +03:00
Yann
52a676f5cb
Add French Tutorial
2019-05-10 18:20:54 +03:00
lishaoxia1985
656246cd10
all chinese font can be show well
2019-05-10 18:20:27 +03:00
lishaoxia1985
93bf8333ca
update some diplomacy words in chinese
2019-05-10 18:20:27 +03:00
Duan Tao
3b30daf852
Code cleanup.
2019-05-10 18:20:07 +03:00
Duan Tao
91baeddde2
Fix crash from diplomacy screen.
2019-05-10 18:20:07 +03:00
lishaoxia1985
c37983667c
move some words into other translation files,the city name can be changed with setting
...
although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
2019-05-09 23:16:47 +03:00
Duan Tao
2ac654e26b
Fix first contact popup.
2019-05-09 18:54:43 +03:00
Duan Tao
c221d50e01
Add 2 more type of city-states.
2019-05-09 18:54:43 +03:00
Duan Tao
0b6422f9e7
Better check for culture buildings.
2019-05-09 18:04:05 +03:00
Duan Tao
029ab965d1
Legalism checks replaced culture building correctly.
2019-05-09 18:04:05 +03:00
Smashfanful
7db1298ded
Update Other.json
2019-05-08 22:01:01 +03:00
Smashfanful
d0c9f57fc9
Update Other.json
...
Updated Italian translations.
2019-05-08 22:01:01 +03:00
Yair Morgenstern
b3a4ed4c4f
Declaration of Friendship is go!
...
I'm sure there's stuff I've forgotten but there is just so much that happens in diplomacy that is dependant on these declarations
2019-05-08 18:48:36 +03:00
Yair Morgenstern
f8a4f15f33
Separated City-state and Major civ diplomacy tables, because they're more different than similar at this point
...
Centralized nation leader name
2019-05-08 17:58:49 +03:00
Yair Morgenstern
75bdced3c6
Added Declaration of Friendship logic
...
@ninjatao - I changed your BorderConflict into a DiplomacyFlag, and so all the logic of "removing every turn and deleting if 0" is built-in =)
2019-05-08 17:24:56 +03:00
Smashfanful
3106127dc4
Update Units,Promotions.json
...
Italian translation for Instant Cure and its effects
2019-05-08 16:40:11 +03:00
Yair Morgenstern
8ce1613559
Resolved #698 - Added Heal Instantly 'promotion'
2019-05-08 16:03:01 +03:00
Duan Tao
ff508f22b0
Add border conflict counter for periodly popup.
2019-05-08 13:32:23 +03:00
Duan Tao
06f25b5b5b
Fix peace popup with city-state.
2019-05-08 13:32:23 +03:00
Duan Tao
1434ca3f30
Update city-state related icons and popups.
2019-05-08 13:32:23 +03:00
Yair Morgenstern
9ab02c8d22
Organized json files, split translation file into several smaller files for organizational purposes
2019-05-07 21:59:34 +03:00
Am-per-Sand
65ed67af61
reduce German unique text in Nations.json
2019-05-07 19:58:53 +03:00
Yair Morgenstern
078e19933e
Merge pull request #708 from Smashfanful/patch-103
...
Update Translations.json
2019-05-07 17:25:01 +03:00
Duan Tao
cb867f0066
Code improvement for city state border conflict.
2019-05-07 15:23:08 +03:00
Duan Tao
ad54fb3c56
Invading city-state border will damage relationship.
2019-05-07 13:55:11 +03:00
Duan Tao
30531316d2
Player can enter city-state borders.
2019-05-07 13:55:11 +03:00
Duan Tao
ef7b73ad5f
Unlock city states.
2019-05-07 13:55:11 +03:00
Smashfanful
50fdc5c64f
Update Buildings.json
...
Added Siamese, Persian, Songhai, Indian and Irochese unique buildings.
2019-05-07 13:47:04 +03:00
Smashfanful
c45f1aabc9
Update Units.json
...
Added Siamese and Mongolian unique units, and removed all G&K and BNW units
2019-05-07 13:46:39 +03:00
Smashfanful
9696c5441d
Merge branch 'master' into patch-103
2019-05-07 11:43:20 +02:00
Yann
5b2ec86b4d
Update French version + duplication + reorganisation
...
I commented some duplication and reorganised some part of the file, but it's begin to be too big too make it clear
2019-05-07 12:30:13 +03:00
lishaoxia1985
fcb22f4a0e
Diaploma in chinese makes well with language settings ( #713 )
...
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Add files via upload
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update BasicHelp_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Chinese traslation, i have test it,but app may get corruption.
* constructing buildings and wonders in the city the language shows normally according to language setting
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* change chinese font with WenQuanYiMicroHei
* Update Translations.json
* nation.json in chinese(no completed)
* Update Nations_Simplified_Chinese.json
* Update Nations.json
* Update Translations.json
* Update Translations.json
* Update Nations_Simplified_Chinese.json
* Update WorldScreenTopBar.kt
* update
* Update Translations.json
* update
* Update Nations_Italian.json
* updated(nation.json in Chinese also cannot runs well)
* updated(nation.json in Chinese also cannot runs well)
* Update TileImprovement.kt
* Update TileResource.kt
* Update Terrain.kt
* Update Terrain.kt
* updated(nation.json in Chinese also cannot runs well)
* Update Terrain.kt
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
* chinese language update
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update BaseUnit.kt
* delete some word with "Nations.json"
* diplomacy in Chinese makes well with the language setting
2019-05-07 10:30:11 +03:00
lishaoxia1985
79daad778f
update some chinese language ( #712 )
...
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Add files via upload
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update BasicHelp_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Chinese traslation, i have test it,but app may get corruption.
* constructing buildings and wonders in the city the language shows normally according to language setting
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* change chinese font with WenQuanYiMicroHei
* Update Translations.json
* nation.json in chinese(no completed)
* Update Nations_Simplified_Chinese.json
* Update Nations.json
* Update Translations.json
* Update Translations.json
* Update Nations_Simplified_Chinese.json
* Update WorldScreenTopBar.kt
* update
* Update Translations.json
* update
* Update Nations_Italian.json
* updated(nation.json in Chinese also cannot runs well)
* updated(nation.json in Chinese also cannot runs well)
* Update TileImprovement.kt
* Update TileResource.kt
* Update Terrain.kt
* Update Terrain.kt
* updated(nation.json in Chinese also cannot runs well)
* Update Terrain.kt
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
* chinese language update
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update BaseUnit.kt
* delete some word with "Nations.json"
2019-05-07 08:40:36 +03:00
Yair Morgenstern
89902bef95
Added Medic, Medic II promotions - #698
2019-05-06 23:01:28 +03:00
Yair Morgenstern
cf2580b8ed
Solved #670 - civ starting locations are given as much space as possible
2019-05-06 20:46:48 +03:00
Am-per-Sand
024bad9b5a
added Hanse building icon
...
silhouette from own photo of [Artus Court](https://en.wikipedia.org/wiki/Artus_Court )
2019-05-06 20:09:23 +03:00
Am-per-Sand
a0c90423cd
added Hanse
2019-05-06 20:09:23 +03:00
Am-per-Sand
148d55c4db
added unit icons for German uniques
2019-05-06 20:09:23 +03:00
Am-per-Sand
3502ed4e1d
added German unique military
2019-05-06 20:09:23 +03:00
Am-per-Sand
4cd6e95278
add Landsknecht properties
2019-05-06 19:10:02 +03:00
Yann
a75d6f0c7b
Update French version
...
You should look the file, sometimes there is repeated translations
2019-05-06 17:13:06 +03:00
Smashfanful
6c725acacb
Update Translations.json
...
Added more Italian translations
2019-05-06 12:08:41 +02:00
Yair Morgenstern
9e03893e60
Added Woodsman promotion - #698
2019-05-05 23:22:59 +03:00
lishaoxia1985
3318f26a33
CivilopediaScreen language can be changed with setting ( #706 )
...
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Update Tutorials_Simplified_Chinese.json
* Add files via upload
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update BasicHelp_Simplified_Chinese.json
* Update Translations.json
* Update Translations.json
* Update Tutorials_Simplified_Chinese.json
* Chinese traslation, i have test it,but app may get corruption.
* constructing buildings and wonders in the city the language shows normally according to language setting
* Update Translations.json
* Update Translations.json
* Update Translations.json
* Update Translations.json
* change chinese font with WenQuanYiMicroHei
* Update Translations.json
* nation.json in chinese(no completed)
* Update Nations_Simplified_Chinese.json
* Update Nations.json
* Update Translations.json
* Update Translations.json
* Update Nations_Simplified_Chinese.json
* Update WorldScreenTopBar.kt
* update
* Update Translations.json
* update
* Update Nations_Italian.json
* updated(nation.json in Chinese also cannot runs well)
* updated(nation.json in Chinese also cannot runs well)
* Update TileImprovement.kt
* Update TileResource.kt
* Update Terrain.kt
* Update Terrain.kt
* updated(nation.json in Chinese also cannot runs well)
* Update Terrain.kt
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
* CivilopediaScreen language can be changed with setting
2019-05-05 22:51:26 +03:00
