Commit graph

998 commits

Author SHA1 Message Date
YueR
264b1484d2 update 2019-10-07 21:25:06 +08:00
YueR
1a9a2ac886 update 2019-10-07 17:29:49 +08:00
YueR
80122faecf update 2019-10-07 16:43:18 +08:00
YueR
b0cd8e318a update 2019-10-07 16:23:20 +08:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia!
Mass tutorial renaming
2019-10-06 23:18:51 +03:00
Smashfanful
69aecfe419 Update Nations_Italian.json 2019-10-06 18:10:56 +03:00
lishaoxia1985
a4ea63ac4c update translation (#1160) 2019-10-06 10:28:12 +03:00
Smashfanful
f3a8a64491 Update Techs.json
Added translation lines for the tech quotes :D
2019-10-06 06:15:29 +03:00
divizdev
f8351da1c4 Russian translation (#1158)
* Russian translation

* Russian translation

* Russian translation

* Russian translation
2019-10-06 06:14:58 +03:00
Smashfanful
272f58fe5d Update NewGame,SaveGame,LoadGame,Options.json
New line
2019-10-05 21:17:54 +03:00
Smashfanful
815ce27f6c Update Units,Promotions.json 2019-10-05 21:14:49 +03:00
Smashfanful
8d31d2c0ad Update Tutorials_Italian.json
Update
2019-10-05 21:14:31 +03:00
Smashfanful
2f2ace5f3c Update Buildings.json (#1153) 2019-10-05 21:14:00 +03:00
lishaoxia1985
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
Smashfanful
1aa9640d1c Update Other.json
New lines
2019-10-05 20:59:48 +03:00
Smashfanful
67916f9be2 Update Policies.json
Italian translation corrections
2019-10-04 16:50:12 +03:00
Smashfanful
e42cadbf09 Update Diplomacy,Trade,Nations.json 2019-10-04 16:49:47 +03:00
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
Yair Morgenstern
5049831c18 Great Wall no longer provides a free tech - whoops! 2019-10-03 22:11:06 +03:00
Smashfanful
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
MrUldiggg
5c9baaf15a Sweden.json
Just add any color you want
2019-10-01 21:59:41 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Smashfanful
a91fe87e26 Update Nations_Italian.json 2019-09-29 15:25:39 +03:00
Smashfanful
f4243550ce Update Other.json 2019-09-29 15:25:23 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
lishaoxia1985
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
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production
Resolved #1124 - added annex and puppet tutorial
2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Smashfanful
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json
Added new lines
2019-09-28 21:21:30 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
Smashfanful
751c33c609 Update Buildings.json 2019-09-24 20:28:22 +03:00
Smashfanful
a6684a6640 Update Buildings.json (#1118)
More fixes
2019-09-24 20:27:23 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Duan Tao
38a28888ef Duantao/ai bonus (#1117)
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
2019-09-24 16:19:17 +03:00
Smashfanful
ad07db9334 Update Nations_Italian.json
Some Italian fixes
2019-09-24 14:04:55 +03:00
Smashfanful
bc1154c71f Update Notifications.json
Some Italian fixes
2019-09-24 14:04:43 +03:00
Smashfanful
3b4bf817c0 Update Buildings.json
More Italian translations
2019-09-23 20:14:44 +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
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
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00