Commit graph

1246 commits

Author SHA1 Message Date
Yair Morgenstern
7b6d37053b
Merge pull request #528 from Smashfanful/patch-49
Update Nations_Italian.json
2019-03-07 23:09:04 +02:00
Yair Morgenstern
f15490d0ac Resolved #470 - can now click on a building in the city info table to display its effect
Organized city info table
2019-03-07 23:05:48 +02:00
Yair Morgenstern
6f46750c15
Merge pull request #532 from Smashfanful/patch-53
Update Translations.json
2019-03-07 19:15:04 +02:00
Yair Morgenstern
8fff034221
Merge pull request #531 from Smashfanful/patch-52
Update Buildings.json
2019-03-07 19:14:33 +02:00
Yair Morgenstern
15cb18ca26
Merge pull request #530 from Smashfanful/patch-51
Update Units.json
2019-03-07 19:14:17 +02:00
Yair Morgenstern
bc2a4882c5
Merge pull request #519 from Smashfanful/patch-46
Update Terrains.json
2019-03-07 19:09:06 +02:00
Smashfanful
7713170d97
Update Translations.json 2019-03-07 17:32:28 +01:00
Smashfanful
c93ee1e1f2
Update Buildings.json
Added Walls of Babylon. Should I also add Forum for Rome, Obelisk for Egypt and Shale Plant for Japan (all from CIV4)?
2019-03-07 17:28:46 +01:00
Smashfanful
873d4f1cff
Update Units.json
Added War Chariots for Egypt, Chu-Ko-Nu for China, Cossack for Russia, Ship of the Line for England, and Legion for Rome. Legion should also build roads. Some suggestion to updates for Legion, Samurai and Camel Archer.
2019-03-07 17:18:30 +01:00
Smashfanful
c34249a66e
Update Nations_Italian.json
Corrections.
2019-03-07 15:54:32 +01:00
Yair Morgenstern
b73ee6d1e0
Merge pull request #527 from ninjatao/runtime_json_error
Fix json error.
2019-03-07 11:53:14 +02:00
Duan Tao
0c6826fd9b Fix json error. 2019-03-07 14:01:57 +08:00
Yair Morgenstern
6a833ae89a Resolved #514 - enemy civ is defeated even when he has settlers left, as per original Civ 2019-03-06 20:39:53 +02:00
Yair Morgenstern
4dcf2cacc4
Merge pull request #521 from Smashfanful/patch-48
Update Translations.json
2019-03-06 20:37:07 +02:00
Yair Morgenstern
c0652a79f1
Merge pull request #520 from Smashfanful/patch-47
Update TileResources.json
2019-03-06 20:36:38 +02:00
Smashfanful
aab1ebb47d
Update Translations.json 2019-03-06 18:51:06 +01:00
Smashfanful
42d043a8ad
Update TileResources.json
Added Copper, Bison, Citrus, Crab, Truffles and Cocoa
2019-03-06 16:33:23 +01:00
Smashfanful
da2a95512e
Update Terrains.json
Added Snow, and updated Desert and Tundra.
2019-03-06 15:45:51 +01:00
Yair Morgenstern
10508792db
Merge pull request #517 from Smashfanful/patch-44
Update Nations_Italian.json
2019-03-06 15:45:38 +02:00
Yair Morgenstern
c5e7870f38
Merge pull request #518 from Smashfanful/patch-45
Update Nations.json
2019-03-06 15:45:25 +02:00
Smashfanful
ae6189164e
Update Nations.json 2019-03-06 14:27:50 +01:00
Smashfanful
249b9fe57d
Update Nations_Italian.json 2019-03-06 14:27:44 +01:00
Yair Morgenstern
b2a29714bd
Merge pull request #512 from ninjatao/issue/498
Make units pillage improvement to heal, especially barbarians.
2019-03-06 15:17:17 +02:00
Yair Morgenstern
b059ee36db
Merge pull request #516 from Smashfanful/patch-43
Update Tutorials_Italian.json
2019-03-06 14:15:38 +02:00
Yair Morgenstern
d305508e7a
Merge pull request #513 from Smashfanful/patch-41
Update Translations.json
2019-03-06 14:15:28 +02:00
Yair Morgenstern
3599828f97
Merge pull request #515 from Smashfanful/patch-42
Update BasicHelp_Italian.json
2019-03-06 14:05:23 +02:00
Smashfanful
be7f96d10c
Update Tutorials_Italian.json 2019-03-06 12:26:53 +01:00
Smashfanful
b959b4f190
Update BasicHelp_Italian.json
Misses a translation here
2019-03-06 12:21:50 +01:00
Smashfanful
b1cb0e7131
Update Translations.json 2019-03-06 12:13:54 +01:00
Duan Tao
d91a23b723 Make units pillage improvement to heal, especially barbarians. 2019-03-06 17:42:00 +08:00
Yair Morgenstern
7357707010 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-05 22:19:20 +02:00
Yair Morgenstern
afaf4ae6da Resolved #508 - Missing and bad translations 2019-03-05 22:18:57 +02:00
Yair Morgenstern
626250a2d9
Merge pull request #509 from Smashfanful/patch-39
Update Nations_Italian.json
2019-03-05 22:05:16 +02:00
Yair Morgenstern
9a4211a7dd
Merge pull request #510 from Smashfanful/patch-38
Update Nations.json
2019-03-05 22:04:42 +02:00
Yair Morgenstern
f708954940
Merge pull request #503 from Smashfanful/patch-34
Update Nations.json
2019-03-05 22:04:24 +02:00
Yair Morgenstern
de6acfeda6
Merge pull request #507 from Smashfanful/patch-37
Update Translations.json
2019-03-05 21:50:41 +02:00
Smashfanful
49b4ec0880
Update Nations_Italian.json 2019-03-05 15:38:31 +01:00
Smashfanful
66625a5e54
Update Nations.json 2019-03-05 15:38:25 +01:00
Smashfanful
bcefae56a5
Update Translations.json
Added Japanese for some lines.
2019-03-05 12:08:39 +01:00
Yair Morgenstern
0065afa8f4
Merge pull request #505 from Smashfanful/patch-36
Update Nations_Italian.json
2019-03-04 22:14:56 +02:00
Yair Morgenstern
efe677d27c Added Civilopedia texts to translation file 2019-03-04 21:32:18 +02:00
Smashfanful
a8daf29621
Update Nations_Italian.json 2019-03-04 20:11:07 +01:00
Smashfanful
49f46d44d4
Update Nations.json 2019-03-04 17:11:22 +01:00
Yair Morgenstern
1048489ff2
Merge pull request #501 from Smashfanful/patch-31
Update Nations_Italian.json
2019-03-04 15:31:35 +02:00
Smashfanful
6c3457f05e
Update Nations_Italian.json 2019-03-04 12:52:33 +01:00
Yair Morgenstern
9c065d42f2
Merge pull request #500 from ninjatao/issue/499
Barbarian units ignore strategy resources.
2019-03-04 08:40:55 +02:00
Duan Tao
223055d247 Barbarian units ignore strategy resources. 2019-03-04 09:44:09 +08:00
Yair Morgenstern
0ef11e12cd Resolved #491 - Once Honor has been adopted, gain Culture when you kill a barbarian unit 2019-03-03 23:05:12 +02:00
Yair Morgenstern
c4e686f514
Merge pull request #496 from Smashfanful/patch-29
Update BasicHelp_Italian.json
2019-03-03 18:14:12 +02:00
Yair Morgenstern
b98b0feef3
Merge pull request #495 from Smashfanful/patch-28
Update Nations.json
2019-03-03 18:14:01 +02:00