wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2610 commits 7 branches 304 tags 288 MiB
Commit graph

345 commits

Author SHA1 Message Date
Duan Tao
cdf29a8ca7 Correct some Chinese translation. 2019-10-08 10:39:10 +08:00
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
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
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
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
Smashfanful
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +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
Smashfanful
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json 
Added new lines
 2019-09-28 21:21:30 +03:00
Smashfanful
a6684a6640 Update Buildings.json (#1118) 
More fixes
 2019-09-24 20:27:23 +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
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
1591215f4c Update Buildings.json 
Last Wonder lines translations
 2019-09-19 20:52:10 +03:00
Smashfanful
4cd30d8301 Update Diplomacy,Trade,Nations.json 2019-09-16 19:50:06 +03:00
Smashfanful
2dccc6cf90 Update Buildings.json 
Since the Persian Civilization is on the go, I guess we can work this out.
 2019-09-16 19:49:43 +03:00
Smashfanful
1b4b326cf7 Update Units,Promotions.json 
Italian Translations
 2019-09-16 19:49:11 +03:00
lishaoxia1985
390254b584 instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080) 
* 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
 2019-09-16 19:48:41 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Smashfanful
3688622d06 Update Buildings.json 
Added translations for Wonder Quotes
 2019-09-14 21:04:39 +03:00
