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

1184 commits

Author SHA1 Message Date
Smashfanful
aa55fdb424 Update Units,Promotions.json (#1205) 2019-10-16 18:14:39 +03:00
Smashfanful
6c898174d9 Update Units.json (#1206) 2019-10-16 18:13:51 +03:00
Yair Morgenstern
ecc32365f5 Added notification when cities are connected to the capital 2019-10-16 00:40:37 +03:00
Smashfanful
556ba11bba Update Nations.json (#1192) 
Added new City-States, and modified Venice
 2019-10-15 20:37:03 +03:00
Smashfanful
f968b55949 Update Nations_Italian.json (#1191) 2019-10-15 20:36:56 +03:00
Smashfanful
b996e163e0 Update Terrains,Resources,Improvements.json (#1195) 
Added Moai translations
 2019-10-15 20:34:47 +03:00
Smashfanful
75d584c473 Update Diplomacy,Trade,Nations.json (#1196) 2019-10-15 20:34:30 +03:00
Smashfanful
6c8c851ea2 Update Policies.json (#1187) 
Some Italian corrections according to the original Civ V Italian localization
 2019-10-15 20:33:47 +03:00
Smashfanful
73eedcf63d Update NewGame,SaveGame,LoadGame,Options.json (#1186) 
* Update NewGame,SaveGame,LoadGame,Options.json

* Update NewGame,SaveGame,LoadGame,Options.json
 2019-10-15 20:33:29 +03:00
Yair Morgenstern
36ffc5520a Added annex/puppet/liberate/raze explanations on the popup where you choose between them 2019-10-15 20:30:11 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images! 
Added Pillaging tutorial
 2019-10-15 16:00:07 +03:00
Yair Morgenstern
e2459c06fc More unit icons 2019-10-15 10:52:21 +03:00
Yair Morgenstern
35a96dbed4 Bonus and Luxury resources are spread out evenly over the map 2019-10-14 23:00:55 +03:00
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00
Yair Morgenstern
fb768682fe Added more unit icons =) 
Organized tileset image locations
 2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
b661308a9d Improvements that provide resources now specified in the improvement picker screen 
Tutorials for resources now specify that a specific improvement is needed
 2019-10-12 22:27:45 +03:00
lishaoxia1985
7d14c0924b 1.update translation 2. delete population number back the city name of city screen because there is a detail table in the screen. 3. now when you touch "X" you can close unit table. (#1184) 2019-10-12 21:39:58 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Yair Morgenstern
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00
Smashfanful
6fdfc5a72c Update Techs.json (#1183) 2019-10-11 12:47:18 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +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
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 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
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
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
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia! 
Mass tutorial renaming
 2019-10-06 23:18:51 +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
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
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
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
Yair Morgenstern
5049831c18 Great Wall no longer provides a free tech - whoops! 2019-10-03 22:11:06 +03:00
Smashfanful
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
MrUldiggg
5c9baaf15a Sweden.json 
Just add any color you want
 2019-10-01 21:59:41 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Smashfanful
a91fe87e26 Update Nations_Italian.json 2019-09-29 15:25:39 +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
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Smashfanful
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json 
Added new lines
 2019-09-28 21:21:30 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
Smashfanful
751c33c609 Update Buildings.json 2019-09-24 20:28:22 +03:00
Smashfanful
a6684a6640 Update Buildings.json (#1118) 
More fixes
 2019-09-24 20:27:23 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Duan Tao
38a28888ef Duantao/ai bonus (#1117) 
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
 2019-09-24 16:19:17 +03:00
Smashfanful
ad07db9334 Update Nations_Italian.json 
Some Italian fixes
 2019-09-24 14:04:55 +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
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097) 
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
 2019-09-23 08:37:53 +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
1359c3eab3 Update TileImprovements.json 2019-09-19 20:52:41 +03:00
Smashfanful
1591215f4c Update Buildings.json 
Last Wonder lines translations
 2019-09-19 20:52:10 +03:00
Smashfanful
ee1751a496 Update Techs.json 
Added Medieval and Renaissance Tech quotes
 2019-09-19 15:58:59 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
Duan Tao
45342a7d63 Remove redundant item is Logistics prequisition. 2019-09-18 08:43:17 +03:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Smashfanful
9271fe22a4 Update Techs.json 
Added quotes for Ancient and Classical Age techs
 2019-09-17 20:41:03 +03:00
Smashfanful
11840de2ce Update Nations.json 
Two more City-States: Zanzibar and Singapore
 2019-09-17 08:15:54 +03:00
Smashfanful
d7d7d9a7e6 Update Nations_Italian.json 2019-09-16 19:50:59 +03:00
Smashfanful
9b9dec952b Update Nations_Italian.json 
Persian and Irochese civs, and two new City-States
 2019-09-16 19:50:59 +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
f03dfc10d6 Lakes provide 2 food, as per original Civ 2019-09-16 06:40:35 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode 
Moved Nation jsons
 2019-09-14 23:06:34 +03:00
Smashfanful
3688622d06 Update Buildings.json 
Added translations for Wonder Quotes
 2019-09-14 21:04:39 +03:00
Smashfanful
610795beef Update Buildings.json 2019-09-14 21:04:19 +03:00
pikkolpk
90e9cf056c Update Diplomacy,Trade,Nations.json 2019-09-14 21:03:57 +03:00
Yair Morgenstern
656c94a2a3 Revert "Nubian Pitati Archer and Australian Digger" 
This reverts commit 00f66a785f.
 2019-09-12 19:46:56 +03:00
Yair Morgenstern
fe3cd222ef Revert "Australian Outback Station" 
This reverts commit dbdf2d819f.
 2019-09-12 19:46:22 +03:00
Smashfanful
dbdf2d819f Australian Outback Station 2019-09-12 19:44:04 +03:00
Smashfanful
00f66a785f Nubian Pitati Archer and Australian Digger 2019-09-12 19:43:48 +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
Yair Morgenstern
05a77a9a68 Fixed "units deselect after next turn" problem 
Popup alerts now come before trade request popups
 2019-09-11 21:18:01 +03:00
MrUldiggg
ed807551eb Philipinnes.json 
Philippines Civilization
 2019-09-11 19:42:19 +03:00
Smashfanful
9d9aebc35a Australian Civilization (#1066) 2019-09-11 19:40:54 +03:00
Smashfanful
4bef4719cc Nubian Civilization 2019-09-11 19:39:21 +03:00
Yair Morgenstern
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
Yair Morgenstern
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +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
Yair Morgenstern
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +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
6fb2f402f1 Update Nations_Italian.json 2019-09-09 15:51:43 +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
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
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
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
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
Yair Morgenstern
59cb9f972c You now see your own Diplomacy screen when in multiplayer, and not that of the current player 2019-09-04 20:12:13 +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
a032269cd9 Resolved #563 - Added American unique B17 and Japanese unique Zero units 2019-09-01 16:35:20 +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
lishaoxia1985
62a85cd14a can use native font and "WenQuanYimicroHei" in andriod and desktop (#1013) 
* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* Can Change Language with No "ttf" Font (#772)

* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* update nativefont for Desktop and IOS

* Delete NativeFontIOS.java

* can choose nativefont or font downloading from internet

* update

* update

* Update Fonts.kt

* Update Fonts.kt

* update

* update

* update

* update

* Update build.gradle

* update

* update

* update

* can choose native font or "WenquanYiMicroHei"

* update

* update

* update

* update
 2019-09-01 13:01:37 +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
Yair Morgenstern
5f4f6eb206 Fixed Infantry obsolete tech 2019-08-18 22:36:13 +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
87a5ceb947 Update Nations_Italian.json 
Remotion of these 4 City-States
 2019-08-09 15:59:08 +03:00
Smashfanful
755c488012 Update Nations_Italian.json 2019-08-09 15:59:08 +03:00
Smashfanful
32f257cef6 Update Nations_Italian.json 2019-08-09 15:59:08 +03:00
Smashfanful
734b5f0778 Update Other.json 
New Italian translations
 2019-08-09 15:58:10 +03:00
Yair Morgenstern
93634dae31 Added base for player picking per-player - necessary for multiplayer and solves other probems along the way 2019-08-09 09:03:51 +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
Yair Morgenstern
691d905c9f Resolved #983 - city-state defeat messages were empty 2019-08-01 21:40:16 +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