Commit Graph

1367 Commits

Author SHA1 Message Date
4baa7b6105 fix display tutorial, please update immediately (#1176)
* update

* update
2019-10-09 23:40:02 +03:00
f21e508b28 Merge pull request #1172 from ninjatao/duantao/some_chinese_translation
Correct some Chinese translation.
2019-10-08 10:47:03 +03:00
ebe612ee54 Merge pull request #1164 from lishaoxia1985/master
update translation, now it can run, but it also have a problem.
2019-10-08 10:44:58 +03:00
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 2019-10-08 10:44:14 +03:00
43cf084b9f Merge remote-tracking branch 'upstream/master'
update
2019-10-08 15:35:27 +08:00
cdf29a8ca7 Correct some Chinese translation. 2019-10-08 10:39:10 +08:00
6d94b3d8c8 Fix parameter. 2019-10-08 10:17:20 +08:00
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
edf4588355 Merge remote-tracking branch 'upstream/master'
update
2019-10-08 04:33:17 +08:00
c32f4bba56 Update Tutorials_Italian.json 2019-10-07 22:30:57 +03:00
264b1484d2 update 2019-10-07 21:25:06 +08:00
1a9a2ac886 update 2019-10-07 17:29:49 +08:00
80122faecf update 2019-10-07 16:43:18 +08:00
b0cd8e318a update 2019-10-07 16:23:20 +08:00
b3a2bc3307 Tutorials now accessible from Civilopedia!
Mass tutorial renaming
2019-10-06 23:18:51 +03:00
3d992fc9ee Resolved #1162 - City button, resources and tech description in multiplayer now act according to the viewing civ, and not the current player - Thanks @lobraarbol! 2019-10-06 19:21:47 +03:00
69aecfe419 Update Nations_Italian.json 2019-10-06 18:10:56 +03:00
a4ea63ac4c update translation (#1160) 2019-10-06 10:28:12 +03:00
f3a8a64491 Update Techs.json
Added translation lines for the tech quotes :D
2019-10-06 06:15:29 +03:00
f8351da1c4 Russian translation (#1158)
* Russian translation

* Russian translation

* Russian translation

* Russian translation
2019-10-06 06:14:58 +03:00
272f58fe5d Update NewGame,SaveGame,LoadGame,Options.json
New line
2019-10-05 21:17:54 +03:00
815ce27f6c Update Units,Promotions.json 2019-10-05 21:14:49 +03:00
8d31d2c0ad Update Tutorials_Italian.json
Update
2019-10-05 21:14:31 +03:00
2f2ace5f3c Update Buildings.json (#1153) 2019-10-05 21:14:00 +03:00
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
1aa9640d1c Update Other.json
New lines
2019-10-05 20:59:48 +03:00
67916f9be2 Update Policies.json
Italian translation corrections
2019-10-04 16:50:12 +03:00
e42cadbf09 Update Diplomacy,Trade,Nations.json 2019-10-04 16:49:47 +03:00
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
5049831c18 Great Wall no longer provides a free tech - whoops! 2019-10-03 22:11:06 +03:00
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
47db4dce31 Fixed Coastal Raider image
Puppet cities no longer increase policy costs
2019-10-01 22:05:38 +03:00
5c9baaf15a Sweden.json
Just add any color you want
2019-10-01 21:59:41 +03:00
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
a91fe87e26 Update Nations_Italian.json 2019-09-29 15:25:39 +03:00
f4243550ce Update Other.json 2019-09-29 15:25:23 +03:00
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127)
* 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

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
2019-09-29 10:33:18 +03:00
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
5980f18f89 Puppeted cities now always auto assign production
Resolved #1124 - added annex and puppet tutorial
2019-09-28 21:43:27 +03:00
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json
Added new lines
2019-09-28 21:21:30 +03:00
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +03:00
751c33c609 Update Buildings.json 2019-09-24 20:28:22 +03:00
a6684a6640 Update Buildings.json (#1118)
More fixes
2019-09-24 20:27:23 +03:00
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
27b8cd5f1b AI now puppets cities by default - much better for long-term strategy, since puppeted cities are technically also controlled by AI controllers so... 2019-09-24 16:57:49 +03:00