Commit graph

2403 commits

Author SHA1 Message Date
YueR
74610b748a update 2019-09-09 16:26:25 +08:00
YueR
35ef7989bb update to master 2019-09-09 08:34:28 +08:00
YueR
252748d30c Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-09-09 08:30:23 +08:00
YueR
eb6f07dab4 update to master 2019-09-09 08:29:47 +08:00
YueR
b31c6f3ec7 fix that researched tech can be picked when we pick a free tech 2019-09-09 08:26:17 +08:00
Yair Morgenstern
9e0ba99c0a Invalid trade requests (e.g. giving a city that isn't yours anymore or resources you no longer own) are discarded at the beginning of the civ's turn 2019-09-08 23:33:39 +03:00
Yair Morgenstern
7603d3c839 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-08 19:27:58 +03:00
Yair Morgenstern
462fc6fab7 English translations 2019-09-08 19:27:00 +03:00
lishaoxia1985
c06028b082 update translation (#1041)
* 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
2019-09-08 19:25:49 +03:00
Smashfanful
fc76052ee5 Update Diplomacy,Trade,Nations.json
More Italian Translations
2019-09-08 19:22:21 +03:00
Smashfanful
400ef5d07e Update Notifications.json
An Italian translation line more
2019-09-08 19:21:58 +03:00
Smashfanful
4a00ed95f1 Update Units,Promotions.json
Forgotten Italian translations
2019-09-08 18:58:54 +03:00
lishaoxia1985
9e493c4bf9
Merge branch 'master' into master 2019-09-08 21:26:58 +08:00
Smashfanful
afd5815d30 Update Nations.json 2019-09-08 16:21:43 +03:00
Smashfanful
e8516e4455 Update Units,Promotions.json
Italian Translations
2019-09-08 16:21:02 +03:00
Smashfanful
3ee61c8902 Update Nations_Italian.json 2019-09-08 16:20:46 +03:00
YueR
a50400e4db update 2019-09-08 20:42:04 +08:00
lishaoxia1985
d785f1a13d
Merge branch 'master' into master 2019-09-08 20:36:05 +08:00
YueR
502c8923d6 update 2019-09-08 20:26:35 +08:00
pikkolpk
cc12018428 Russian Translation (#1042)
* Update NewGame,SaveGame,LoadGame,Options.json

* Update Other.json

* Update Policies.json

* Update Terrains,Resources,Improvements.json

* Update Units,Promotions.json

* Update Other.json
2019-09-08 13:12:43 +03:00
YueR
9951d9f58b update 2019-09-08 16:34:13 +08:00
lishaoxia1985
db94ae4935
update 2019-09-08 16:26:45 +08:00
lishaoxia1985
f69e5525c5
update 2019-09-08 16:26:30 +08:00
YueR
dc96f43076 update 2019-09-08 16:18:56 +08:00
YueR
6ac8259b83 update 2019-09-08 16:05:17 +08:00
YueR
78fa91068e update 2019-09-08 03:57:01 +08:00
YueR
bbfe5d7c3f update 2019-09-08 03:29:43 +08:00
YueR
340f70dc45 update 2019-09-08 03:25:23 +08:00
YueR
11928e57d5 Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv
update
2019-09-08 03:13:21 +08:00
YueR
f1b3024a07 update 2019-09-08 02:54:12 +08:00
YueR
62e64af210 update 2019-09-08 02:46:14 +08:00
Yair Morgenstern
3974842265 Added error message when attempting to load a map from bad copied data 2019-09-07 21:31:56 +03:00
Yair Morgenstern
c9f6ba958f Can no longer adopt policies after being defeated 2019-09-07 21:24:28 +03:00
lishaoxia1985
53aaceb06b update Chinese translation,Russian translation Lost a word ("), please update it immediately! (#1028)
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
2019-09-07 21:08:36 +03:00
Yair Morgenstern
6e4f8e1657
Merge branch 'master' into master 2019-09-07 21:06:38 +03:00
Smashfanful
60b031ada7 Update Policies.json
Added projects for Patronage branch
2019-09-07 21:04:34 +03:00
Smashfanful
93130105fd Update Units,Promotions.json 2019-09-07 21:04:02 +03:00
Smashfanful
d56b469e6c Update Diplomacy,Trade,Nations.json
Another Italian translation
2019-09-07 21:03:36 +03:00
Smashfanful
27e28ddb81 Update Other.json
More Italian translations
2019-09-07 21:03:19 +03:00
Smashfanful
4f9f11805c Update Terrains,Resources,Improvements.json
Added an Italian translation
2019-09-07 21:02:46 +03:00
Smashfanful
0613c322bd Update NewGame,SaveGame,LoadGame,Options.json
More Italian translations
2019-09-07 21:02:29 +03:00
Smashfanful
76bf219abd Update Nations_Italian.json
Added Korean civ
2019-09-07 21:02:10 +03:00
pikkolpk
45b12c7d89 Update Diplomacy,Trade,Nations.json 2019-09-07 21:01:47 +03:00
pikkolpk
c2c01adec8 Update Buildings.json 2019-09-07 21:01:17 +03:00
Duan Tao
3d324f516d AIs are not affected by auto-production setting. 2019-09-07 21:00:48 +03:00
YueR
6db7858edc update 2019-09-07 22:31:53 +08:00
YueR
b4f06259da update 2019-09-07 21:11:15 +08:00
YueR
c6c985aa1c update 2019-09-07 20:58:19 +08:00
YueR
a5efff7173 update 2019-09-07 14:48:21 +08:00
YueR
373fefd2e3 update 2019-09-07 14:28:21 +08:00