pikkolpk
90e9cf056c Update Diplomacy,Trade,Nations.json 2019-09-14 21:03:57 +03:00
lishaoxia1985
5f43c93846 MrUldiggg delete some words which are necessary. please update immediately (#1069) 
* 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
 2019-09-12 19:42:29 +03:00
lishaoxia1985
6e34f4743a update translation (#1067) 
* 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"

* 显示教程
 2019-09-12 13:05:58 +03:00
Smashfanful
7578cf4bbc Update Units,Promotions.json (#1061) 
* Update Units,Promotions.json

Missing Italian Translation, and I think I accidentally deleted the Spanish translation for Turtle Ship

* Update Units,Promotions.json
 2019-09-11 11:22:40 +03:00
lishaoxia1985
99959c9937 delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058) 
* 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"

* 显示教程
 2019-09-10 17:41:45 +03:00
lishaoxia1985
a8663dda91 fix that researched tech can be picked when we pick a free tech (#1049) 
* 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
 2019-09-09 22:43:00 +03:00
Smashfanful
0eed8b04ba Update Notifications.json 2019-09-09 15:51:25 +03:00
Smashfanful
d1f1acf3e0 Update Other.json 2019-09-09 15:51:03 +03:00
Smashfanful
9bf944afad Update NewGame,SaveGame,LoadGame,Options.json 
Italian Translations
 2019-09-09 15:50:45 +03: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
Smashfanful
e8516e4455 Update Units,Promotions.json 
Italian Translations
 2019-09-08 16:21:02 +03: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
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
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
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
Smashfanful
b945b49248 Update Units,Promotions.json (#1021) 
* Update Units,Promotions.json

* Update Units,Promotions.json

Correction for Hwacha to Hwach'a
 2019-09-06 15:08:50 +03:00
Yair Morgenstern
17b3069668 Added confirmation popup when deleting maps 2019-09-05 21:50:33 +03:00
Yair Morgenstern
d3a6417996 Can no longer pick policies in multiplayer when it's someone elses turn 2019-09-05 21:45:04 +03:00
lishaoxia1985
faa90dd269 update chinese traslation (#1026) 
* systemProp

* update

* update

* update
 2019-09-05 15:27:22 +03:00
pikkolpk
359ac26f1f Update Diplomacy,Trade,Nations. (Russian translation) 2019-09-04 22:53:44 +03:00
lishaoxia1985
455de79d28 Update chinese translation (#1024) 
* systemProp

* update

* update
 2019-09-03 21:10:42 +03:00
Smashfanful
225976365e Update Buildings.json 2019-09-03 21:05:11 +03:00
Smashfanful
4b530ebe38 Update Diplomacy,Trade,Nations.json 2019-09-03 21:04:56 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
pikkolpk
9fa6c4ffce Update Units,Promotions.json (Russian Translation) 2019-09-02 22:44:32 +03:00
pikkolpk
4090f52606 Update Notifications.json (Russian translation) 2019-09-02 22:44:15 +03:00
pikkolpk
f18d1fdaf3 Update Buildings.json 2019-09-01 23:06:00 +03:00
pikkolpk
16a362ac2f Update Techs.json 2019-09-01 23:06:00 +03:00
pikkolpk
a99e7866e6 Update Units translation(Russian) 2019-09-01 23:06:00 +03:00
Yair Morgenstern
675d05d1e4 Minor fixes to multiplayer UI components 2019-09-01 17:18:08 +03:00
Yair Morgenstern
ab26f66e1a Implemented Alexander's unique - #563 2019-09-01 15:26:27 +03:00
Smashfanful
9a3ea36e2d Update Other.json 2019-09-01 15:16:18 +03:00
Smashfanful
743ecf3560 Update NewGame,SaveGame,LoadGame,Options.json 2019-09-01 15:16:10 +03:00
Smashfanful
52aec60fba Update Notifications.json 
Corrections (Italian)
 2019-08-25 21:51:29 +03:00
Kirill-Osmanov
30d8a03e3c Updated translations 
Updated translations (ru)
 2019-08-25 21:50:54 +03:00
Yair Morgenstern
c685e0f528 Resolved #1007 - trades and alerts now work again, which means they'll also work in multiplayer =) 2019-08-21 23:44:28 +03:00
Yair Morgenstern
03228a6546 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-08-20 10:56:20 +03:00
Yair Morgenstern
b9baa654ab Added End Game Messages for varioud victory types 2019-08-20 10:55:27 +03:00
Am-per-Sand
b1162b50fd Polish minor corr. & add. Buildings.json 2019-08-19 20:13:38 +03:00
Kirill-Osmanov
b763a4a051 Updated translations 
The small changes in translations (ru)
 2019-08-18 23:43:44 +03:00
Kirill-Osmanov
e1cb58bf53 Update NewGame,SaveGame,LoadGame,Options.json 
A small changes in translations (ru)
 2019-08-17 23:43:30 +03:00
Smashfanful
0adc3c9548 Update Diplomacy,Trade,Nations.json (#981) 
* Update Diplomacy,Trade,Nations.json

* Update Diplomacy,Trade,Nations.json

* Update Diplomacy,Trade,Nations.json

Remotion of unecessary (at least for now) translation lines
 2019-08-16 09:40:25 +03:00
Smashfanful
734b5f0778 Update Other.json 
New Italian translations
 2019-08-09 15:58:10 +03:00
Yair Morgenstern
d7cd305e1c Added image for Polish language 2019-08-08 20:57:49 +03:00
Yair Morgenstern
375952f935 More polish changes 2019-08-07 22:04:42 +03:00
Yair Morgenstern
9cbd442d5b Polish translation technical fixes 2019-08-07 21:50:55 +03:00
Hades1696
de2dae97a9 Polish translation 
Till denouncing.
 2019-08-07 21:11:31 +03:00
Smashfanful
dc44783ca7 Update Buildings.json 
Correction of a translation line
 2019-08-07 21:11:15 +03:00
Hades1696
e594e7af7a Polish translation of building.json complete 2019-08-07 21:10:56 +03:00
Hades1696
33d3e685f5 Polish translation 
'Till forbidden palace
 2019-08-07 12:09:13 +03:00
Smashfanful
f3ba4b5486 Update NewGame,SaveGame,LoadGame,Options.json 2019-08-04 19:44:37 +03:00
Smashfanful
2a7ba5291b Update NewGame,SaveGame,LoadGame,Options.json 2019-08-04 19:44:37 +03:00
Smashfanful
09032aa7fc Update Notifications.json 2019-08-01 21:26:06 +03:00
Smashfanful
4d341aa083 Update Other.json 2019-08-01 21:25:03 +03:00
Smashfanful
9aa12493e3 Update Techs.json (#968) 
* Update Techs.json

Added Lasers and Mobile Tactics

* Update Techs.json

Correction
 2019-07-30 17:59:07 +03:00
Smashfanful
f5d25c2fd5 Update Notifications.json 2019-07-30 10:18:14 +03:00
Smashfanful
5ed7f6aaa6 Update Buildings.json 2019-07-30 10:17:54 +03:00
Yair Morgenstern
2799205884 Demands now work between human players! 2019-07-29 17:03:24 +03:00
Yair Morgenstern
6dc471850e Trades are no longer instantaneous, but consist of sending a trade request on the requestor's turn and accepting/denying it on the reciever's turn. 
This allows us to FINALLY enable trade between human players, enables PvP in hotseat multiplayer, and paves the way to real multiplayer!
 2019-07-29 16:31:21 +03:00
Yair Morgenstern
98eb4c8cd7 Travis test + minor fixes 2019-07-27 23:21:40 +03:00
Smashfanful
8f8ab75182 Update Units,Promotions.json 2019-07-25 18:35:49 +03:00
Smashfanful
0db114af0c Update NewGame,SaveGame,LoadGame,Options.json 2019-07-25 18:35:24 +03:00
Yair Morgenstern
994e313101 Added Game Speed option - part of #559 2019-07-24 18:35:06 +03:00
Smashfanful
d33a553d58 Update Diplomacy,Trade,Nations.json 2019-07-23 18:30:33 +03:00
Yann
db9f776e1f Update French version of Diplomacy,Trade,Nations 2019-07-22 16:27:56 +03:00
Yann
8e404b548e Update French version of Buildings.json 2019-07-22 16:27:41 +03:00
Yann
0000c95693 Update French version of Units.promotions.json 2019-07-22 16:27:27 +03:00
Yann
f4600038fb Update French version of Notifications.json 2019-07-22 15:53:10 +03:00
Yann
08d7c75fa8 Update French version of Other.json 2019-07-22 15:52:20 +03:00
Yair Morgenstern
e9e0e55b5e Resolved #952 - fixed building requirements for Neuschwanstein, Stone Works, Windmill and Spaceship Factory 2019-07-21 19:54:16 +03:00
Yair Morgenstern
b565489fd5 Changed "free population" in cities to "unassigned population" to be less confusing 2019-07-19 14:01:16 +03:00
Smashfanful
c406d01de5 Update Units,Promotions.json 2019-07-17 20:10:07 +03:00
Smashfanful
a4f360de3b Update Units,Promotions.json 
Added new lines
 2019-07-17 20:10:07 +03:00
Smashfanful
749771daf4 Update Techs.json 2019-07-17 12:53:58 +03:00
Yair Morgenstern
7bbd006180 Added BFS for arial movement 2019-07-13 22:48:47 +03:00
Yair Morgenstern
e78f408bff Translation fixes 2019-07-11 21:21:45 +03:00
Smashfanful
a8b2a4471e Update Other.json 2019-07-11 21:19:06 +03:00
Smashfanful
2118fde87b Update Notifications.json 2019-07-11 21:17:32 +03:00
Smashfanful
002bec7ba7 Update Units,Promotions.json 2019-07-11 21:15:26 +03:00
Smashfanful
977ba5f5e9 Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Smashfanful
9780be455d Update Diplomacy,Trade,Nations.json 2019-07-11 21:14:41 +03:00
Duan Tao
cae3d49738 Add notification translation. 2019-07-11 10:05:29 +03:00
Yair Morgenstern
214b4880e4 AIR UNITS ARE GO! 
Added interception and basic air unit AI
 2019-07-10 22:41:44 +03:00
Smashfanful
f4acd3005d Update Diplomacy,Trade,Nations.json 2019-07-10 19:16:29 +03:00
Smashfanful
273b06aa3a Update Other.json 
Italian corrections.
 2019-07-02 12:15:48 +03:00
Am-per-Sand
275fa5842a Shorten city screen strings of Other.json 
Stopped population growth
...turns to lose/new population
expansion turns to, - stopped
 2019-06-30 22:25:13 +03:00
Yair Morgenstern
0eb28b9ae7 Great General bonus affects naval units (as long as we don't have Great Admirals in the game) 2019-06-30 19:48:47 +03:00
Am-per-Sand
12b9472805 Fixed same name for different units bug 2019-06-29 23:17:46 +03:00
Smashfanful
ac664d97c9 Update Units,Promotions.json 2019-06-27 07:26:05 +03:00
Am-per-Sand
ad2704f6af typo fix in Notifications 2019-06-27 07:25:28 +03:00
Yair Morgenstern
921dd28296 Unified "Bonus vs" translations 2019-06-25 23:09:58 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
7e50f70bd5 Resolved #899 - Added setting to disable city auto-picking construction 2019-06-24 19:35:45 +03:00
Smashfanful
2f97ed54c0 Update NewGame,SaveGame,LoadGame,Options.json 2019-06-24 14:48:55 +03:00
Smashfanful
be02ad5839 Update Diplomacy,Trade,Nations.json 
Added other leaders
 2019-06-24 08:11:07 +03:00
Yair Morgenstern
3b9ab43bbe Resolved #898 - added option to disable tutorials 2019-06-24 06:43:51 +03:00
Smashfanful
18d7446fab Update Diplomacy,Trade,Nations.json 
Added Leader names
 2019-06-23 08:56:40 +03:00