2387 Commits

Author SHA1 Message Date
Yair Morgenstern
01dd6dfc7d We now assign the input processor when assigning the current screen, hopefully this should solve the "no input" bug in Chrome OS mentioned in #1140 2019-10-10 15:35:26 +03:00
Yair Morgenstern
8d58702d80 Resolved #1177 - Great Improvements now provide Strategic resources
APK no longer bundles maps in assets
2019-10-10 14:48:09 +03:00
Smashfanful
bde11941c5 Update NewGame,SaveGame,LoadGame,Options.json (#1180)
Some more lines
2019-10-10 12:50:29 +03:00
Smashfanful
5674250826 Update Diplomacy,Trade,Nations.json (#1174)
* Update Diplomacy,Trade,Nations.json

I think you should turn "[leaderName] of [nation]" into [leaderName] of the [adjective] empire", I think it makes more sense. Also, corrections.

* Update Diplomacy,Trade,Nations.json
2019-10-10 12:50:14 +03:00
Smashfanful
b30a82ce7f Update Techs.json
Now all tech quotes are now translated in Italian!
2019-10-10 12:49:31 +03:00
Smashfanful
0a4047c2da Update Other.json (#1167)
* Update Other.json

Corrections, translations and a new line

* Update Other.json
2019-10-10 12:42:40 +03:00
Yair Morgenstern
eb179c7a66 Nicer menu table 2019-10-10 12:39:52 +03:00
Duan Tao
362184e515 City states now get free techs from major civs. (#1175) 2019-10-10 12:10:54 +03:00
Yair Morgenstern
222e4ad4b5 Tutorial fix 3.1.4-patch1 2019-10-10 09:48:05 +03:00
lishaoxia1985
4baa7b6105 fix display tutorial, please update immediately (#1176)
* update

* update
2019-10-09 23:40:02 +03:00
Yair Morgenstern
f21e508b28
Merge pull request #1172 from ninjatao/duantao/some_chinese_translation
Correct some Chinese translation.
2019-10-08 10:47:03 +03:00
Yair Morgenstern
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
Yair Morgenstern
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 3.1.4 2019-10-08 10:44:14 +03:00
YueR
43cf084b9f Merge remote-tracking branch 'upstream/master'
update
2019-10-08 15:35:27 +08:00
Yair Morgenstern
734e0e8068
Merge pull request #1171 from ninjatao/duantao/barbarian_bonus
Duantao/barbarian bonus
2019-10-08 10:27:38 +03:00
Yair Morgenstern
62310fa3d5 Fixed "Game errors when loading game" - #1171 2019-10-08 10:26:46 +03:00
Duan Tao
cdf29a8ca7 Correct some Chinese translation. 2019-10-08 10:39:10 +08:00
Duan Tao
6d94b3d8c8 Fix parameter. 2019-10-08 10:17:20 +08:00
Duan Tao
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
YueR
edf4588355 Merge remote-tracking branch 'upstream/master'
update
2019-10-08 04:33:17 +08:00
Smashfanful
c32f4bba56 Update Tutorials_Italian.json 2019-10-07 22:30:57 +03:00
YueR
264b1484d2 update 2019-10-07 21:25:06 +08:00
YueR
69b46cebfd Merge remote-tracking branch 'upstream/master'
update
2019-10-07 19:58:17 +08:00
Duan Tao
3ae18374b6 Liberating city state gives influence. 2019-10-07 13:58:34 +03: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
YueR
718651cd95 Merge remote-tracking branch 'upstream/master'
update
2019-10-07 11:43:57 +08:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia!
Mass tutorial renaming
2019-10-06 23:18:51 +03:00
Yair Morgenstern
69dd7ec7b6 Resolved #1157 - Added popup for entering Golden Age 2019-10-06 19:46:22 +03:00
Yair Morgenstern
4cde23e7a9 Popups no longer appear in multiplayer when it's not your turn 2019-10-06 19:25:40 +03:00
Yair Morgenstern
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
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
YueR
90681940cf update 2019-10-06 14:13:20 +08:00
YueR
329ecbe902 update 2019-10-06 12:04:07 +08:00
YueR
a24e1109ab update 2019-10-06 12:00:38 +08:00
YueR
220864c4ba update 2019-10-06 11:51:04 +08: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
YueR
0f5c6b5849 Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-10-06 06:43:09 +08:00
YueR
000b710ebc update 2019-10-06 06:39:14 +08:00
Smashfanful
272f58fe5d Update NewGame,SaveGame,LoadGame,Options.json
New line
3.1.3
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
Yair Morgenstern
2f849a57e0
Update CivInfoStats.kt 2019-10-05 21:07:54 +03:00
Smashfanful
1aa9640d1c Update Other.json
New lines
2019-10-05 20:59:48 +03:00
Yair Morgenstern
d1fb55a75e Resolved #1152 - New units no longer skip over unassignable tiles (land tiles for water units, mountains) when spawning 2019-10-05 20:58:33 +03:00