Commit graph

557 commits

Author SHA1 Message Date
lishaoxia1985
16d55577b2 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
ab915c408a Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
9549be7d06 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
6ef95c37ff Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a182b32485 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a89c0623ce Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
57b8d9f3d9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
d0984e12a9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
f6c5532b14 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
50224c71f6 Update Translations.json 2019-04-23 14:38:50 +03:00
Yair Morgenstern
f954686dfd
Merge pull request #669 from lishaoxia1985/master
Update Translations.json
2019-04-22 09:17:16 +03:00
lishaoxia1985
edcfe69732
Update Translations.json 2019-04-21 19:21:58 +08:00
Yair Morgenstern
30232564a2
Merge pull request #667 from lishaoxia1985/master
update some simplified chinese language
2019-04-21 08:33:28 +03:00
lishaoxia1985
4c52b639e5
Update Translations.json 2019-04-21 06:49:39 +08:00
lishaoxia1985
c845001097
Update Translations.json 2019-04-21 03:51:24 +08:00
lishaoxia1985
dd48d4444f
Update Translations.json 2019-04-21 01:26:47 +08:00
Am-per-Sand
630f86bbb3
enable Sentry for water melee units
There is contradictory information on units that can receive Sentry promotion, but this has been already enabled, so **adding missing prerequisites** so as water melee can get it as well as water ranged now.
2019-04-20 18:42:02 +02:00
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
25455df0fd
Merge pull request #649 from divizdev/master
Russian translation
2019-04-15 08:22:09 +03:00
Yair Morgenstern
7ce7c2da93 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-14 22:13:10 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
divizdev
8fe889dc96
Merge branch 'master' into master 2019-04-14 21:22:14 +03:00
diviz
9647a6d64e Russian translation 2019-04-14 21:17:06 +03:00
Smashfanful
e69a23b43e
Update Units.json
Added Brute
2019-04-12 16:42:27 +02:00
Yair Morgenstern
ccb9950187 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 17:05:55 +03:00
Yair Morgenstern
7228634982 Resolved #642 - pyramids unlocked with Masonry 2019-04-12 17:05:35 +03:00
Yair Morgenstern
02868dc157
Merge pull request #639 from Smashfanful/patch-91
Update Nations.json
2019-04-12 17:01:54 +03:00
Smashfanful
f3e303e464
Update Translations.json 2019-04-12 15:25:51 +02:00
Smashfanful
3a16014fab
Update Nations.json 2019-04-12 15:21:01 +02:00
Yair Morgenstern
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
Yair Morgenstern
4c9ca3fd19 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 13:34:17 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
b000fda165
Merge pull request #604 from Smashfanful/patch-79
Update Nations_Italian.json
2019-04-12 13:33:49 +03:00
Smashfanful
1461e0a58b
Update Translations.json 2019-04-12 11:35:26 +02:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Smashfanful
edfd2a69c2
Update Translations.json 2019-04-10 19:32:01 +02:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building
Added Chu-Ko-Nu unique unit
2019-04-09 23:31:16 +03:00
Smashfanful
3927d8d7ab
Update Translations.json 2019-04-09 16:47:54 +02:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
42eb3fa297 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-07 20:24:15 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Smashfanful
fb77a35901
Update Translations.json 2019-04-05 10:40:51 +02:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Smashfanful
bf33bcaffc
Update Tutorials_Italian.json
Some minor corrections
2019-04-01 17:57:47 +02:00
Yair Morgenstern
6796c1868b Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game 2019-04-01 00:05:11 +03:00
Yair Morgenstern
38f732b461 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-29 15:18:17 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
18f96dd207
Merge pull request #611 from B5656/patch-3
Create BasicHelp_French.json
2019-03-29 15:10:55 +03:00
Yann
08c7671c68
Update GreatPeopleNames.json
little update, a " was missing
2019-03-29 12:01:33 +01:00
Yann
d0dac336b6
Create BasicHelp_French.json
add french version of the basic help
2019-03-29 11:50:38 +01:00
Yair Morgenstern
2f889fb57f
Merge branch 'master' into patch-2 2019-03-27 16:18:17 +02:00
Smashfanful
e4b9597fb1
Update Translations.json 2019-03-27 11:45:37 +01:00
Smashfanful
5f344c5299
Update Translations.json
Also added some translation you should add
2019-03-25 18:31:25 +01:00
Yann
d0b65da424
Update Translations.json
Update French version
2019-03-25 11:27:37 +01:00
Smashfanful
0ff3d7a5fd
Update Nations_Italian.json 2019-03-24 15:41:47 +01:00
Yair Morgenstern
3f6dead4c6
Merge pull request #590 from Am-per-Sand/master
"Machu Picchu" typo
2019-03-21 12:30:24 +02:00
Yair Morgenstern
080a2f7e9a
Merge branch 'master' into patch-77 2019-03-20 23:37:20 +02:00
Smashfanful
92f929506c
Update Translations.json 2019-03-20 17:06:25 +01:00
Smashfanful
3aaac3bb36
Update Translations.json 2019-03-20 17:05:24 +01:00
Smashfanful
fbf700efdd
Update Translations.json 2019-03-19 19:44:22 +01:00
Am-per-Sand
56597f205b
"Machu Picchu" 2019-03-19 17:44:04 +01:00
Am-per-Sand
94ab46f540
"Machu Picchu" 2019-03-19 17:40:55 +01:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big!
Options table is now a table, not a list - more room for future options
2019-03-19 17:09:51 +02:00
Yair Morgenstern
f1f3753231 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-17 20:33:07 +02:00
Yair Morgenstern
d307c638b5 Resolved #577 - fixed translations where the text in brackets didn't fit the pattern 2019-03-17 20:33:02 +02:00
Duan Tao
a495413481 Fix a very stupid obselete define. 2019-03-17 14:48:05 +08:00
Duan Tao
ea36508200 Modern units upgrade tree. 2019-03-17 11:39:32 +08:00
Am-per-Sand
9f09c2dc55
Variable names warning for translators 2019-03-16 18:55:41 +01:00
Yair Morgenstern
34a3c3dfae
Merge pull request #572 from L314/spelling
"Replacable Parts" is now "Replaceable Parts"
2019-03-15 10:08:10 +02:00
Yair Morgenstern
9bccc739d4
Merge pull request #574 from Smashfanful/patch-74
Update Nations.json
2019-03-14 21:47:22 +02:00
Yair Morgenstern
8de1d2b5f7
Merge pull request #573 from Smashfanful/patch-73
Update Nations_Italian.json
2019-03-14 21:44:32 +02:00
Yair Morgenstern
72734de254
Merge pull request #575 from Smashfanful/patch-75
Update Translations.json
2019-03-14 21:41:14 +02:00
Yair Morgenstern
456f524601 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-14 21:33:38 +02:00
Yair Morgenstern
db6c47e13a Sorted spacing issues 2019-03-14 21:33:33 +02:00
Smashfanful
72ebc2ae4d
Update Translations.json 2019-03-14 12:24:14 +01:00
Smashfanful
776ce635dd
Update Nations.json 2019-03-14 11:34:04 +01:00
Smashfanful
50871d02e3
Update Nations_Italian.json 2019-03-14 11:33:44 +01:00
Smashfanful
f67b4370ca
Update Nations_Italian.json 2019-03-14 11:30:06 +01:00
Lliam Leosh
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
Smashfanful
53bbd84e3a
Update Nations.json 2019-03-13 16:38:38 +01:00
Yair Morgenstern
479b3a02ad Resolved #383 - Configurable amount of turns between autosaves 2019-03-12 22:10:25 +02:00
Yair Morgenstern
4669d4aa2a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-12 19:26:12 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
7a26dc335b
Merge pull request #562 from Smashfanful/patch-69
Update Tutorials_Italian.json
2019-03-12 19:24:46 +02:00
Yair Morgenstern
02f1530c44 Fixed translation file 2019-03-11 20:20:07 +02:00
Smashfanful
54189ae296
Update Tutorials_Italian.json
Added some lines for the Italian version.
2019-03-11 17:08:47 +01:00
Yair Morgenstern
c69aea2125
Merge pull request #555 from Smashfanful/patch-65
Update Translations.json
2019-03-11 16:46:24 +02:00
Yair Morgenstern
88a3b6e59f
Merge pull request #542 from Smashfanful/patch-58
Update Nations.json
2019-03-11 16:45:37 +02:00
Smashfanful
40b0125320
Update Translations.json
Three new Wonders suggested by Smashfanful: Mausoleum of Halicarnassus, Himeji Castle and Statue of Zeus
2019-03-11 15:01:29 +01:00
Smashfanful
968667208b
Update Nations.json 2019-03-11 14:15:04 +01:00
Smashfanful
4e5d2bd127
Update BasicHelp.json
Some grammatical errors have been corrected, I hope.
2019-03-11 14:13:44 +01:00
Yair Morgenstern
09b1446fea Removed empty translations (very bad for people who play the game in that language)
Added a way to copy game info directly from files, and also a popup when encountering a certain error, for debugging purposes
2019-03-10 22:52:57 +02:00
Smashfanful
ac9c942dd3
Update Translations.json 2019-03-10 19:09:12 +01:00
Yair Morgenstern
d26aaf9a35 Now it should compile properly
Also fixed tabbing for simplified chinese and portuguese translations, which was consistently off
2019-03-09 22:34:30 +02:00