Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,184 Commits 6 Branches 1,054 Tags 1.1 GiB
7b822643d9
Commit Graph

2476 Commits

Author SHA1 Message Date
Smashfanful
af2f136c4c Update NewGame,SaveGame,LoadGame,Options.json (#1285) 
Italian translations
 2019-11-04 08:13:15 +02:00
Smashfanful
7964d3c680 Update Units,Promotions.json (#1288) 
Italian translation
 2019-11-04 08:12:32 +02:00
Smashfanful
7b1d33dead Update Diplomacy,Trade,Nations.json (#1284) 
Italian translations
 2019-11-04 08:12:12 +02:00
Smashfanful
345884c0a7 Update Notifications.json (#1286) 
Italian translation
 2019-11-04 08:11:40 +02:00
Smashfanful
e7d81de517 Update Buildings.json (#1283) 2019-11-04 08:11:23 +02:00
Smashfanful
d6dcb8ae46 Update Nations_Italian.json (#1282) 2019-11-04 08:10:57 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
9610f9f918 bugfix - Music volume slider no longer auto-sets to sound effect volume 2019-11-03 20:15:49 +02:00
BenBooth1344
b82a52ce38 added no ancient ruins option (#1280) 2019-11-03 16:17:15 +02:00
Nikulin Nikolai
51dd38eac3 more russian (#1278) 
* more russian

* more russian#2
 2019-11-03 08:00:03 +02:00
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643 
Fixed translation bugs
 2019-11-02 23:08:55 +02:00
Prosta4okua
94a0228e45 [WIP]Ukrainian translation (#1270) 
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json
 2019-11-02 22:43:58 +02:00
Yair Morgenstern
edb5ff92ed Fixed Indirect Fire promotion 2019-11-02 20:10:01 +02:00
StepanIvasyn
403bd173a8 Update Notifications.json (#1275) 
Add Ukrainian translation. Fixed some names is square brackets in Czech.
 2019-11-02 19:41:14 +02:00
dic1911
cc7e2b9e87 More Traditional Chinese translation (#1277) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp

* Traditional Chinese translation for Buildings.json
 2019-11-02 19:39:42 +02:00
dic1911
31b9319905 Traditional Chinese translation for Other.json (#1272) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json

* Traditional Chinese translation for Other.json

* Fix translation derp, which crashes the game upon launch

* Fix translation derp
 2019-11-01 11:53:35 +02:00
Nikulin Nikolai
f249c43529 some russian (#1271) 2019-11-01 08:47:48 +02:00
dic1911
e3dbc94a3c Add some Traditional Chinese translation strings (#1267) 
* allow reverse landscape

by setting android:screenOrientation value to userLandscape

* Add first batch of Traditional Chinese translation

* Complete Traditional Chinese translation for Notifications.json
 2019-10-31 17:50:31 +02:00
Yair Morgenstern
78027ef249 Distinguished notifications of "trade item TO nation has ended" from "trade item FROM nation has ended" 2019-10-31 15:55:13 +02:00
Prosta4okua
ff731a9c1a init (#1262) 2019-10-31 15:47:58 +02:00
dic1911
36d5082fd7 allow reverse landscape (#1265) 
by setting android:screenOrientation value to userLandscape
 2019-10-31 15:46:16 +02:00
lishaoxia1985
05eb1b40ea update translation, thank deluxghost! (#1264) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* 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-10-31 13:49:42 +02:00
Yair Morgenstern
dbbfd13486 Music now downloads on another thread to not harm the user experience 
Removed unused "Username" string
 2019-10-31 09:40:50 +02:00
sveckarel
e44707f0e5 Update Czech translations (#1263) 
* Czech translations improvements

* Update czech transaltions
 2019-10-31 09:03:49 +02:00
Yair Morgenstern
9dee9f8256 Can now download background music for the game through the Options menu =D 2019-10-30 23:31:16 +02:00
lishaoxia1985
1f8db38ea2 update translation (#1258) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* 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-10-30 15:45:03 +02:00
Smashfanful
94061f045e Update NewGame,SaveGame,LoadGame,Options.json (#1259) 2019-10-30 15:44:22 +02:00
Smashfanful
c3a4f69f04 Update Other.json (#1261) 2019-10-30 15:43:58 +02:00
Smashfanful
e8a9a55491 Update Notifications.json (#1260) 2019-10-30 15:43:33 +02:00
sveckarel
d7d437cfc8 Cz translations - another fixes (#1255) 
* Czech translations improvements

* Czech translations - Bugfixing (#1249)

* Czech translations - Bugfixing

* typo

* typo
 2019-10-30 08:21:59 +02:00
StepanIvasyn
df4ca861c3 Update NewGame,SaveGame,LoadGame,Options.json (#1253) 
Add Ukrainian translation without messed others. Improved some sentences in Ukrainian.
 2019-10-29 15:30:35 +02:00
lishaoxia1985
8af6a5ffa6 update translation (#1247) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-29 06:20:27 +02:00
Yair Morgenstern
d3ccdc55d5 Updated Patreon image, unfortunately Patreon is not accepting it at the moment 2019-10-28 21:43:18 +02:00
Yair Morgenstern
f80b0ee777 Added link to Patreon 
Units upgrading to units with built-in promotions now get those promotions
 2019-10-28 21:24:04 +02:00
Yair Morgenstern
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
sveckarel
41971471f5 Czech translations - Bugfixing (#1249) 
* Czech translations - Bugfixing

* typo

* typo
 2019-10-28 19:15:16 +02:00
sveckarel
e0c0d18030 Czech translations - part 4 (Wonders quotes) 2019-10-28 06:41:28 +02:00
Yair Morgenstern
c77d570381 Added Customs House tiles 2019-10-27 22:15:20 +02:00
Smashfanful
9cf2b9e6eb Update Other.json 2019-10-27 20:27:44 +02:00
Smashfanful
5c08b8abf7 Update NewGame,SaveGame,LoadGame,Options.json 2019-10-27 20:26:53 +02:00
lishaoxia1985
e865055488 update translation (#1243) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-27 17:30:56 +02:00
Akito13
9c5331a704 Couple of German translations 
Part 1
 2019-10-27 15:35:42 +02:00
sveckarel
5abaff7905 Added next few czech words, fixed issue with Save game from last commit 2019-10-27 11:39:24 +02:00
sveckarel
c12ed1842c Translations improvements, fixed few czech words 2019-10-27 11:39:24 +02:00
Yair Morgenstern
8151476806 NativeFont has proved itself well enough - got rid of old WenQuanYiMicroHei font and corresponding setting 2019-10-26 20:54:32 +03:00
Yair Morgenstern
4d285e972d Can now translate [year] BC / [year] AD (#1240) 2019-10-26 20:27:01 +03:00
sveckarel
dd69a1250e code cleanup 2019-10-26 20:18:55 +03:00
sveckarel
388e848a90 Czech translations - Quotes (Techs.json) 2019-10-26 20:18:55 +03:00
sveckarel
39747cb6e3 Correction of Czech tranlations, adding missing keys 2019-10-26 20:17:03 +03:00
Smashfanful
9d61cdc4f1 Update Tutorials_Italian.json 2019-10-26 20:15:22 +03:00
Smashfanful
ae43b984b6 Update Other.json 
New translation lines
 2019-10-26 20:14:54 +03:00
Yair Morgenstern
891ea5584f Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen 2019-10-24 22:18:47 +03:00
Yair Morgenstern
7d1fd6e177 Added cache for character sets, improving time for Chinese and Korean game initialization 2019-10-24 21:50:49 +03:00
Yair Morgenstern
ef0c39ac93 More tile changes 2019-10-23 23:39:12 +03:00
lishaoxia1985
88da508b82 update translation (#1222) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-23 21:59:20 +03:00
sveckarel
e3e49e8229 Czech translations - part 3 (Tutorials) 2019-10-23 21:57:42 +03:00
VoyteeG
73544feffc Update Buildings.json 2019-10-23 21:57:01 +03:00
Yair Morgenstern
318dbb2a6d Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option 2019-10-23 21:56:23 +03:00
Smashfanful
da48de42e0 Update Other.json 2019-10-22 21:10:51 +03:00
Yair Morgenstern
777d1391f4 Changed options for "Show worked tiles" and "Show resources and improvements" because it was less clear than the other options 2019-10-22 19:41:22 +03:00
Yair Morgenstern
062d1d34ce Czeck -> Czech icon, obviously 2019-10-22 19:31:28 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty 
Also, changed existing units of Immortal or with Range promotion
 2019-10-22 19:25:58 +03:00
sveckarel
651e9359e9 Czech translations - part 2 (BasicHelp) 2019-10-22 16:52:40 +03:00
Yair Morgenstern
e6ecc53615 Progress bar should no longer appear after getting a tech in the middle of research for free 
Generalized unique fonts to fit Korean as well as Chinese
 2019-10-22 00:14:56 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change 
Fixed json errors
Added Korean and Czech flags
 2019-10-21 23:23:38 +03:00
sveckarel
3c40e0247f Czech translations - 1st part (Translations directory) (#1220) 2019-10-21 23:12:00 +03:00
lishaoxia1985
362c67e348 1. rename the unit "Immortal" and the Promotion "Range" 2. fix the korean translation, it lost a ("). (#1216) 
* update

* update

* update

* update

* update

* update

* update

* range extension
 2019-10-21 23:00:36 +03:00
Smashfanful
894ec1ee6f Update Buildings.json (#1211) 2019-10-18 16:40:50 +03:00
allrbsacp000
f0521ee92b Update NewGame,SaveGame,LoadGame,Options.json (#1209) 
Add Korean translation
 2019-10-18 16:40:28 +03:00
Yair Morgenstern
77f479e39b Added river toggles to map editor to see how it looks. Not good, btw - can't see rivers behind mountain/forest/hill tiles... 
Disabled for now, until we find a better way to display rivers.
 2019-10-18 16:39:23 +03:00
allrbsacp000
7aa55f8024 Update Terrains,Resources,Improvements.json (#1210) 
Add Korean translation
 2019-10-18 16:19:08 +03:00
Yair Morgenstern
96281db945 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-10-17 10:25:31 +03:00
Yair Morgenstern
4c3840e2ff Fixed problem in Italian tutorials which caused crash when entering Civilopedia when language was Italian 2019-10-17 00:15:44 +03:00
Yair Morgenstern
33805ca6f8 Organized TileGroup icons (for improvements, resources and units) into a separate class 2019-10-17 00:05:10 +03:00
Duan Tao
691a305e50 Duantao/settler food info (#1198) 
* Better info for building settler.

* Shorter message.

* Fix message.
 2019-10-16 18:16:27 +03:00
Smashfanful
00d0f27871 Update Diplomacy,Trade,Nations.json 2019-10-16 18:15:56 +03:00
Smashfanful
200931cfd6 Update Other.json 
Italian translations and corrections
 2019-10-16 18:15:44 +03:00
Smashfanful
f7f7d89992 Update NewGame,SaveGame,LoadGame,Options.json 2019-10-16 18:15:15 +03:00
Smashfanful
cd1fa9b79e Update Notifications.json 2019-10-16 18:14:55 +03:00
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
27dfae18de Can now choose Era when starting a new game! 2019-10-11 16:05:27 +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
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
Yair Morgenstern
222e4ad4b5 Tutorial fix 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 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
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
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
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +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
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +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
Yair Morgenstern
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +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
Yair Morgenstern
27b8cd5f1b AI now puppets cities by default - much better for long-term strategy, since puppeted cities are technically also controlled by AI controllers so... 2019-09-24 16:57:49 +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
Yair Morgenstern
91ac744692 Added "user id from clipboard" button in New Game screen 
Fixed other user id problems
 2019-09-03 23:22:27 +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
Yair Morgenstern
015b8343c7 Hoh boy so many changes to ensure the regular game works with multiplayer... 2019-08-30 14:46:52 +03:00
Yair Morgenstern
ef75593794 More PopupTable.close() uses 2019-08-28 13:30:49 +03:00
Yair Morgenstern
8015ca1e1e Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-08-25 23:27:38 +03:00
Yair Morgenstern
3a04fe75eb New "Load map" screen, with load from clipboard and delete map options 2019-08-25 23:26:50 +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
60257c6d64 Save and load game screens now hide autosaves by default 2019-08-25 17:01:28 +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
56b3f1c77a City founding tutorial no longer activates if the AI founded a city before you 2019-08-18 23:25:01 +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
Yair Morgenstern
9a4722b6b9 Readded city state select box 2019-08-15 20:41:28 +03:00
Yair Morgenstern
05d3aa9193 Each individual player is now specified when starting a new game 2019-08-12 00:30:29 +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
327eea7b13 Added display of Human / AI for othe civs 2019-08-08 19:44:05 +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
Yair Morgenstern
cbf1b8bb11 Players can now continue to view (but not change) game data when other players are playing their turns 2019-08-06 23:04:56 +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
2d24e62b0b Resolved #974 - city stats not summmed correctly 2019-07-28 22:50:22 +03:00
Yair Morgenstern
98eb4c8cd7 Travis test + minor fixes 2019-07-27 23:21:40 +03:00
Yair Morgenstern
b131372b13 Fixed "units from ruins block activating unit" bug and fixed colors for new city states 2019-07-27 22:34:57 +03:00
Yair Morgenstern
42e5f3b883 Fixed "huge stats in cities" bug 2019-07-26 15:06:21 +03:00
Smashfanful
99bce1de30 Update Nations_Italian.json 
Corrections
 2019-07-25 18:37:39 +03:00
Smashfanful
7a9594775f Update Nations_Italian.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:39 +03:00
Smashfanful
4589c52b21 Update Nations.json 
Corrections
 2019-07-25 18:37:20 +03:00
Smashfanful
bd3ebf688c Update Nations.json 
Added Almaty and Edimurgh
 2019-07-25 18:37:20 +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
Smashfanful
5bf7ca0762 Update Tutorials_Italian.json 
Italian Update for Tutorials
 2019-07-25 18:34:56 +03:00
Yair Morgenstern
994e313101 Added Game Speed option - part of #559 2019-07-24 18:35:06 +03:00
Yair Morgenstern
7d38841eb8 Added tutorial for 'Next unit' 2019-07-24 17:58:32 +03:00
Yair Morgenstern
2c10ce2fb5 Memory performance tweaks 
Renamed nation Main and Secondary to Outer and Inner colors, to be more clear what we're laking about
 2019-07-24 11:55:10 +03:00
Yair Morgenstern
858ae5be7c More and probably final memory performance modifications - we're down from ~400MB on peak of initial update() to about 200MB! 
Definitely sped things up along the way as well, not sure by how much though
 2019-07-24 00:37:12 +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
15f1648ca4 Resolved #937 - reveal all hidden tiles visible from every tile on unit movement path 
This also solves the problem of units "skipping over" barbarian encampments and ancient ruins when on the path
 2019-07-21 23:32:06 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +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
c7042dd5cf Resolved #948 - Seaport requires Harbor 2019-07-21 19:44:20 +03:00
Yair Morgenstern
99274ccda1 Resolved #949 - could construct Ironworks without Workshops 2019-07-21 19:41:17 +03:00
Yair Morgenstern
7d8e3f76c3 Destroyers now have a chance to intercept air attacks 2019-07-19 15:24:44 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +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
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +03:00
Yair Morgenstern
1ac3cfb74e Added icons for Lasers and Mobile Tactics 2019-07-17 22:03:57 +03:00
Yair Morgenstern
0ba243c5d8 Added Bomber unit 2019-07-17 21:33:33 +03:00
Yair Morgenstern
dd0cdac077 Fixed italian crash 2019-07-17 21:23:37 +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
8f30db74ab Added Radar tech and Fighter unit 2019-07-16 22:52:15 +03:00
Yair Morgenstern
b9a7f7e1d0 Added Great War Bomber 
Air units now require Oil
 2019-07-15 22:45:32 +03:00
Smashfanful
23c221abd3 Update Nations_Italian.json 2019-07-14 17:41:14 +03:00
Smashfanful
b43bd88f07 Update Nations.json 
Changed Oslo in Venice, changed Ur's colours, and added Sidon
 2019-07-14 17:36:20 +03:00
Yair Morgenstern
7bbd006180 Added BFS for arial movement 2019-07-13 22:48:47 +03:00
Smashfanful
367e1d8517 Update Nations.json 
Added Tyre, Ur, Brussels, Kabul, Oslo and Genoa (hopefully)
 2019-07-13 22:39:23 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +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
35edf4874f Update Nations_Italian.json 2019-07-11 21:14:53 +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
Duan Tao
a8e248b892 Add Militaristic type city-state. 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
d7cfdf3e83 Update Nations_Italian.json 2019-07-10 19:17:26 +03:00
Smashfanful
f4acd3005d Update Diplomacy,Trade,Nations.json 2019-07-10 19:16:29 +03:00
Yair Morgenstern
9ad7b976d5 Embarked units at sea which need to heal now go find land to heal on, and don't stay stuck in the same place 2019-07-08 19:29:12 +03:00
Yair Morgenstern
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units 
Air units are ranged units
Moving air units around now works completely!
 2019-07-05 14:27:39 +03:00
Yair Morgenstern
8d79cca70d Fixed Ottomans naval capture unique 2019-07-05 12:23:58 +03:00
Yair Morgenstern
32a45968aa Changed unit selection in cities, to accomodate air units in the future 2019-07-05 11:15:40 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Yair Morgenstern
833a5ed0db Added Air unit types 2019-07-03 18:42:28 +03:00
Am-per-Sand
abb8eb8987 add Helicopter icon 
please consider if it is optimal for small screens to call it _Helicopter Gunship_ with 2 words
 2019-07-03 18:36:06 +03:00
Am-per-Sand
aebbb6f505 added air icons set 
May be turns out handy one day.

Post your opinion below. However I promise to introduce corrections only after I will have seen them in game. Earlier it's hard to say if the images are crisp enough or not.

_Based on antique catalogue photos and public domain works by US military employees, so I release the to public domain too._

Zero chasing B-17:
![https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png](https://raw.githubusercontent.com/Am-per-Sand/saves/master/B%2017%20blue%20Zero%20red.png)
 2019-07-03 18:36:06 +03:00
Yair Morgenstern
e81844c053 AI focuses production of units on cities with high production, so the weaker ones can build infrastructure 
Organized ChooseNextConstruction automation
 2019-07-03 00:09:50 +03:00
Smashfanful
273b06aa3a Update Other.json 
Italian corrections.
 2019-07-02 12:15:48 +03:00
Yair Morgenstern
4d5f3a51e3 Domination-victory AI declare war on close civs even when having an advantage that isn't an absolute advantage, 
and declare war on civs that are situated far away if they are weak enough and there's no one close by
 2019-07-02 00:00:41 +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
Yair Morgenstern
8f0c3f1c02 Resolved #908 - added Science overview to overview screen 2019-06-27 12:01:08 +03:00
Smashfanful
06d1bd6881 Update Nations_Italian.json 2019-06-27 11:38:33 +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
c3efc10ea8 Fixed bug where gifts from AIs to city-states were interpreted as gifts from human player to city-states 2019-06-24 21:53:31 +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
469553de14 Update Nations.json 2019-06-24 12:35:04 +03:00
Smashfanful
78ad8a932a Update Nations_Italian.json 2019-06-24 08:11:24 +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
Yair Morgenstern
d9bd0fa6b8 Resolved #897 - split initial tutorial, which was too long, into several parts 2019-06-24 06:37:45 +03:00
Yair Morgenstern
c0f569c826 Bugfix - AIs no longer try to gain influence wth city-states they haven't met yet 2019-06-23 22:44:04 +03:00
Smashfanful
18d7446fab Update Diplomacy,Trade,Nations.json 
Added Leader names
 2019-06-23 08:56:40 +03:00
Smashfanful
bc26edfe81 Update Other.json 
Added new translation lines
 2019-06-23 08:56:17 +03:00
Smashfanful
d0dc3e4bd6 Update Nations_Italian.json 2019-06-22 23:23:42 +03:00
Smashfanful
418bc140e8 Update Units.json 
I f**king messed up Ballista. HOORRAAY!
 2019-06-21 13:47:03 +03:00
Smashfanful
af295f4fab Update Units.json 
Added Composite Bowman
 2019-06-21 13:20:39 +03:00
Smashfanful
beedcc5896 Update Buildings.json 
Corrections and additions
 2019-06-20 20:44:30 +03:00
Yair Morgenstern
a1e1b91b9a Added Civ icon to cities 
Improved City Connection icon
 2019-06-19 20:13:32 +03:00
Yair Morgenstern
a6d1cdc398 Unified civ display in Overview and Victory screens 2019-06-19 19:20:25 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Yair Morgenstern
b0e43ace59 Resolved #885 - units disbanding on your tiles yields gold even when not on city center 2019-06-19 17:40:52 +03:00
Smashfanful
d39e57bf46 Update Units,Promotions.json 
Added Landsknecht
 2019-06-19 10:40:07 +03:00
Smashfanful
353d6a6557 Update Notifications.json 2019-06-17 20:41:51 +03:00
Smashfanful
9c0995ad5a Update Nations_Italian.json 2019-06-17 20:41:07 +03:00
Smashfanful
a18616a25b Update Diplomacy,Trade,Nations.json 2019-06-17 20:40:31 +03:00
Yair Morgenstern
b2afc838a6 Resolved #533 - Added nation-dependant start location biases 2019-06-17 12:51:57 +03:00
Yair Morgenstern
853a325876 Added German nation - #703 2019-06-17 11:20:15 +03:00
Smashfanful
eb711b9a79 Update Diplomacy,Trade,Nations.json 
Added new translation lines
 2019-06-16 20:40:34 +03:00
Smashfanful
be7baaa117 Update NewGame,SaveGame,LoadGame.json 2019-06-16 18:42:54 +03:00
Smashfanful
0726e7799d Update Notifications.json 
New Translation lines
 2019-06-16 18:42:32 +03:00
david.enrique
56ff436f94 Add victory type choice on new game screen 2019-06-15 22:38:02 +03:00
Yair Morgenstern
120ae8b253 Resources sorted and no bonus resources in Resource Overview 2019-06-15 22:30:07 +03:00
Smashfanful
f50e9c186d Update Other.json 2019-06-15 22:28:16 +03:00
Yair Morgenstern
5943d1e12e Apollo Program is now a NATIONAL wonder, so multiple civs can compete for Science Victory 2019-06-13 22:10:52 +03:00
Yair Morgenstern
d49b33f0c7 Resolved #872 - Added Immersive mode, for users whose navigation bar is a virtual, not physical one 2019-06-13 17:28:23 +03:00
Smashfanful
5ddd4c7d7b Update Nations.json 
Added Siamese (in comments)
 2019-06-13 15:23:56 +03:00
Smashfanful
6d82e42e1c Update Nations_Italian.json (#869) 
* Update Nations_Italian.json

Corrections

* Update Nations_Italian.json

* Update Nations_Italian.json
 2019-06-13 15:23:31 +03:00
Yair Morgenstern
00153ab456 Culture-oriented AI much more predisposed to peace agreements 2019-06-13 14:38:31 +03:00
Yair Morgenstern
b7be0e7934 Each Civ now has a preferred victory type, and makes construction choices based on said type 2019-06-12 22:01:37 +03:00
Yair Morgenstern
89020c8916 Removed ThorfMaps tiles - were much uglier than the other 2 tilessets and unneccesary 2019-06-12 22:00:35 +03:00
Yair Morgenstern
3e770db86d Can now add and remove improvements in the map editor! 2019-06-10 18:36:25 +03:00
Smashfanful
772a825cfa
Update Diplomacy,Trade,Nations.json 2019-06-10 16:02:53 +02:00
Yair Morgenstern
d5a0894f75 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:18:59 +03:00
Smashfanful
477a4c4dc4 Update Other.json 
Added some Italian translations
 2019-06-09 22:37:22 +03:00
denrique88
0803063017 Correction of french translation of the tutorial 2019-06-09 22:29:43 +03:00
Yair Morgenstern
dd80530a93 Version push to discord test 2019-06-07 15:57:09 +03:00
Yair Morgenstern
84bcfe2d39 Added "Community" tab in the menu, with links to the Github and Discord 2019-06-07 15:55:48 +03:00
Smashfanful
8e9fc1108e Update Diplomacy,Trade,Nations.json 
New Italian translations
 2019-06-07 14:32:56 +03:00
Smashfanful
5451eb0540 Update Nations_Italian.json 
Corrections. That must be the cause for the crashes in the Italian version.
 2019-06-07 14:32:21 +03:00
Yair Morgenstern
f713d266db Implemented "Don't settle cities near us", which goes both ways - a good basis for further demands (#831) 2019-06-07 13:04:18 +03:00
Yair Morgenstern
e8bdb8a2e4 Added initial logic for promising not to settle cities near other civs - not yet activated 2019-06-05 23:21:17 +03:00
Yair Morgenstern
ab450808b2 Can no longer pass the turn when popups have not been dealt with 2019-06-05 23:18:03 +03:00
Smashfanful
0153added5 Update Nations.json 2019-06-04 18:04:11 +03:00
Smashfanful
a039c6592b Update Nations.json 
Corrections and addition of Greek unique
 2019-06-04 18:04:11 +03:00
Smashfanful
3e22cdf72d Update Nations_Italian.json 2019-06-04 18:03:34 +03:00
Smashfanful
0cedc1a5e8 Update Nations_Italian.json 
Added Greek Unique
 2019-06-04 18:03:34 +03:00
Smashfanful
9bfa71898a Update Units.json 2019-06-04 12:34:28 +03:00
Smashfanful
d8d5274c9e Update Units,Promotions.json 2019-06-04 12:33:52 +03:00
Yann
f0293b5f2a Update French Translation for Diplomacy,Trade,... 2019-06-04 12:33:05 +03:00
Smashfanful
5dcaaab0d1 Update Italian Translation Other 
Added a missing Italian translation
 2019-06-04 12:32:37 +03:00
Yann
e7bd6fb0b3 Update French Translation of NewGame,SaveGame,... 2019-06-04 12:32:04 +03:00
Yann
9b7baa6a9e Update French Translation on Notification 2019-06-04 12:31:37 +03:00
Yann
493d21ff54 Update French Translation of Buildings 2019-06-04 12:31:03 +03:00
Yann
6f0016134d Update French Translation of Units.Promotions 2019-06-04 11:13:32 +03:00
Yann
1b5960477c Update French Translation of Other 2019-06-04 11:13:04 +03:00
Yair Morgenstern
527288b886 Fixed crash in new diplomatic relations and unified DiplomacyManager.getModifier() 2019-06-03 22:06:35 +03:00
Yair Morgenstern
cf37122304 Translation organization 2019-06-02 23:31:16 +03:00
Yair Morgenstern
5941c39d64 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-06-02 19:48:37 +03:00
Yair Morgenstern
0916720f86 Cannot declare friendship after denounce and vice versa 2019-06-02 19:47:49 +03:00
Smashfanful
28eb9e61d4 Update Nations.json 
Added some correction proposings
 2019-06-02 19:43:40 +03:00
Smashfanful
40831ca17d Update Nations_Italian.json 
Added Mongols and corrected some lines
 2019-06-02 19:43:12 +03:00
Smashfanful
7803d3ebdf Update Nations.json 
Added two propositions for City-States
 2019-06-02 17:25:57 +03:00
Smashfanful
ca9b39a4c6 Update Nations_Italian.json 2019-06-02 17:25:23 +03:00
Smashfanful
8fc4ed6491 Update Notifications.json 2019-06-02 17:25:06 +03:00
Yair Morgenstern
36da3359db Added denunceation 2019-06-01 23:20:02 +03:00
Yair Morgenstern
f60ebbb7e1 Civs clearing an encampment now get gold 2019-06-01 22:47:41 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Yair Morgenstern
b068e6f88f Minor translation changes 2019-05-30 19:57:27 +03:00
Yair Morgenstern
b9cf40487f Performance improvements for Next Turn 2019-05-29 22:10:32 +03:00
Smashfanful
85c86e0b02 Update Buildings.json 
Added some unique units and corrected some Italian lines
 2019-05-29 17:31:32 +03:00
Yair Morgenstern
3fbcc019e3 There were somes things that were in the translations files but weren't translated in-game 2019-05-28 23:43:18 +03:00
Yair Morgenstern
b6512535fb Fixed bug in GetProductionCost that was probably caused by the construction changing while the city button was rendering 2019-05-28 23:09:47 +03:00
Smashfanful
8f81fd0c3d Update Tutorials_Italian.json 2019-05-28 22:54:43 +03:00
Am-per-Sand
8b15535eb7 War Chariot icon retouched 
hope it doesn't break commit history, or...
 2019-05-28 22:54:24 +03:00
Smashfanful
a285a8031c Update Other.json 2019-05-28 16:58:25 +03:00
Smashfanful
b190524ae3 Update Notifications.json 2019-05-28 16:57:11 +03:00
Smashfanful
db99683090 Update Nations.json 
Corrections
 2019-05-28 16:56:47 +03:00
Smashfanful
a2efab3378 Update Nations_Italian.json 
Added City-States
 2019-05-28 16:56:18 +03:00
Smashfanful
c01acee372 Update Units,Promotions.json 
Added Indian unique unit
 2019-05-27 17:11:52 +03:00
Smashfanful
034b3dfa5e Update Buildings.json 
Added Indian unique building
 2019-05-27 17:11:27 +03:00
Smashfanful
147779b0e8 Update Other.json (#807) 
Italian translations to City-States
 2019-05-27 17:10:54 +03:00
Yair Morgenstern
a204333410 Added countdown to relationship change with city states 2019-05-26 18:52:32 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
408dfcfc7e Final touches to City States, and they're ready to roll! 2019-05-26 16:10:09 +03:00
Smashfanful
e4125e52c0 Update Nations_Italian.json 
Added Indian intro phrases
 2019-05-26 15:32:37 +03:00
Yair Morgenstern
e70e052515 Resolved #804 - bigger Diplomacy and Next Turn buttons for easier click 2019-05-26 15:07:15 +03:00
Yair Morgenstern
9352243eb4 Fixed switching unit selection bug - #804 2019-05-26 14:46:45 +03:00
Smashfanful
a67fc9d55d Update Other.json 2019-05-25 23:14:18 +03:00
Smashfanful
89854ec195 Update Nations_Italian.json 2019-05-25 23:13:46 +03:00
Yair Morgenstern
25fc1b3c71 Last fixes for Indian nation! 
Checks for specific buildings now work for all civ-unique buildings as well
 2019-05-24 13:59:00 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Yair Morgenstern
81fcc31f2a Gradle update 2019-05-23 22:08:38 +03:00
Amper-sandd
af19d8a1b0 add Indian assets (#800) 
* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
 2019-05-23 21:50:46 +03:00
Smashfanful
f988279f1d Update Other.json 
Another Italian translation
 2019-05-23 16:27:06 +03:00
Smashfanful
fcdb609b0e Update Notifications.json 
Italian Translations
 2019-05-23 16:26:11 +03:00
martin
6bd06474bd improved overview city screen 
- dynamic layout
- cities and units sorted by name
- jump-to buttons for cities
- rounded values in statistics
 2019-05-23 16:25:47 +03:00
martin
d676c18aec adding MapUnitAction.name(), a user-readable name for actions. Eg "Moving" instead of "moveTo x,y" 2019-05-23 07:57:34 +03:00
martin
98803f0454 implementing BuildLongRoadAction 2019-05-22 22:23:03 +03:00
Yair Morgenstern
c83844f600 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-05-22 22:08:14 +03:00
Smashfanful
798adad4a9 Update Other.json 
More Italian translations.
 2019-05-22 22:07:59 +03:00
Yair Morgenstern
ea9c9da48d Added missing notification translations (#792) 2019-05-22 22:07:50 +03:00
Smashfanful
eefdb997b5 Update Notifications.json 
Italian corrections.
You also forgot to write:
"Enemy city has damaged unit"
"Enemy city has destroyed unit"
"A faraway land has built Wonder"
 2019-05-22 22:01:27 +03:00
martin
c8c3370cb9 show "rough terrain" property in Civilopedia 2019-05-22 21:57:14 +03:00
Yair Morgenstern
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +03:00
Yair Morgenstern
f46baec89f Resolved #770 - City-states now colored as per original civ, with black primary color 2019-05-20 22:03:43 +03:00
sulai
f905fa8068 Single tap pickers for improvements and promotion (#765) 
* single tap picker (improvements, policies and promotions), tbd: split button

* improvement and promotion pickers: using split buttons featuring a question mark. allows single-tap choice.

* improvement picker and promotion picker: show "pick now" to the right of the button
 2019-05-20 20:38:50 +03:00
sulai
fdf95317f0 units support single-tap move (#750) 
* implemented single tap move
- units stay selected after move (to go on moving)
- and they are de-selectable by taping them again (to abort moving)

* unit movement: mark the reachable spots clearly to avoid accidental movement

* unit action: when an exclusive decision is made, deselect unit

* clicking on the unit information in the UnitTable will show that unit + minor fixes

* siege units won't show movement hints when set up, while packing up does not cost any movement points

* workers: highlight button when constructing an improvement, won't sleep then

* fixed units not being de-selected when clicking the UnitTable or "next unit" button

* zooming forwards clicks on to the map, so we need to deselect units in that case

* clean up branch

* added "Move units with a single tap" to options menu
 2019-05-20 20:08:59 +03:00
Smashfanful
d07e406510 Update Other.json 
You forgot a phrase.
 2019-05-20 19:49:57 +03:00
Yair Morgenstern
a54f68528f Resolved #782 - Wonders are no longer built twice under "race conditions" 2019-05-20 19:48:18 +03:00
Smashfanful
22c45af5d8 Update Nations_Italian.json 2019-05-20 16:18:24 +03:00
Yair Morgenstern
00ef4d171c Removed portuguese misspelling 2019-05-19 22:04:56 +03:00
Smashfanful
b24d21331e Update Other.json (#773) 
Another Italian translation
 2019-05-19 17:02:25 +03:00
Yair Morgenstern
85e0f892d5 Fixes for 700caf3 2019-05-19 07:32:13 +03:00
luanrodriguesmoura
700caf3714 Portuguese translations added 
if you are going to credit someone give credit my old acount (luanrmoura55 if my memory serves me right)... like just... please.
 2019-05-19 07:06:36 +03:00
Brian Gainor
cd77074045 Fix typos in Nations.json 2019-05-18 23:20:19 +03:00
Yair Morgenstern
054b3b000d Resolved #752 - Added big friendship penalty for betraying declaration of friendship 2019-05-17 15:00:24 +03:00
Yair Morgenstern
2e16a96c4d Can no longer gift city states with gold you don't have 2019-05-16 22:08:45 +03:00
Smashfanful
1f498f3fa6 Update Other.json 
Added Italian translations
 2019-05-16 19:45:38 +03:00
Smashfanful
f6a26aaee3 Update Notifications.json 
Added Italian translations.
 2019-05-16 19:44:02 +03:00
sulai
9ce7959d32 more ui improvements (#757) 
* unit action: when an exclusive decision is made, deselect unit

* clicking on the unit information in the UnitTable will show that unit + minor fixes

* siege units won't show movement hints when set up, while packing up does not cost any movement points

* workers: highlight button when constructing an improvement, won't sleep then

* fixed broken saved game

* show messages if exploring is done or WorkerAutomation is done

* Revert "siege units won't show movement hints when set up, while packing up does not cost any movement points"

This reverts commit b805993a
 2019-05-16 17:54:58 +03:00
Smashfanful
85b7607d58 Update Other.json 
Another Italian line fixed
 2019-05-15 16:37:53 +03:00
Smashfanful
6c7edd60ac Update Notifications.json 2019-05-15 14:19:02 +03:00
Smashfanful
ced4840e8e Update Buildings.json 2019-05-15 14:18:49 +03:00
Smashfanful
be911d8903 Update Other.json 
Improved Translations
 2019-05-15 14:18:31 +03:00
Smashfanful
cc2c9c3487 Update Nations_Italian.json 2019-05-15 14:18:17 +03:00
lishaoxia1985
17a856c0a5 Update Other.json 2019-05-15 14:17:58 +03:00
lishaoxia1985
1bc40b01b4 Update Notifications.json 2019-05-15 14:17:58 +03:00
lishaoxia1985
7b34277a7e Update Other.json 2019-05-15 14:17:58 +03:00
martin
157e6e81a8 don't flood the player with similar messages about spotted enemies. instead cycle through units by clicking the message multiple times. 2019-05-14 17:07:01 +03:00
Yair Morgenstern
48af218795 Strategic resources cost more in trade from a civ who's at war and can use them for units 2019-05-13 22:23:30 +03:00
Smashfanful
5463e36cca Update Other.json 
Improved Italian translations
 2019-05-13 18:04:08 +03:00
Smashfanful
e348687bce Update Policies.json 2019-05-13 18:03:37 +03:00
Smashfanful
e9700937f7 Update Units,Promotions.json 
Improved Italian translation.
 2019-05-13 18:01:47 +03:00
martin
eaa0a9dbad when a unit is selected, use the ? button to read about it in the Civilopedia 2019-05-13 17:17:27 +03:00
Yair Morgenstern
a9a1962cec Continuation of #738 - readability, and solves case where 2 civs have unique buildings to the same base building (say Royal Library and Paper Maker) 
#729 - AddCultureBuilding now adds civ-specific building (e.g. Burial Tomb), not just checks to see if it's built
 2019-05-12 22:24:11 +03:00
Yair Morgenstern
24a71b16f2 Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation 2019-05-11 23:32:12 +03:00
lishaoxia1985
20d05aa8e0 all chinese font will show well (#739) 
* update some diplomacy words in chinese

* all chinese font can be show well

* Update Fonts.kt

* update chinese language
 2019-05-11 22:20:41 +03:00
Yann
7c146f4aea Update French Version + mark duplicated & translation that didn't work (#728) 
* Update French Version + mark duplicated & translation that didn't work

duplication mark : //duplicated
translation mark : //Don't translate in diplomacy view 
or //You misses this translation, said Smashfanful

* Update Other.json
 2019-05-11 22:16:16 +03:00
Yann
52a676f5cb Add French Tutorial 2019-05-10 18:20:54 +03:00
lishaoxia1985
656246cd10 all chinese font can be show well 2019-05-10 18:20:27 +03:00
lishaoxia1985
93bf8333ca update some diplomacy words in chinese 2019-05-10 18:20:27 +03:00
lishaoxia1985
c37983667c move some words into other translation files,the city name can be changed with setting 
although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
 2019-05-09 23:16:47 +03:00
Duan Tao
c221d50e01 Add 2 more type of city-states. 2019-05-09 18:54:43 +03:00
Smashfanful
7db1298ded Update Other.json 2019-05-08 22:01:01 +03:00
Smashfanful
d0c9f57fc9 Update Other.json 
Updated Italian translations.
 2019-05-08 22:01:01 +03:00
Yair Morgenstern
b3a4ed4c4f Declaration of Friendship is go! 
I'm sure there's stuff I've forgotten but there is just so much that happens in diplomacy that is dependant on these declarations
 2019-05-08 18:48:36 +03:00
Yair Morgenstern
75bdced3c6 Added Declaration of Friendship logic 
@ninjatao - I changed your BorderConflict into a DiplomacyFlag, and so all the logic of "removing every turn and deleting if 0" is built-in =)
 2019-05-08 17:24:56 +03:00
Smashfanful
3106127dc4 Update Units,Promotions.json 
Italian translation for Instant Cure and its effects
 2019-05-08 16:40:11 +03:00
Yair Morgenstern
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00
Duan Tao
1434ca3f30 Update city-state related icons and popups. 2019-05-08 13:32:23 +03:00
Yair Morgenstern
9ab02c8d22 Organized json files, split translation file into several smaller files for organizational purposes 2019-05-07 21:59:34 +03:00
Am-per-Sand
65ed67af61 reduce German unique text in Nations.json 2019-05-07 19:58:53 +03:00
Yair Morgenstern
078e19933e
Merge pull request #708 from Smashfanful/patch-103 
Update Translations.json
 2019-05-07 17:25:01 +03:00
Smashfanful
50fdc5c64f Update Buildings.json 
Added Siamese, Persian, Songhai, Indian and Irochese unique buildings.
 2019-05-07 13:47:04 +03:00
Smashfanful
c45f1aabc9 Update Units.json 
Added Siamese and Mongolian unique units, and removed all G&K and BNW units
 2019-05-07 13:46:39 +03:00
Smashfanful
9696c5441d
Merge branch 'master' into patch-103 2019-05-07 11:43:20 +02:00
Yann
5b2ec86b4d Update French version + duplication + reorganisation 
I commented some duplication and reorganised some part of the file, but it's begin to be too big too make it clear
 2019-05-07 12:30:13 +03:00
lishaoxia1985
fcb22f4a0e Diaploma in chinese makes well with language settings (#713) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* chinese language update

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update BaseUnit.kt

* delete some word with "Nations.json"

* diplomacy in Chinese makes well  with the language setting
 2019-05-07 10:30:11 +03:00
lishaoxia1985
79daad778f update some chinese language (#712) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* chinese language update

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update BaseUnit.kt

* delete some word with "Nations.json"
 2019-05-07 08:40:36 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Yair Morgenstern
cf2580b8ed Solved #670 - civ starting locations are given as much space as possible 2019-05-06 20:46:48 +03:00
Am-per-Sand
024bad9b5a added Hanse building icon 
silhouette from own photo of [Artus Court](https://en.wikipedia.org/wiki/Artus_Court)
 2019-05-06 20:09:23 +03:00
Am-per-Sand
a0c90423cd added Hanse 2019-05-06 20:09:23 +03:00
Am-per-Sand
148d55c4db added unit icons for German uniques 2019-05-06 20:09:23 +03:00
Am-per-Sand
4cd6e95278 add Landsknecht properties 2019-05-06 19:10:02 +03:00
Yann
a75d6f0c7b Update French version 
You should look the file, sometimes there is repeated translations
 2019-05-06 17:13:06 +03:00
Smashfanful
6c725acacb
Update Translations.json 
Added more Italian translations
 2019-05-06 12:08:41 +02:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
lishaoxia1985
3318f26a33 CivilopediaScreen language can be changed with setting (#706) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting
 2019-05-05 22:51:26 +03:00
Smashfanful
187fc026aa Update Translations.json 
Added Italian translations
 2019-05-05 18:27:33 +03:00
Smashfanful
ea06de76a0 Update Nations.json 2019-05-05 18:03:41 +03:00
Duan Tao
fc4f62f555 City state icon. 2019-05-05 16:20:23 +03:00
Yair Morgenstern
d8fd48b4ce Workers can now remove Roads and Railroads 2019-05-04 21:55:31 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
lishaoxia1985
fabb4e922a nations in Chinese (#696) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt
 2019-05-04 21:17:18 +03:00
Yair Morgenstern
6c7a0f9f4e Applied a6c2098 in translations 2019-05-03 17:12:42 +03:00
Am-per-Sand
a6c20984f2 Citizenship and Legalism description changed. 
Unclear description fixed. I have almost created a pull request for `CityStats.kt`: 
```
if (policies.contains("Citizenship")  && currentConstruction.name == "Worker")
stats.production += 25f
```
as I thought it should boost training of Workers.

I also attach #423 contents of  with a similar unclarity of Legalism.
 2019-05-03 17:06:53 +03:00
Yair Morgenstern
cdfdbb40b8 More massive performance boosts 2019-05-03 16:59:46 +03:00
Yair Morgenstern
827d24c778 Resolved #694, and another crashing bug 2019-05-02 23:06:34 +03:00
Smashfanful
628463cc54 Update Translations.json 
New Italian Translations
 2019-05-02 13:21:41 +03:00
Yair Morgenstern
e8f27c4ef4 Diplomacy is ready to be unleashed upon the unsuspecting public! 2019-05-02 00:11:32 +03:00
Duan Tao
f2333b5839 Added City states (#681) 
* Add Milan as 1st city state. Choose box for number of city states.

* City states don't get settlers.

* Added diplomancy relationship. Now increase by gift and decreases every turn.

* Friendly culture city states provides culture bonus.

* 0 city states by default.

* Disable many trade items for city states.

* Fix part 1.

* Fix diplomacy screen and pop-ups.

* City state doesn't build world wonders.

* City states destroy city when conquering.

* Fixed : Trying to move into border of uncountered civs caused crash.

* City states don't exchange tech or declare war on others.

* Fix a very strange problem : you could trade introduction of AI to itself.

* City states automatically get all invented techs.

* Pops defeat msg before AI founds any city.

* Fix conquest victory with city states.

* Fixed : AI city under seige change production every turn.
 2019-04-30 19:33:32 +03:00
Yair Morgenstern
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
lishaoxia1985
c8ea9f1a27 change chinese font to "WenQuanYiMicroHei" (#691) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json
 2019-04-28 08:14:35 +03:00
Yair Morgenstern
292297e02d Resolved #685 - loading game would clear resistance counters 2019-04-27 23:36:35 +03:00
Smashfanful
fce52ec787 Update Nations_Italian.json 2019-04-27 21:10:21 +03:00
lishaoxia1985
7eb8c03d24 Basic Help in Chinese and Some Updates (#683) 
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json
 2019-04-27 21:09:53 +03:00
Yair Morgenstern
931f485a8e Kotlin'D Counter class, apparently it's been Java this whole time and I didn't even notice 2019-04-25 10:28:46 +03:00
Yair Morgenstern
aea2e3efcf AIs no longer exchange techs below Prince difficulty 2019-04-24 22:13:37 +03:00
Yair Morgenstern
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
Yair Morgenstern
c3a00a0f5e All trades are now cancelled when a civ is defeated 2019-04-24 20:48:32 +03:00
Yair Morgenstern
8a600ea07d Moved hasOpenBorders to a transient bool for "next turn" performance reasons 2019-04-24 11:58:03 +03:00
Yair Morgenstern
07a8b97ed2 Open Borders is now only available with Civil Service, as per Civ V 2019-04-24 11:31:50 +03:00
Yair Morgenstern
5d8d7ca89b AI can now offer you trades - this is a big step towards proper diplomacy relations! 
As of now they only offer luxury-to-luxury trades
 2019-04-23 17:07:01 +03:00
lishaoxia1985
046fe1088f Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
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
Am-per-Sand
c19be603f2 new Cossack icon 2019-04-22 12:33:23 +02: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
Yair Morgenstern
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03: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
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08: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
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +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
Am-per-Sand
b00b432bb3 War Chariot 
100x100 white on grey transparent
 2019-04-11 20:19:24 +02: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
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03: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
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
86ed7c2ec3
Merge pull request #632 from Am-per-Sand/master 
Machu Picchu deresoluted
 2019-04-08 08:51:56 +03:00
Am-per-Sand
28a63d8170
Machu Picchu deresoluted 
Enlarged building to be more distinct on large screens in small scale
 2019-04-07 22:32:28 +02:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +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
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +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
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +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
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Smashfanful
0ff3d7a5fd
Update Nations_Italian.json 2019-03-24 15:41:47 +01:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
Yair Morgenstern
9b7a796a03
Merge pull request #597 from Am-per-Sand/master 
Frigate <-> Caravel icons swap
 2019-03-22 00:59:12 +02:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png 2019-03-21 15:19:17 +01:00
Am-per-Sand
c6ca334271
Delete Caravel.png 2019-03-21 15:19:07 +01:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu" 
Changed info in saved games to fit the change
 2019-03-21 12:53:41 +02: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
Yair Morgenstern
06c4ea25b6
Merge pull request #591 from Smashfanful/patch-76 
Update Translations.json
 2019-03-20 22:40:23 +02:00
Am-per-Sand
d16322d494
Delete Machu Pichu.png 2019-03-20 18:54:40 +01:00
Am-per-Sand
f83eed0d08
new wonder icon 
Machu Picchu correct
 2019-03-20 18:54:07 +01: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
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog 
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
 2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Yair Morgenstern
9d5c6911fd Added a tileset for Thorm maps - beutiful stuff but doesn't zoom in well, hope I'll be able to find a more HQ version of this type 2019-03-19 23:13:46 +02: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
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02: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
10d098b9de 2.13.14 2019-03-14 22:29:25 +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
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02: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
Yair Morgenstern
51747e4fd2
Merge pull request #540 from Smashfanful/patch-57 
Update Units.json
 2019-03-09 22:09:45 +02:00
Yair Morgenstern
8e74797a44
Merge pull request #539 from Smashfanful/patch-56 
Update Nations.json
 2019-03-09 22:08:14 +02:00
Smashfanful
01d24e6363
Update Nations.json 
Added Starting Bias, Ability names and Adjectives.
 2019-03-09 14:58:55 +01:00
Smashfanful
8067147266
Update Units.json 
Added much more units.
 2019-03-08 19:08:02 +01:00
Smashfanful
0ccde1896a
Update Nations.json 2019-03-08 19:05:08 +01:00
Smashfanful
a008b4521c
Update Translations.json 2019-03-08 18:09:55 +01:00
Yair Morgenstern
40e2bb9323 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-08 15:44:27 +02:00
Yair Morgenstern
9d37c551e3 Add translation items for selling buildings 2019-03-08 15:44:11 +02:00
Smashfanful
3026a500d2
Update Translations.json 
There are various non-Italian translation that are made with Google Translator, so they may be vague. Feel free to correct them.
 2019-03-08 12:55:17 +01:00
Yair Morgenstern
2ec8225c20 Resolved #384 - can now sell one building per city per turn 2019-03-08 13:45:12 +02:00
Yair Morgenstern
adea36fb81 Commented out snow - we don't want it appearing in patches until we have better map generation 2019-03-08 10:15:10 +02:00
Yair Morgenstern
7b6d37053b
Merge pull request #528 from Smashfanful/patch-49 
Update Nations_Italian.json
 2019-03-07 23:09:04 +02:00
Yair Morgenstern
6f46750c15
Merge pull request #532 from Smashfanful/patch-53 
Update Translations.json
 2019-03-07 19:15:04 +02:00
Yair Morgenstern
8fff034221
Merge pull request #531 from Smashfanful/patch-52 
Update Buildings.json
 2019-03-07 19:14:33 +02:00
Yair Morgenstern
15cb18ca26
Merge pull request #530 from Smashfanful/patch-51 
Update Units.json
 2019-03-07 19:14:17 +02:00
Yair Morgenstern
bc2a4882c5
Merge pull request #519 from Smashfanful/patch-46 
Update Terrains.json
 2019-03-07 19:09:06 +02:00
Smashfanful
7713170d97
Update Translations.json 2019-03-07 17:32:28 +01:00
Smashfanful
c93ee1e1f2
Update Buildings.json 
Added Walls of Babylon. Should I also add Forum for Rome, Obelisk for Egypt and Shale Plant for Japan (all from CIV4)?
 2019-03-07 17:28:46 +01:00
Smashfanful
873d4f1cff
Update Units.json 
Added War Chariots for Egypt, Chu-Ko-Nu for China, Cossack for Russia, Ship of the Line for England, and Legion for Rome. Legion should also build roads. Some suggestion to updates for Legion, Samurai and Camel Archer.
 2019-03-07 17:18:30 +01:00
Smashfanful
c34249a66e
Update Nations_Italian.json 
Corrections.
 2019-03-07 15:54:32 +01:00
Duan Tao
0c6826fd9b Fix json error. 2019-03-07 14:01:57 +08:00
Yair Morgenstern
4dcf2cacc4
Merge pull request #521 from Smashfanful/patch-48 
Update Translations.json
 2019-03-06 20:37:07 +02:00
Smashfanful
aab1ebb47d
Update Translations.json 2019-03-06 18:51:06 +01:00
Smashfanful
42d043a8ad
Update TileResources.json 
Added Copper, Bison, Citrus, Crab, Truffles and Cocoa
 2019-03-06 16:33:23 +01:00
Smashfanful
da2a95512e
Update Terrains.json 
Added Snow, and updated Desert and Tundra.
 2019-03-06 15:45:51 +01:00
Yair Morgenstern
10508792db
Merge pull request #517 from Smashfanful/patch-44 
Update Nations_Italian.json
 2019-03-06 15:45:38 +02:00
Smashfanful
ae6189164e
Update Nations.json 2019-03-06 14:27:50 +01:00
Smashfanful
249b9fe57d
Update Nations_Italian.json 2019-03-06 14:27:44 +01:00
Yair Morgenstern
b059ee36db
Merge pull request #516 from Smashfanful/patch-43 
Update Tutorials_Italian.json
 2019-03-06 14:15:38 +02:00
Yair Morgenstern
d305508e7a
Merge pull request #513 from Smashfanful/patch-41 
Update Translations.json
 2019-03-06 14:15:28 +02:00
Smashfanful
be7f96d10c
Update Tutorials_Italian.json 2019-03-06 12:26:53 +01:00
Smashfanful
b959b4f190
Update BasicHelp_Italian.json 
Misses a translation here
 2019-03-06 12:21:50 +01:00
Smashfanful
b1cb0e7131
Update Translations.json 2019-03-06 12:13:54 +01:00
Yair Morgenstern
7357707010 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-05 22:19:20 +02:00
Yair Morgenstern
afaf4ae6da Resolved #508 - Missing and bad translations 2019-03-05 22:18:57 +02:00
Yair Morgenstern
626250a2d9
Merge pull request #509 from Smashfanful/patch-39 
Update Nations_Italian.json
 2019-03-05 22:05:16 +02:00
Yair Morgenstern
9a4211a7dd
Merge pull request #510 from Smashfanful/patch-38 
Update Nations.json
 2019-03-05 22:04:42 +02:00
Yair Morgenstern
f708954940
Merge pull request #503 from Smashfanful/patch-34 
Update Nations.json
 2019-03-05 22:04:24 +02:00
Smashfanful
49b4ec0880
Update Nations_Italian.json 2019-03-05 15:38:31 +01:00
Smashfanful
66625a5e54
Update Nations.json 2019-03-05 15:38:25 +01:00
Smashfanful
bcefae56a5
Update Translations.json 
Added Japanese for some lines.
 2019-03-05 12:08:39 +01:00
Yair Morgenstern
0065afa8f4
Merge pull request #505 from Smashfanful/patch-36 
Update Nations_Italian.json
 2019-03-04 22:14:56 +02:00
Yair Morgenstern
efe677d27c Added Civilopedia texts to translation file 2019-03-04 21:32:18 +02:00
Smashfanful
a8daf29621
Update Nations_Italian.json 2019-03-04 20:11:07 +01:00
Smashfanful
49f46d44d4
Update Nations.json 2019-03-04 17:11:22 +01:00
Smashfanful
6c3457f05e
Update Nations_Italian.json 2019-03-04 12:52:33 +01:00
Yair Morgenstern
0ef11e12cd Resolved #491 - Once Honor has been adopted, gain Culture when you kill a barbarian unit 2019-03-03 23:05:12 +02:00
Yair Morgenstern
c4e686f514
Merge pull request #496 from Smashfanful/patch-29 
Update BasicHelp_Italian.json
 2019-03-03 18:14:12 +02:00
Yair Morgenstern
b98b0feef3
Merge pull request #495 from Smashfanful/patch-28 
Update Nations.json
 2019-03-03 18:14:01 +02:00
Smashfanful
2012cb431f
Update Translations.json 
You also forgot Coast and Ocean
 2019-03-03 16:58:38 +01:00
Smashfanful
caca0ffda6
Update BasicHelp_Italian.json 2019-03-03 16:38:04 +01:00
Smashfanful
37e9736ded
Update Nations.json 2019-03-03 16:27:35 +01:00
Smashfanful
94f90c16a7
Update Nations.json 2019-03-03 12:38:16 +01:00
Yair Morgenstern
9e5d6d3c75 Resolved #469 - AI Great General tries to maximize effect on troops 2019-03-02 22:53:30 +02:00
Yair Morgenstern
c676d127dd Resolved #488 - Recalibrated tech costs 2019-03-02 22:26:31 +02:00
Yair Morgenstern
b2ddb0b5e6
Merge pull request #481 from Smashfanful/patch-22 
Create GreatPeopleNames.json
 2019-03-02 21:48:26 +02:00
Yair Morgenstern
d2f76976e7
Merge pull request #487 from Smashfanful/patch-25 
Update Translations.json
 2019-03-02 21:47:31 +02:00
Yair Morgenstern
d6d0fa16c4
Merge pull request #489 from Smashfanful/patch-26 
Update Nations_Italian.json
 2019-03-02 21:46:54 +02:00
Yair Morgenstern
3c3795aa54
Merge pull request #483 from Smashfanful/patch-24 
Update Nations.json
 2019-03-02 21:46:41 +02:00
Yair Morgenstern
c2387a9055
Merge pull request #485 from Am-per-Sand/patch-5 
Policies.json typo correction
 2019-03-02 21:46:04 +02:00
Yair Morgenstern
58e38ea634 Added Japan civ! 
Some units now recieve promotions when created/upgraded to, as per Civ V
 2019-03-02 21:27:35 +02:00
Smashfanful
153f6e0a85
Update Nations_Italian.json 2019-03-02 19:38:03 +01:00
Smashfanful
314a69e541
Update Translations.json 2019-03-02 19:29:14 +01:00
Am-per-Sand
364b3b48a2
Policies.json typo correction 2019-03-01 18:21:25 +01:00
Smashfanful
c519d4bea4
Update Nations.json 
Added Persia, Songhai, Iroquois, Ottomans, Korea and Polynesia
 2019-03-01 16:52:03 +01:00
Smashfanful
1359e22772
Update GreatPeopleNames.json 
Added the " symbol
 2019-03-01 16:09:02 +01:00
Yair Morgenstern
f3cbeb5ca4 Resolved #123 - Added final units - Modern Armor, Rocket Artillery and Mechanized Infantry! 2019-02-28 23:45:21 +02:00
Yair Morgenstern
17c5209023
Merge pull request #477 from Smashfanful/patch-18 
Update Nations_Italian.json
 2019-02-28 18:23:32 +02:00
Smashfanful
5f73e68c78
Update Nations.json 2019-02-28 15:51:37 +01:00
Smashfanful
8be4dadfb3
Create GreatPeopleNames.json 2019-02-28 15:07:46 +01:00
Smashfanful
5bbcb79f2f
Update Translations.json 
ITALIAN
You forgot to translate/localize
"Maintainance on roads & railroads reduced by 33%, +2 gold from all trade routes"
"Autocracy complete"
"+1 happiness from each Walls, Castle and Arsenal"
"Map Editor" (menu)
"Combined arms" (tech)
"Coast" (tile)
"Ocean" (tile)
"Luxury resources" (diplomacy)
"Strategic resources" (diplomacy)
"Technologies" (diplomacy)
"Declarations of war" (diplomacy)
"Cities" (diplomacy)
"Cannot continue work on [construction]"
All Wonder names and powers (ALL OF THEM)
All spaceship parts
 2019-02-28 12:47:09 +01:00
Smashfanful
fe03cf0e67
Update Nations_Italian.json 2019-02-28 11:54:05 +01:00
Yair Morgenstern
3432f9b8c1 Rendering performance improvements - much smoother scrolling! 2019-02-27 20:17:27 +02:00
Yair Morgenstern
13f2f101a0 Resolved #468 - AI now accompanies Great People with military escorts 
Merged "CivInfos" json into "Nations"
 2019-02-25 21:21:12 +02:00
Yair Morgenstern
57193bffa9
Merge pull request #475 from Smashfanful/patch-17 
Create CivIntros_English.json
 2019-02-24 17:48:17 +02:00
Smashfanful
f95ea1864d
Create CivIntros_English.json 2019-02-24 16:34:44 +01:00
Smashfanful
974b0bea87
Update Nations_Italian.json 
I've made some corrections.
 2019-02-24 15:39:35 +01:00
Yair Morgenstern
6cda5bb8ad Fixed #467 - popups on separate screens affected each other 2019-02-24 13:07:34 +02:00
Yair Morgenstern
b73077baa4 Nation translations are go! 2019-02-24 12:02:02 +02:00
Yair Morgenstern
0cf4b2e82d
Merge pull request #461 from Smashfanful/patch-10 
Nations-Italian.json
 2019-02-24 10:28:43 +02:00
Yair Morgenstern
47dbd69c96 Civilopedia now displays Basic Help per-language 
Fixed problems with Italian translation files
Fixed a couple of errors moving to the next turn with the current construction method
 2019-02-24 10:27:43 +02:00
Smashfanful
7fe64fd293
Update Tutorials_Italian.son 2019-02-24 00:05:25 +01:00
Yair Morgenstern
b06a676377
Merge pull request #472 from Smashfanful/patch-13 
Create BasicHelpIta.json
 2019-02-23 20:54:08 +02:00
Smashfanful
ed9ab8c069
Create BasicHelpIta.json 2019-02-23 19:11:29 +01:00
Smashfanful
d13bc11032
Update Translations.json 2019-02-23 18:41:05 +01:00
Yair Morgenstern
3ae5662c32 Added everything needed for Modern Armor 2019-02-22 10:54:07 +02:00
Yair Morgenstern
53664ec043 Added Kremlin wonder 2019-02-22 10:27:47 +02:00
Yair Morgenstern
80dd4c759b Added percentage bonuses to city stats drilldown 
Fixed happiness drilldown display in city screen
 2019-02-19 22:45:52 +02:00
Yair Morgenstern
2313f72cac Added translations of unit promotions 2019-02-18 23:01:32 +02:00
Yair Morgenstern
df237d8686 Fixed #457 - AI naval units would fortify 2019-02-18 20:46:50 +02:00
Yair Morgenstern
add84c4807 Added data for multiple future nations - thanks SmashFanFull! 2019-02-18 20:45:55 +02:00
Smashfanful
255bf1780d
Nations-Italian.json 
New file
 2019-02-18 19:06:23 +01:00
Yair Morgenstern
b6934e4ec7
Merge pull request #460 from Smashfanful/patch-9 
Update Translations.json
 2019-02-18 17:17:07 +02:00
Yair Morgenstern
3386001f1b
Merge pull request #459 from Smashfanful/patch-8 
Update Translations.json
 2019-02-18 16:39:40 +02:00
Smashfanful
c43455246d
Update Translations.json 2019-02-18 14:36:48 +01:00
Smashfanful
57568b30da
Update Translations.json 2019-02-18 14:32:16 +01:00
Smashfanful
e05f24822c
Tutorials_Italian.json 
Added Italian tutorials.
 2019-02-18 14:11:08 +01:00
Yair Morgenstern
356f8b6bbd Resolved #455 - add great person point breakdown to city info 2019-02-16 23:39:03 +02:00
Yair Morgenstern
6de517d4d5 Separated battle table height from the height of the tile and unit tables 2019-02-14 23:12:35 +02:00
Yair Morgenstern
e200e9026f Text for strength, movement and ranged strength in unit tablee replaced with icons - table is now consistently much smaller, and much less bothersome! 2019-02-14 22:49:46 +02:00
Yair Morgenstern
0fab01e393 Tile map now pans to chosen tile, instead of "flashing" there - makes the map feel more connected and helps you understand where you are IMHO 2019-02-14 22:21:26 +02:00
Yair Morgenstern
679ea60208 Organized non-game images (icon, feature and promo graphics etc) 2019-02-14 21:44:25 +02:00
Yair Morgenstern
0f2c7afe78
Merge pull request #451 from ninjatao/fix_Pentagon 
Fixed : Pentagon build cost 0
 2019-02-14 14:58:27 +02:00
Duan Tao
f7ed954a76 Fixed : Pentagon build cost 0 2019-02-14 18:08:04 +08:00
Yair Morgenstern
ee55839557 Fixed minor problem with Egypt's neutral "let's hear it" responses 
Current construction in city better represented
 2019-02-13 19:02:11 +02:00
Yair Morgenstern
748e84f265 Resolved #449 - added "go to unit" button in unit overview 2019-02-11 22:07:34 +02:00
Yair Morgenstern
0788141054 Civs now have unique responses for introduction, greeting, trade acceptance and refusal 2019-02-11 20:46:49 +02:00
Yair Morgenstern
e3bf80091a Added all texts for all nations! Exhausting! 2019-02-10 23:25:19 +02:00
Yair Morgenstern
796284c7e2 Added unique civ text for attacking, being attacked, and being defeated 2019-02-10 19:50:42 +02:00
Yair Morgenstern
07663bfc54 Added "Diplomatic Incidents" for diplomatic messages between civs (as of now, only declaration of war) 2019-02-10 16:34:46 +02:00
Yair Morgenstern
10e9a5e481 AI units much more cautious when attacking cities - only enter city bombard range if there's a good chance of capturing the city 
#416
 2019-02-09 21:31:16 +02:00
Yair Morgenstern
6856301504 Resolved #446 - Buildings are now created when production is completed by Great Engineers, so production of the current turn can be added to the next construction 2019-02-05 20:04:07 +02:00
Smashfanful
cea8a7b566
More Translation.json 2019-02-04 18:29:38 +01:00
Yair Morgenstern
81d1a79e19 Can now choose a map name and load a map from those existing on the phone! 2019-02-02 23:26:56 +02:00
Yair Morgenstern
8038dd4c4f Separated "Group to hold visual map based on tilegroups" to a separate class, for reuse in CityScreen, the future map editor, and maybe also in the minimap 2019-01-29 21:48:23 +02:00
Yair Morgenstern
3044fb2978 Fixed crashing bug caused by using GameBasics.Technologies.keys directly, and editing it 2019-01-28 20:45:28 +02:00
Yann
20a0deffa9
Complete french translation 2019-01-28 15:40:17 +01:00
Yair Morgenstern
653cb556cf Fixed errors caused by siege unit's movement points not being calculated correctly 2019-01-27 23:38:11 +02:00
Yair Morgenstern
7497ffd3b6 Added Combined Arms tech with Tank, Anti-Tank Gun units and Pentagon wonder 
Tech tree rearrangement - now much closer to original G&K tree
 2019-01-26 23:08:20 +02:00
Yair Morgenstern
f80077a412 Resolved #435 - profit from disbanding units 2019-01-26 22:39:48 +02:00
Yair Morgenstern
478a9e6996 Resolved #429 - display era names only once in tech picker screen 2019-01-23 20:52:26 +02:00
Yair Morgenstern
a4175438a3 Resolved #424 - added confirm box when declaring war 2019-01-23 20:16:34 +02:00
Yair Morgenstern
baed1e50cd Returned tile info table in the city screen, construction scroll now translated, added city screen translations to translations file - #417 2019-01-22 21:48:30 +02:00
Yair Morgenstern
9ba73c4a6f No height difference between hills and hills with jungle/forest 2019-01-21 23:10:03 +02:00
Yair Morgenstern
effec4856c Resolved #424 and upgraded gradle 2019-01-20 22:44:09 +02:00
Yair Morgenstern
fa8f9deb2c Solved #420 - viewable tiles not updated when trading cities, kudos zivvel! 2019-01-19 23:49:46 +02:00
Yair Morgenstern
a371aedf23 Changes to city screen - city summary in top-left corner like original 2019-01-19 21:01:47 +02:00
Benedikt Tröster
5bd35df607 Added last bit of German translation (it is now complete). 
Is proof read once
Added gerneral tips on translation
 2019-01-18 16:36:05 +01:00
Benedikt Tröster
0e57402817 Added to about 90% of all German translations. And fixed some typos 2019-01-17 19:38:17 +01:00
Yair Morgenstern
e16bb2b8a7 Added Tank, Anti-Tank Gun units 2019-01-16 23:15:02 +02:00
Yair Morgenstern
e573368d18 Added CN Tower, Pentagon #245 2019-01-16 22:24:29 +02:00
Yair Morgenstern
eeaca08f57 Added Alhambra #245 2019-01-16 21:45:46 +02:00
Yair Morgenstern
49ed7570f8 Added Hubble Space Telescope wonder, Stable unique ability 
Added missing translations
 2019-01-16 21:26:14 +02:00
Yair Morgenstern
2df64861d1 Added Infantry, Machine Gun units 
Added Railroad, Ballistics techs
Added Statue of Liberty wonder
 2019-01-15 22:17:34 +02:00
Yair Morgenstern
ee278586e7 Solved #413 probable (ANR trying to load super-huge autosave game) by disabling the update() in the initialize, instead setting shouldUpdate to true by default so it'll update in the rendering thread 2019-01-14 21:57:09 +02:00
Yair Morgenstern
53c5c6d5ab Can now choose to start a game with multiple human players! 2019-01-14 20:48:30 +02:00
Duan Tao
c198db0641 Adjust city attack strength. Also shown in unittable when selected. 2019-01-12 20:33:30 +08:00
Yair Morgenstern
d19861b348 Maybe solved an ANR caused by resume(), it's hard to tell 2019-01-10 20:43:32 +02:00
Yair Morgenstern
2fdd3e2628 Fixed #402 - couldn't build wonder if it was being built by a rival civ 2019-01-08 18:43:06 +02:00
Yair Morgenstern
c282ffb423 Resolved #410 - land units on lake aren't shown as embarked 2019-01-08 15:43:54 +02:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
b8aa4932a0 Added unique ability for Egypt and France 2019-01-07 18:44:42 +02:00
Yair Morgenstern
84007533fc Resolved #311 - translate victory screen 2019-01-06 22:48:24 +02:00
Yair Morgenstern
567786c125 Resolved #399 - lakes act differently than in original game 2019-01-06 22:41:03 +02:00
VioPet
2b2cf68933
Update Translations.json 
Review and update all Romanian translations. Also, check and comment on some original entries.
 2019-01-05 23:16:14 +01:00
Yair Morgenstern
19906ade75 Added Babylonian civ unique 2019-01-04 11:51:44 +02:00
Yair Morgenstern
2f5b6e7be5 Resolved #396 - save game start parameters and use for subsequent games 
Later, we could use this info to display to the user in the load game screen
Solved #394 - couldn't scroll map far on edges, some tiles were hard to get to
 2019-01-04 10:59:47 +02:00
Yair Morgenstern
b776bd777c Google suspended the app because of "Impersonation" violation =( 
Changed library name from com.unciv.game to com.unciv.app for app change
 2019-01-02 22:07:47 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Duan Tao
ed96534d34 Fix paper maker icon 2018-12-31 19:56:28 +08:00
Duan Tao
de5610180f Add WaterSubmarine unit type. 2018-12-31 19:42:20 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
f2e6c1b08f Chinese unique ability. 2018-12-30 12:24:01 +08:00
Yair Morgenstern
30e8af1848
Merge pull request #378 from ninjatao/great_general 
Great general
 2018-12-29 19:54:17 +02:00
Yair Morgenstern
ec9d23a774 Fixed tiny typo that made game unrunnable 2018-12-27 21:28:59 +02:00
Yair Morgenstern
438be21d0c
Merge pull request #380 from Luyann/patch-1 
Spanish traduction Completed
 2018-12-26 20:39:25 +02:00
Yair Morgenstern
28b52784bf Uranium revealing tech changed to Nuclear Fission 2018-12-26 20:15:14 +02:00
Luyann
f61fdd32b2
Spanish traduction Completed 
I finished the spanish traduction
 2018-12-26 15:00:53 -03:00
Yair Morgenstern
81b2eabe92 Lakes are impassible 2018-12-26 19:50:21 +02:00
Duan Tao
60f59fe2aa Great general provides bonus for nearby friendly land units. 2018-12-26 19:25:07 +08:00
Duan Tao
7478215353 Add great general generation, overview screen and free pickup. 2018-12-26 18:42:22 +08:00
Duan Tao
c3e8563bf2 Add great general unit. 2018-12-26 18:06:36 +08:00
yairm210
cb30f87c09
Merge pull request #374 from rodrigocaruso/patch-1 
Added Portuguese translations
 2018-12-25 21:18:20 +02:00
Yair Morgenstern
f66e54a127 Fixed "camel archer melee unit" and "sydney opera house 0 turns to build" bugs 2018-12-24 20:50:36 +02:00
yairm210
3ce89e1928
Merge pull request #358 from ninjatao/map_gen 
Add celluar automica map generator.
 2018-12-20 06:42:12 +02:00
Duan Tao
5496a5e640 Add pangaea map type. Add options. 2018-12-20 11:58:54 +08:00
Yair Morgenstern
51b62028a8 Maybe solved a concurrency-related java.lang.IllegalArgumentException from CameraStageBaseScreen.render 
It's hard to tell because it only crops extremely randomly in, like, 1 in a 1000 games, and the users just continue on with their lives,
But it's a crash record and we want 0 of those!
 2018-12-19 19:53:53 +02:00
rodrigocaruso
b9fe6f3832
Added Portuguese translations 2018-12-19 10:46:57 -02:00
Yair Morgenstern
a1a2b89949 Added various attack sounds, for different types of units 2018-12-18 22:32:04 +02:00
Yair Morgenstern
6bdd0da3ea Notifications are now per-civ instead of game-wide, in preparation for multiplayer 
Added player type to civinfo, in preparation for multiplayer
 2018-12-18 18:57:13 +02:00
Yair Morgenstern
2923dc80c9 Massive performance improvement thanks to: 
* not mapping out the uniques every tile
* saving tech uniques and units uniques specific to movement between tiles
 2018-12-17 21:33:07 +02:00
Yair Morgenstern
30734c7287 Changed the basic click because the other one decided to stop working 2018-12-17 19:37:00 +02:00
Yair Morgenstern
94fd43f422 Added icon for lakes 
Added more sound effects
Added Leaning Tower of Pisa
 2018-12-17 19:00:45 +02:00
Yair Morgenstern
3edc95dd3e Added whoosh sound when telling units to move 2018-12-17 14:46:01 +02:00
Yair Morgenstern
319cfd1fe9 Added sound effect for purchasing constructions and tiles 2018-12-17 13:24:48 +02:00
Yair Morgenstern
fd2d55876d Added unique sound effects for multiple actions 2018-12-17 13:11:50 +02:00
Yair Morgenstern
82f9f64fab Added first sound effect, and sound effect volume control settings 
As of now, every single button in the game has the same click sound, but that will change
 2018-12-17 11:45:24 +02:00
Yair Morgenstern
f5c8b28d82 Organized Modern Era techs 
Free techs are added like regular techs - with all the abilities and notifications thereof
 2018-12-17 10:49:13 +02:00
Yair Morgenstern
d1c7117c54 Mountains no longer appear in ranges - caused untenable starting positions 
Lakes now appear randomly!
 2018-12-14 13:46:52 +02:00
Duan Tao
1a731a7ec1 Add observatory requirement. 2018-12-14 17:16:33 +08:00
Duan Tao
92289b1952 Horseman obsletes when lancer shows up. 2018-12-13 19:33:58 +08:00
Duan Tao
8d011dda41 Some units obslete properly. 2018-12-13 18:52:56 +08:00
yairm210
ac241d2744
Merge pull request #334 from ninjatao/add_battleship 
Add Battleship. Enabled Electronics for battleship.
 2018-12-13 12:21:45 +02:00
Yair Morgenstern
9e8930c263 Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v! 2018-12-12 23:05:14 +02:00
Yair Morgenstern
406fa60f61 Unhappiness battle modifier properly capped now 2018-12-12 22:57:03 +02:00
yairm210
9187465699
Merge pull request #335 from ninjatao/cityrange_tutorial 
Add city range tutorial.
 2018-12-12 22:34:42 +02:00
Duan Tao
36d7b30279 Submarine is invisible now, except to submarines and destroyers. But it still can be aimed by everybody. 2018-12-12 22:52:09 +08:00
Duan Tao
209eb4c73b Add submarine and refrigeration. Submarine is not invisible yet. 2018-12-12 13:23:29 +08:00
Duan Tao
2cfdf13fc8 Add obslete condition for Frigate. 2018-12-11 22:27:56 +08:00
GaoSiming988
e53f83ddd4
add tutorial_simplified_chinese 2018-12-11 13:43:37 +01:00
Duan Tao
d73bf6d13f Fix spelling error. 2018-12-11 19:19:36 +08:00
Duan Tao
2e7a2cda12 Add city range tutorial. 2018-12-11 19:06:36 +08:00
Duan Tao
2edb566078 Add Battleship. Enabled Electronics for battleship. 2018-12-11 16:26:29 +08:00
Duan Tao
4f28c51511 some chinese translation correction. 2018-12-11 13:24:35 +08:00
Yair Morgenstern
63f1f501cd Added Hoplite (Greek unique unit) and Rome's unique ability 2018-12-10 22:31:03 +02:00
Yair Morgenstern
78879df350 Russian translations now in line with everyone else 2018-12-10 18:13:01 +02:00
Yair Morgenstern
422200e78d Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-10 18:10:42 +02:00
Yair Morgenstern
ec80dcc0c0 Minor translation changes 2018-12-10 18:10:19 +02:00
kypcop
f605ccbdd5
add some russian translates 2018-12-10 17:17:43 +03:00
Yair Morgenstern
7ee76771f5 Added some missing translations 
aab/apk now doesn't einclude local debug files
Maybe solved resume problem on Chrome OS (see issue 322), needs to be checked
 2018-12-10 14:09:01 +02:00
Yair Morgenstern
197d698c57 Organized Freedom policies 2018-12-10 11:55:18 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00
Yair Morgenstern
70d6697f16 Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles 2018-12-10 11:04:40 +02:00
Yair Morgenstern
1ba0929869 Font download now preceded by a "requires fonts, do you want to download?" message that allows you to opt out 2018-12-10 10:41:13 +02:00
Yair Morgenstern
d1df5a2fdf Chinese font downloaded per-use basis - makes the android app require Internet permissions, but that was coming anyway 2018-12-09 19:47:21 +02:00
GaoSiming988
8fa874a23c
Some error corrections of cn_translation 
Some error corrections of cn_translation
 2018-12-08 20:02:45 +01:00
GaoSiming988
8dc58cc583
add chinese, pls try it 
add chinese, pls try it
 2018-12-08 19:32:51 +01:00
Yair Morgenstern
ff29448e06 Added translations for Ancient Ruins bonus notifications 2018-12-07 12:20:23 +02:00
Yair Morgenstern
3a1f9af0fd More building uniques to translate, yay! 2018-12-07 11:40:11 +02:00
Yair Morgenstern
323cac2eab Organized translations of building uniques 2018-12-07 11:36:42 +02:00
Yair Morgenstern
0a5ba19c6d Translation update: more things are translated, more are translatable, translation function moved 2018-12-07 11:24:55 +02:00
Yair Morgenstern
e53929a3db Fixed Portuguese translations so the game would run and recognise them all as the same language 2018-12-07 10:17:16 +02:00
luanrmoura55
8dfa439913
Brazilian Translation (Brazilian Portuguese) 
Added a few detais wich i think you would be interrested in Reading as there might be corrections you want to make in what i wrote since a few words are not 100% sure to be correctly written.
 2018-12-06 19:45:06 -02:00
Yair Morgenstern
01ece11185 Added Camel Archer, Arabian unique unit 2018-12-06 23:08:11 +02:00
Yair Morgenstern
6672b9e7bd Added Minuteman, American unique, and England special ability 2018-12-06 22:02:03 +02:00
Yair Morgenstern
37dc952fe6 MoveHereButton dissapears after unit has moved 2018-12-06 15:55:28 +02:00
Yair Morgenstern
9b07120080 Added Destroyer, late-game naval melee unit 
Caravel upgrades to ironclad
 2018-12-06 15:47:35 +02:00
Yair Morgenstern
44d5017f6f MoveHereButton creation deferred to main thread, in order to LibGDX errors caused by concurrent UI alteration 2018-12-06 12:30:02 +02:00
Yair Morgenstern
e53f8d8933 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-06 11:41:49 +02:00
Duan Tao
fbfde0d9fb Add resistance icon. 2018-12-06 14:44:18 +08:00
Yair Morgenstern
67625321b8 Great merchant trade mission gold increases with era (as per original civ) 
Added Great People actions translations
 2018-12-05 13:48:23 +02:00
yairm210
7800a003db
Merge pull request #305 from ninjatao/fix_acquire 
Add icon for aquirable tiles in city screen.
 2018-12-05 10:23:05 +02:00
Yair Morgenstern
93646cd74b Missing French accentuated characters now shown 2018-12-05 10:21:14 +02:00
Duan Tao
f1c27ca0ea Add icon for aquirable tiles in city screen. 2018-12-05 15:13:06 +08:00
Yair Morgenstern
c706fa455a Code inspection and other general fixes - gotta clean up when there are guests ;) 2018-12-04 23:21:57 +02:00
Yair Morgenstern
c359616824 General code cleanup - performance improvements on order in ||, StringBuilders replaced with line lists, added missing translations 2018-12-04 21:23:25 +02:00
Yair Morgenstern
bc1b1e7672 Solved a super-rare bug where the game would get stuck if you expanded the city onto a tile with an enemy that couldn't be teleported anywhere else - kudos Groundless Name! 2018-12-04 11:45:16 +02:00
Yair Morgenstern
53bac34b42 Added Gatling Gun unit 
Cannon upgrades to Artillery
 2018-12-03 16:00:29 +02:00
Yair Morgenstern
b3b2cbe23c Organized trade table 2018-12-03 13:08:34 +02:00
Yair Morgenstern
1e17df4b1e Travis update, using 'android:components' instead of 'install' for base installations 2018-12-03 10:17:06 +02:00
Yair Morgenstern
4f0f163c00 Difficulty affects all AI yields now, which should widen the difficulty range - easy difficulties are now easier, and hard ones are harder 2018-12-03 09:57:27 +02:00
Yair Morgenstern
24b27a791f Added Replacable Parts tech and Great War Infantry 
Musketman now upgrades to Rifleman
Solved more rare concurrency problems
 2018-12-02 23:05:05 +02:00
Yair Morgenstern
28ae533acc Added Landship, the first Armor unit! 
Added promotions for Armor units
 2018-12-02 15:46:45 +02:00
Yair Morgenstern
5099ad4db4 Kotlin version upgraded to 1.3.10 2018-12-02 15:33:30 +02:00
Yair Morgenstern
87571ee333 Added the debug keystore manually, hope this fixes the travis build... 2018-12-02 15:16:50 +02:00
Yair Morgenstern
9ea9e9f523 Upgraded BuildTools to 28.0.3, Gradle to 3.2.1 and Kotlin to 1.2.71 2018-12-02 14:12:47 +02:00
Yair Morgenstern
a01173261c Upgraded Gradle to 4.6 (from 3.3) 2018-12-02 13:05:29 +02:00
Yair Morgenstern
288875ae4f Changed icons for jungle, flood pains and marsh 2018-12-02 11:28:15 +02:00
Yair Morgenstern
cd28358289 Fixed bug where you could convince AI to declare war on defeated civs - kudos ninjatao! 2018-12-01 22:40:14 +02:00
Yair Morgenstern
ec65268099 AI now uses Great People properly 
Fixed bug where loading a game with a free policy would freeze everything
 2018-12-01 22:16:26 +02:00
flecheapolinienne
ce3258617f
Update Translations.json 2018-11-29 18:38:59 -05:00
Yair Morgenstern
ce9d68e375 Hopefully the yield in the city screen looks better now 
Added mountains
 2018-11-28 23:05:14 +02:00
Yair Morgenstern
c807ee5098 Solved ANR problems related to moving units long distances across the map 2018-11-28 18:59:18 +02:00
Yair Morgenstern
ea68a70823 Solved concurrent modification problems from TechManager.researchedTechnologies and civInfo.exploredTiles 2018-11-27 22:48:41 +02:00
Yair Morgenstern
6096bde9cd Changed Forest icon 
Narrowed hexagon edges
 2018-11-27 21:51:52 +02:00
Yair Morgenstern
556c10109d Performance improvements in both getCivUnits and canPassThrough of tile 
Fixed no embarkation & policy pick bug
 2018-11-24 22:48:42 +02:00
Yair Morgenstern
5577022bd7 Added unit icons to battle table 2018-11-24 21:15:22 +02:00
Yair Morgenstern
5b66f8f0f7 Organized Unit Table UI 2018-11-23 14:36:22 +02:00
Yair Morgenstern
e16ea5c803 Performance: Added Transient list of researched technologies 2018-11-21 20:02:12 +02:00
flecheapolinienne
b7c0fee37f
Update Translations.json 2018-11-21 10:56:00 -05:00
Yair Morgenstern
17c98f9f46 Fixed Embarkation tutorial 2018-11-21 15:10:15 +02:00
Smashfanful
21338e241f
NewTranslation.json 
Finished these Italian translations, hopefully.
 2018-11-19 11:10:23 +01:00
Yair Morgenstern
3e02417838 AI units no longer attack from an embarked state (it's just not worth it) 2018-11-17 22:01:47 +02:00
Yair Morgenstern
3707758f7e Dev: added missing translation 2018-11-17 21:29:03 +02:00
Yair Morgenstern
678db24d78 All unit uniques displayed in tech tree 
Unit bonus/penalty uniques are now translated
 2018-11-17 21:19:43 +02:00
Yair Morgenstern
22e6f39caf Dev: Removed baseDescription from units, all old baseDescriptions moved to Uniques 2018-11-17 21:02:42 +02:00
Yair Morgenstern
2db768f9ed Added tutorials for siege units and embarkation 2018-11-17 20:56:30 +02:00
Yair Morgenstern
69e30ce212 Dev: Techs are now recognized by their unique abilities, not by tech name 2018-11-17 20:33:21 +02:00
Smashfanful
e631d138f6
Update Translations.json 2018-11-14 20:20:05 +01:00
Yair Morgenstern
b01ed7541e Translation fixes 2018-11-14 21:08:43 +02:00
Smashfanful
8a2d007038
Updated Translation.json 
New Italian Translations.
 2018-11-14 19:35:18 +01:00
Yair Morgenstern
7ce4d2515b Barbarians are now colored in red+black, like in the original civ 2018-11-14 19:41:53 +02:00
Yair Morgenstern
640a3b873e Ballista replaces catapult, not horseman 
When an improvement is under construction, you cannot pick to construct that improvement again
 2018-11-14 19:31:33 +02:00
flecheapolinienne
b7e9982918
Update Translations.json 
About 30% of french translations redone
 2018-11-14 11:35:54 -05:00
Yair Morgenstern
42e6ab1c65 Fixed great person point generation 
Added great person points to civ overview
 2018-11-13 21:10:23 +02:00
Yair Morgenstern
0a0b664dfe Specialists work again! =D 2018-11-12 21:54:11 +02:00
Yair Morgenstern
62ef51f38e Added Navigation tech with Seaport building and Frigate unit 
Water maps are out of beta and are now default!
 2018-11-12 13:05:42 +02:00
Yair Morgenstern
5ef5ff572e Added Ironclad unit 2018-11-12 11:21:00 +02:00
Yair Morgenstern
d3a4952fef AI will only pay for extra luxuries if it can trade them away 2018-11-12 09:47:43 +02:00
Yair Morgenstern
a7694867d0 Population is assigned/unassigned in cities by clicking on the tile, not just the population symbol 2018-11-06 22:49:40 +02:00
Yair Morgenstern
a062b02bb5 Percentage increases from buildings displayed in tech picking screen 2018-11-06 20:29:48 +02:00
Yair Morgenstern
f73d840a9d Silly roadbuilding crash bugfix 2018-11-06 20:26:31 +02:00
Yair Morgenstern
c8285b9b0a Added new Targeting, Coastal Raider, Bombardment, Boarding Party promotions for naval units, and opened up older promotions for them 2018-11-04 20:07:54 +02:00
Yair Morgenstern
73d0a7cf72 Added Sydney Opera House 2018-11-04 18:43:36 +02:00
Yair Morgenstern
02b0f6e9fe Code organization - separated TechButton and IconCircleGroup to separate files &c 
Tech with special abilities now displayed with a star icon
 2018-11-04 18:42:55 +02:00
Yair Morgenstern
937687a0f4 Steam Power and Astronomy now increase embarked units' movement 2018-11-04 13:07:03 +02:00
Yair Morgenstern
fb2538524a Tile info now dispays which civ each unit belongs to 
Embarked units marked on map with different shaped background
 2018-11-04 13:06:16 +02:00
Yair Morgenstern
52e9e35853 Removed unused fog/crosshatch images 2018-11-03 20:01:29 +02:00
Yair Morgenstern
3958ed3cdb Fixed Ecology image 
World screen now also displays icons of tech results
 2018-11-03 19:49:05 +02:00
Yair Morgenstern
8b12b80f34 Fixed images of Burial Tomb and Paper Maker 
Techs now display little icons of their effects
 2018-11-03 19:19:30 +02:00
Yair Morgenstern
eb9ae392d3 Added Monastery and Solar Plant icons, which were missing 2018-11-02 14:53:20 +02:00
Yair Morgenstern
3655e07614 Added Caravel unit 2018-11-02 13:52:37 +02:00
Yair Morgenstern
abc3bfcae8 Added Galleass, first ranged water unit! 2018-11-02 12:49:41 +02:00
Yair Morgenstern
5a6e5043b3 Trade routes now travel between harbors over water, and are calculated once per civilization instead of per city 2018-11-01 19:27:57 +02:00
Yair Morgenstern
60b86decfb Added tutorials on injured units and workers 2018-10-31 14:00:49 +02:00
Yair Morgenstern
4423dadefd Removed hydro plant from loaded games 2018-10-28 16:37:51 +02:00
Yair Morgenstern
f86736db6d Removed Hydro Plant, since it requires rivers to be useful, and we don't yet have rivers. 2018-10-28 16:16:47 +02:00
Yair Morgenstern
0f4accb5a4 Added "missing translations" menu in display options, so translators can see which texts have not yet been translated in their language 2018-10-28 15:23:35 +02:00
Yair Morgenstern
c43dfd7f95 Added translation stubs for Honor and Autocracy policy branches, and other bits & bobs 2018-10-28 15:09:10 +02:00
Yair Morgenstern
324239b3e6 Typo fix: dicipline -> discipline 2018-10-28 15:06:55 +02:00
Yair Morgenstern
45e5f82478 Added Compass tech and Harbor building 2018-10-28 14:33:42 +02:00
Yair Morgenstern
cc0e76ba00 Added info of tile's unit defence bonus to tile info (not everyone is a veteren Civ player...) 2018-10-28 12:37:00 +02:00
Yair Morgenstern
566e555447 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-10-24 23:00:10 +03:00
Yair Morgenstern
284cc5c924 Can now see translation percent when picking language 2018-10-24 22:59:57 +03:00
RCalleti
56bcd30aa7
Update Translations.json 2018-10-24 21:31:32 +02:00
RCalleti
14d53049b9
Update Translations.json 2018-10-23 23:33:44 +02:00
Yair Morgenstern
230031e9f5 Fixed combat for embarked units 2018-10-23 22:08:30 +03:00
RCalleti
7cd903c6b9
Update Translations.json 2018-10-22 20:09:56 +02:00
Yair Morgenstern
2c5f4e1529 Land units can embark! 2018-10-22 20:05:04 +03:00
Yair Morgenstern
9c36ae0c6b Added The Great Lighthouse 2018-10-19 15:11:14 +03:00
Yair Morgenstern
b4d56e1474 Merge branch 'master' of https://github.com/yairm210/UnCiv 
# Conflicts:
#	android/assets/jsons/Translations.json
 2018-10-18 23:12:21 +03:00
Yair Morgenstern
a6b4a62abc Centeralized translations of alerts to translations file, for Spanish 2018-10-18 22:59:33 +03:00
Yair Morgenstern
f9f46391ea Fixed lighthouse & trireme problems 2018-10-18 22:57:45 +03:00
RCalleti
649fa12df6
Update Translations.json 2018-10-16 21:10:20 +02:00
Yair Morgenstern
dea7775be5 Added Optics and Lighthouse 2018-10-16 21:13:29 +03:00
RCalleti
ae33818750
Update Translations.json 2018-10-16 12:48:35 +02:00
Yair Morgenstern
c1e070018f Added Triremes and water combat! 2018-10-15 22:57:33 +03:00
yairm210
8912984e74
Merge pull request #243 from bryanwweber/fix_medical_lab_stats 
Fix medical lab stats and stasis chamber name
 2018-10-15 12:24:49 +03:00
Yair Morgenstern
ba144be973 Added resources and terrain features back to land-only maps 2018-10-14 21:07:01 +03:00
Bryan W. Weber
345f0db27e
Fix all spellings of Statis->Stasis 2018-10-14 13:55:01 -04:00
Bryan W. Weber
edc3e730b9
Change Medical Lab to use uniques 
This matches how the Aqueduct is specified. It also fixes that the
description is not available on the building picker screen.
 2018-10-14 11:18:51 -04:00
Bryan W. Weber
e816d9dbed
Fix typo in SS Stasis Chamber name 2018-10-14 11:17:37 -04:00
Yair Morgenstern
f6163f3c88 Organized policy icon credits 2018-10-13 22:31:03 +03:00
Yair Morgenstern
b4c17f7664 Organized building order and icon credits 2018-10-13 21:53:17 +03:00
Yair Morgenstern
b528ef38e9 Minor improvements 2018-10-12 15:02:12 +03:00
Yair Morgenstern
1111a23c14 Added Fish, Pearls and Whale resources, Work Boats unit, Sailing tech and Fishing Boats impovement 2018-10-11 23:03:31 +03:00
Yair Morgenstern
64359a794e Added random land\sea division using Perlin noise 
Can now divide undecided parts of maps into random terrain regions
 2018-10-11 13:00:23 +03:00
Yair Morgenstern
4277bbc403 Added tech progress bars in tech picking screen 2018-10-06 20:19:51 +03:00
Yair Morgenstern
7e6fa0e895 Fixed gold tile cost bug 2018-10-05 00:00:50 +03:00
Yair Morgenstern
50c2ad4573 Added America civ 2018-10-04 23:33:08 +03:00
Yair Morgenstern
4280df329f Added all tech icons 2018-10-04 23:15:47 +03:00
Yair Morgenstern
a8bb9f53b7 Added medieval tech icons 2018-10-03 23:03:53 +03:00
Yair Morgenstern
b99d6c67b6 Another minor bugfix 2018-10-02 00:10:11 +03:00
Yair Morgenstern
8c7e8437ec Added tech icons for ancient & classical technologies 2018-09-30 00:24:09 +03:00
Yair Morgenstern
a2b730a279 Can now add images to tutorials! Added images for Tile Clicked, Unit Selected and Tile Layout tutorials. 2018-09-24 22:04:39 +03:00
Yair Morgenstern
fdd9481535 Fog is now done using crosshatching - maybe it looks better, hard for me to tell. 2018-09-23 15:27:38 +03:00
Yair Morgenstern
7b2bf48e04 Added City Ruins when a city is razed (no effects, just game flavour) 2018-09-23 11:03:03 +03:00
Yair Morgenstern
5710001715 Added "Buy tile" option to cities 2018-09-23 10:39:56 +03:00
Yair Morgenstern
a1f824842d AI units now go out and explore unseen areas 2018-09-16 23:14:35 +03:00
Yair Morgenstern
c1e6c8e894 Added "Sleep" action for units that can't fortify 
Added tutorial after constructing the apollo program
 2018-09-16 13:58:35 +03:00
Yair Morgenstern
9c8e173f4e Lots off background work for future water tiles 
Resized xxxhdpi icon
 2018-09-11 23:07:12 +03:00
Yair Morgenstern
68b64ca66f Added Honor and Autocracy policies 2018-09-05 17:17:30 +03:00
Yair Morgenstern
03029e8b99 Replaced all policy icons! 2018-08-31 11:40:25 +03:00
Yair Morgenstern
056a428376 Added secondary colors for civs - applies to units, cities, minimap, and more! 2018-08-30 23:54:33 +03:00
Yair Morgenstern
2605ce6b71 Once a unit has gained more than 30 XP it won't gain XP from barbarians 
AI units now always unfortify/unsetup after moving
 2018-08-30 22:13:07 +03:00
Yair Morgenstern
1227a47ea2 Added nations of Russia, Rome and Arabia! 2018-08-30 18:07:04 +03:00
Yair Morgenstern
17e440d557 Added building icons! 
There are now images of the current construction in the construction picker screen, the city screen and the world map!
 2018-08-29 14:03:18 +03:00
Yair Morgenstern
bd4e358bd8 Added ALL Building icons!!! 
We will no longer get errors when adopting a policy that puts things near our capital if we don't have a capital (why would you do this? I dunno but people have!)
 2018-08-29 12:36:58 +03:00
Yair Morgenstern
9e5208dd8c Fixed a bug where the unit needs the civInfo in order to calculate the moveTo even before it's put on the map. 2018-08-29 12:25:35 +03:00
Yair Morgenstern
40db822a79 Finished off promotions, adding Formation I, Formation II, Blitz, Logistics, Mobility, and Volley promotions 2018-08-28 12:12:14 +03:00
Yair Morgenstern
b983de9599 Stat icon organization 2018-08-28 10:52:48 +03:00
Yair Morgenstern
5d4c8a618d Replaced all resource and improvement icons! 
AI disables city raze on capture/buying cities
 2018-08-28 10:35:56 +03:00
Yair Morgenstern
5d3c7a3a5e Replaced city connection icon, luxury resources now have a smiley next to them and strategic resources have a production symbol 2018-08-27 17:17:14 +03:00
Yair Morgenstern
0d630abc14 Added alternative resource icons 2018-08-27 15:37:15 +03:00
Yair Morgenstern
4932c627aa Changed icons to the new and non-suable version! 2018-08-27 14:35:49 +03:00
Yair Morgenstern
e078590933 Fixed concurrency problems when updating city stats 2018-08-27 13:38:54 +03:00
Yair Morgenstern
28f5ef5e4f Barbarians now destroy cities instead of capturing them 
Destroyed cities reliquish their tiles like they're supposed to
 2018-08-27 12:16:25 +03:00
Yair Morgenstern
94eb7198e9 Expanded city name of all civs to 30 since it's obvious there are some people who reach those numbers. 2018-08-26 09:27:08 +03:00
Yair Morgenstern
9fbb997e63 Added burial tomb unique building for Egypt 2018-08-24 15:15:52 +03:00
Yair Morgenstern
8978d13cdc Added paper maker as first unique building! 2018-08-23 13:16:41 +03:00
Yair Morgenstern
4fd9ac0f38 Added musketeer unique unit for France 2018-08-23 08:43:14 +03:00
Yair Morgenstern
5e1bccdc47 Organized clone functions 
Found one last place where the unit was destroyed manually and not using the destroy() function =\
 2018-08-20 22:36:01 +03:00
Yair Morgenstern
040866609e Added effects of Militarism, Total War and Facism 2018-08-20 21:58:01 +03:00
Yair Morgenstern
f820b75fff Json is apparently not thread safe, so we now create a new instance for each stringify 2018-08-20 09:17:40 +03:00
Yair Morgenstern
1957c4ca80 Code reorganization - separated variables, pure functions and state-changing functions in all main logic classes 2018-08-17 13:36:23 +03:00
Yair Morgenstern
abef1a64e5 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-17 11:38:42 +03:00
Roumaan
c1098c19d1 Policies Russian translation complete 2018-08-16 23:50:00 +03:00
Yair Morgenstern
b1e17a67c6 Added Range, Sentry, Siege and Indirect Fire promotions 
Units now get experience when capturing a city
 2018-08-16 08:52:29 +03:00
Yair Morgenstern
26b3366d93 Added all policy translation lines 2018-08-14 19:24:47 +03:00
Yair Morgenstern
fee0b718ec Shrunk game size by 15% by including the images only when packed 2018-08-13 08:56:15 +03:00
Yair Morgenstern
bb25616b69 Fixed bug when playing with translations and constructing science, gold or nothing in a city 2018-08-12 20:45:17 +03:00
Yair Morgenstern
4c0372a8b5 When cities expand, units that aren't allowed to enter there are pushed to the closest moveable tile 2018-08-12 08:56:10 +03:00
Yair Morgenstern
4a35d2f3db Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-10 18:31:39 +03:00
Yair Morgenstern
847bf9650d Changed the basic stat icons to not use the original Civ's 2018-08-10 18:31:18 +03:00
Roumaan
e5342de6cd I belatedly translated the tutorials +some minor translations (#227) 
* Adding tutorials Russian translation

* Oh forgot about this one

* Some new translations

* Translated some new tutorials

+one string translation at main file
 2018-08-10 13:47:36 +03:00
Yair Morgenstern
3515b0f6bd Added instructions to deal with situations where the game has crashed but we've noticed it 2018-08-10 11:35:56 +03:00
Yair Morgenstern
e51ac717d7 Better circle image, images no longer look all pixellated 2018-08-10 11:34:30 +03:00
Yair Morgenstern
c67d515ec4 Organized all game images and added TexturPacker to pack them all into a single image, with an atlas to find the texture regions - 
MASSIVE boost in rendering performance!
 2018-08-10 11:05:21 +03:00
Yair Morgenstern
4d27f7f769 Added icon to city tiles 2018-08-09 21:52:28 +03:00
Yair Morgenstern
4f727df216 Added crosshair image on attackable enemies 2018-08-09 21:04:25 +03:00
Yair Morgenstern
39cd9c9fa7 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-09 19:08:25 +03:00
Yair Morgenstern
6f2b845e13 Civilization class renamd to Nation, to have it be distinct from CivilizationInfo 2018-08-09 18:44:43 +03:00
Yair Morgenstern
186feab0c6 Added notification when enemy declares war on us 2018-08-09 18:36:37 +03:00
Yair Morgenstern
e6bc3a1ab7 Added tutorials when first encountering barbarians and other civilizations 2018-08-09 18:33:47 +03:00
Yair Morgenstern
b79b682376 Added "conquer defeated city with melee unit" tutorial 2018-08-09 10:23:10 +03:00
Yair Morgenstern
97bb4e05b9 Fixed bug where you could buy the same buildings multiple times - thanks vita10g! 2018-08-09 10:10:49 +03:00
Roumaan
76d80b30ca Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-08 22:45:15 +03:00
Roumaan
ca64d361f4 Adding Russian translation 
policies, remove actions +minor additions. I think i finnally did it
 2018-08-08 18:17:23 +03:00
Roumaan
07280104cc Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-08 17:23:08 +03:00
Roumaan
969e16787e Fixing out fixes 2018-08-08 17:16:49 +03:00
Yair Morgenstern
9d0035a8a6 AI now considers war on multiple civs, starting with the closest 2018-08-08 08:23:20 +03:00
Yair Morgenstern
3b83627386 Left side of diplomacy screen now scrolls 2018-08-07 07:39:44 +03:00
Yair Morgenstern
02fd349243 Massive AI combat improvements! 
Added translations
 2018-08-06 21:58:30 +03:00
Yair Morgenstern
a199801c82 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-08-06 21:23:52 +03:00
Roumaan
12d3d9f2e1 Merge remote-tracking branch 'refs/remotes/yairm210/master' 2018-08-06 19:14:08 +03:00
Roumaan
353ce16360 Fixing Ryssian translation 3 
Fixed translation of  Eras, unique buildings effects, unit types, unit
uniques, policy picker screen, trade categories.
 2018-08-06 19:09:28 +03:00
Yair Morgenstern
99c0abd24d Fixed crash when you would melee attack an enemy unit that was in a friendly civ's (unenterable) territory 2018-08-06 13:08:45 +03:00
Roumaan
ef60f86ab0 Fixing Russian trahslation 2 
Fixed translatiaon of notifications, technologies and eras
 2018-08-06 04:28:19 +03:00
Fantaziu Ion
f302bd412b
Major translations it/ru/fr/ro 
Some units not translated cause never encountered and not know if exist. May be duplicates in other languages... Not shure.
//Check comments inside file
 2018-08-06 01:59:43 +02:00
Roumaan
1f622e01c4
My first commit trying to fix russian translation 
Just fixed some of the first lines. Commiting just to save changes from my browser, and continue working with files on my computer tomorrow. The translation we have now is very bad. And all I can do is just try to fix it with my terrible knowledge of English, enough that this translation at least started to make sense, hoping someone would be able to finish it completely. I hope you understood me.
 2018-08-06 02:18:09 +03:00
Yair Morgenstern
2be6a5c15c AI construction choices now better and change between peacetime and wartime. 
AIs now declare war on each other if they think they can defeat the other side
(Returned movement alg. to the way it was because the new way didn't allow ais to find enemy units, added comment)
 2018-08-05 23:08:50 +03:00
Yair Morgenstern
e655d6620a Added LOADS of words to be translated - all buildings and units! 2018-08-05 16:12:46 +03:00
Yair Morgenstern
c3cdae12d4 Tutorials are now defined per language! 2018-08-04 23:57:53 +03:00
Yair Morgenstern
7983901435 Info on translation percentage in language picker screen 2018-08-04 21:50:56 +03:00
Yair Morgenstern
ec0ebc73f0 Expanded translation for new game screen and overview screen 2018-08-04 21:36:08 +03:00
Yair Morgenstern
215310b413 Diplomacy screen, declaring war, no entering frienly enemy territory 2018-08-02 21:21:30 +03:00
Yair Morgenstern
bf9e06445c All diplomacy now done from a separate screen 2018-08-02 14:59:53 +03:00
Yair Morgenstern
023c4cd1c6 Trade now almost entirely separate from Trade Screen, so the Trade screen can become a Diplomacy screen! 2018-08-01 22:41:23 +03:00
Yair Morgenstern
d8bb0eb9e5 Can now trade Peace Treaty! Which leads to actual fukken peace! 2018-07-31 17:48:57 +03:00
Yair Morgenstern
82c42e8528 Trade classes re now separate files 2018-07-30 13:30:13 +03:00
Smashfanful
28e068801a
Updated translation 
Corrected Italian translation.
 2018-07-29 11:23:50 +02:00
Fantaziu Ion
556a327bc2
translated trade, civ name, difficulty, map size 
translated trade
 2018-07-28 15:23:20 +02:00
Yair Morgenstern
8b259a3db3 Added ai unhappiness modifier to difficulty 2018-07-27 10:03:44 +03:00
Yair Morgenstern
041f904f6c Added language picker screen 2018-07-26 23:46:14 +03:00
Am-per-Sand
9e7c3e0b08
added commas! 2018-07-26 18:10:45 +02:00
Yair Morgenstern
06c68302ce Added difficulty settings! 2018-07-25 22:56:25 +03:00
Yair Morgenstern
b4614fc1f5 Railroad now looks like a railroad and visible on tundra 2018-07-24 18:22:39 +03:00
Yair Morgenstern
b1f14761ad Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-07-20 15:58:38 +03:00
Am-per-Sand
b653829547 units.json commas 
easy to find with syntax highlighting
 2018-07-20 15:56:57 +03:00
Am-per-Sand
eb63ae4c5d Policies.json commas 
Credits to github syntax highlighting
 2018-07-20 15:56:26 +03:00
Yair Morgenstern
0d261e88bf Added list of units to empire overview 2018-07-19 13:29:52 +03:00
Yair Morgenstern
5ee0c47e22 If a unit can be promoted twice, the promotion picker remains open after you pick the first promotion 2018-07-18 13:26:29 +03:00
Yair Morgenstern
7ec95fefd9 No tile will now be in 2 cities simultaneously 
Cities can't "take over" tiles neighboring to a city
 2018-07-16 23:50:35 +03:00
Yair Morgenstern
da3d749547 When unable to support units, they disband one by one instead of all at the same time 2018-07-15 19:51:27 +03:00
Yair Morgenstern
68781ed5f7 Units can only upgrade within your borders (thanks Noam!) 2018-07-13 17:28:08 +03:00
Yair Morgenstern
bfb53a1940 Updating happiness happens in a different thread so it doesn't impede the update() function 2018-07-12 19:17:58 +03:00
Yair Morgenstern
3215e0eea9 Displayed happiness updated within the turn (thanks Am-Per-Sand!) 2018-07-11 21:25:23 +03:00
Yair Morgenstern
949d64c53c Added tutorials for strategic and luxury resources 2018-07-09 22:51:50 +03:00
Yair Morgenstern
849129ac65 Added trade translation texts 
Added duration to trade screen buttons
 2018-07-09 22:43:32 +03:00
Yair Morgenstern
fdcce8287f Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-07-09 22:20:16 +03:00
Yair Morgenstern
a193be18b3 Free Religion policy is now pickable 2018-07-09 17:28:25 +03:00
Am-per-Sand
8479074e84 added units and combat (#193) 
and corrected typos and omitted words
 2018-07-07 21:36:28 +03:00
Yair Morgenstern
0c17e19ea2 Trading gold now works as well! 2018-07-06 16:42:32 +03:00
Yair Morgenstern
9f81ac6676 Defeated civs no longer have automated actions, and their remaining units are removed from the map 2018-07-03 22:25:13 +03:00
Fantaziu Ion
d7a8f52c86
minor translations finished (it, ru, ro, fr) 2018-07-02 13:27:42 +02:00
Yair Morgenstern
62246ff1c9 More translation stuff 
When will the madness end?
 2018-07-01 17:27:52 +03:00
Yair Morgenstern
f08261edaf Fixed bug where (I assume) if you started a game before version 94, then you may not have any techs at all, and so wwhen you try to fund the player's Era by techs, it finds nothing and explodes 2018-07-01 17:16:56 +03:00
Yair Morgenstern
4593bed7dc Future tech can now be constantly researched! 2018-07-01 17:05:30 +03:00
Yair Morgenstern
837195293c Fixed minor merge conflict between dutch and other languages 2018-07-01 16:59:41 +03:00
jorick44
a9b33f1322 Dutch translation (#185) 
An almost complete Dutch translation for UnCiv I wasn't able to translate everything but I do hope that this will Improve the game from a 10/10 to a 11/10
 2018-07-01 16:41:10 +03:00
Fantaziu Ion
16e762c15e
minor tranlations 
added comments on what eras are one word translated + finished the other minor translations
 2018-07-01 01:47:00 +02:00
Yair Morgenstern
e81df16317 Added Yes/No popup (we'll need it when we have diplomacy and you tell a unit to enter enemy territory) 
Added opttion to disband unit (as a test for the popup)
 2018-06-27 22:43:15 +03:00
Fantaziu Ion
853f86b613
Basic translations 
We need to review the era translations as they are gender sensitive and sometimes there's one word translations (ex: renaissance era [it] Rinascimento)
 2018-06-27 19:07:14 +02:00
Yair Morgenstern
805fc5c739 Oligarchy policy now works as intended 
More translation stuff
 2018-06-25 23:11:22 +03:00
Yair Morgenstern
4bbffe318b More translation stuff 2018-06-25 21:50:56 +03:00
Yair Morgenstern
a59d6e7a46 Translation stuff 
Fixed ultra rare bug where a unit that expends all its movement points on roads right before attacking will think that it can attack when it can't
 2018-06-25 20:08:57 +03:00
Yair Morgenstern
15be9daf88 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-25 19:27:35 +03:00
Yair Morgenstern
1388aec34a Tech manager now shows eras of technologies! 2018-06-25 19:27:27 +03:00
Yair Morgenstern
c5f127e555 Policy branches are unlocked by era 2018-06-25 18:09:38 +03:00
Yair Morgenstern
85a8e68a0a Added Rifling with Rifleman unit 2018-06-25 14:16:39 +03:00
Yair Morgenstern
7898a24ff1 Added Metallurgy with Lancer unit 2018-06-25 14:12:17 +03:00
Yair Morgenstern
fea22cc049 Added Military Science tech with Cavalry unit and Military Academy building 2018-06-25 14:07:35 +03:00
Yair Morgenstern
1dffbe2db5 Added Dynamite tech with Artillery 2018-06-25 13:59:51 +03:00
Yair Morgenstern
b166e23858 Game now longer gets an Application Not Responding when taking a long time creating a new game 2018-06-25 08:41:22 +03:00
Fantaziu Ion
8ee81b5bd9
Finished major translations 
waiting for new entries
 2018-06-25 05:19:24 +02:00
Fantaziu Ion
94608f6cf8
Minor Translations 2018-06-25 04:25:28 +02:00
Yair Morgenstern
fe31e4121a Added Barracks and Armory buildings to increase XP of units built in the city 2018-06-24 22:09:16 +03:00
Yair Morgenstern
a56e7e43aa Added Agriculture tech - no gameplay change, but it does tell the game's story well! 2018-06-24 21:19:57 +03:00
Yair Morgenstern
afd712c1c9 Added tutorials and basic help ffor capturing enemy cities and for connecting your cities to the capital with roads 2018-06-23 23:46:26 +03:00
Yair Morgenstern
a0e14ee8f8 Swords man upgrades to Longswordsman, Chariot Archer upgrades to Knight 2018-06-23 23:31:08 +03:00
Filius-Patris
908d913c25 Updated German translation (#173) 
Adjusted translation with new placeholders (THANKS!!)
Added missing and some not-sure translations
 2018-06-23 23:29:50 +03:00
Yair Morgenstern
56c5b7c1ca Added Industrialization between Economics and Steam Power 2018-06-22 15:34:47 +03:00
Yair Morgenstern
83471fb3cd Added Architecture tech 2018-06-22 15:24:22 +03:00
Yair Morgenstern
e592dc90a3 Added Steel tech 2018-06-22 13:28:24 +03:00
Yair Morgenstern
86ba484c78 Organized Physics tech, added Gunpowder 2018-06-22 13:25:42 +03:00
Yair Morgenstern
81e9cd317d Started normalizing tech tree to be like G&K - Added Guilds between Currreny and Chivalry 2018-06-22 13:07:52 +03:00
Yair Morgenstern
b8d9e432ef Fixed bug where if an enemy city expanded over your territory but you had a population working that tile, that population would be stuck there, and would remain unusable! 2018-06-22 12:21:57 +03:00
Yair Morgenstern
e0961e1b0b Unit table updates texts even if the unit hasn't changed 2018-06-22 10:41:53 +03:00
Yair Morgenstern
bed7a37a6b Cities connected to capital have a connected symbol next to them 
Unit information displays XP to next promotion
 2018-06-21 22:52:24 +03:00
Yair Morgenstern
415add2417 Loads of translation changes, especially for German! 
Changed font from Roboto to Arial because it contains some characters (e.g. for Romanian) that Roboto doesn't
 2018-06-20 23:11:02 +03:00
Filius-Patris
f92a64c8e3 Added German translation (#166) 2018-06-20 18:24:52 +03:00
Yair Morgenstern
3f87cfa3db Fixed silly regex bug which works differently on desktop and android 2018-06-19 20:01:49 +03:00
Yair Morgenstern
1aee88c5cd Added Companion Cavalry 2018-06-18 23:48:10 +03:00
Yair Morgenstern
0af880877f Added longbowman (Engand unique unit) 
Techs now don't display units that are unique to other civs, or the base unit if you have a unique that replaces it
 2018-06-18 23:33:49 +03:00
Yair Morgenstern
fa14b6eebe Cities can now idle by producing Nothing 2018-06-18 22:00:07 +03:00
Yair Morgenstern
aa11c49eec Many more things are now translated! 
Added more things to translate to translations.json
 2018-06-18 21:41:07 +03:00
Fantaziu Ion
df82a526d4
Major interface translations 
Added translation for main interface and gameplay strings (ru/it/fr/ro)
 2018-06-18 03:40:43 +02:00
Yair Morgenstern
5df93757f2 Added Bowman as first unique unit! 2018-06-17 23:39:25 +03:00
Yair Morgenstern
ed8e664358 Added Cover, March and Charge promotions 2018-06-17 23:08:16 +03:00
Yair Morgenstern
5fa9ad0640 Normalized city strength according to original civ game 
Added Walls and Castle buildings
 2018-06-17 19:47:01 +03:00
Yair Morgenstern
80963e7eac Added damage modification from basic promotions 2018-06-16 23:35:54 +03:00
Yair Morgenstern
c6caf0cecd Added promotions mechanism! 2018-06-16 22:50:11 +03:00
Yair Morgenstern
92abe0cf73 More translations! 2018-06-15 16:48:38 +03:00
Yair Morgenstern
bcd5f02bec Razed cities now have a fire icon next to them 2018-06-15 16:48:04 +03:00
Yair Morgenstern
d429c6585b Aded terrains, resources improvements and techs to the translation file 2018-06-15 15:04:25 +03:00
Yair Morgenstern
79971b05b8 Added more translations in the code 2018-06-14 23:20:25 +03:00
Yair Morgenstern
03f5f32f36 Golden age now also provides +20% to culture; added Golden Age tutorial 2018-06-14 22:47:04 +03:00
Yair Morgenstern
c815863124 Archers now require Archery (as should be!) 2018-06-14 21:00:44 +03:00
Yair Morgenstern
d2cb7173c1 AI now moved ranged units before melee, so that it will attack wil the ranged units first =) 2018-06-14 20:47:23 +03:00
Yair Morgenstern
b3a15d9d6e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-14 20:44:41 +03:00
yairm210
2e804dbd5e
Added notification text to translation json 2018-06-14 13:16:04 +03:00
Yair Morgenstern
5af940858b Added unhappiness tutorial + tutorial text is now a normal size 2018-06-14 08:42:59 +03:00
Fantaziu Ion
14ce37c932
Main translations added 
Main translations for italian/russian/french and romanian.
 2018-06-13 16:43:24 +02:00
Yair Morgenstern
0eb28ab679 Select box, text field and picker screens now look much nicer 2018-06-12 22:46:23 +03:00
Yair Morgenstern
66f2ad1f3e Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-06-12 22:44:07 +03:00
Yair Morgenstern
e1df4b4840 Cached fonts for reuse - generating them takes valuable time! 2018-06-12 21:38:40 +03:00
yairm210
7261fed191
Added lots of phrases in Translations.json 2018-06-12 13:00:25 +03:00
Yair Morgenstern
a380f7aa95 Battle table now displays "Captured" when attacking a city with no resistance 2018-06-12 09:10:02 +03:00