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

1381 commits

Author SHA1 Message Date
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