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

1774 commits

This branch
This branch
All branches
Author SHA1 Message Date
martin
462dc26460 made on-map windows touchable, so you can't "touch through" them on the map 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
12f1b41784 fixed next turn button by updating it on main thread 2019-05-13 17:17:27 +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
martin
0ce55feb39 added a ? to the unit panel in the lower left and fixed jumping ui elements there 2019-05-13 17:17:27 +03:00
martin
dcb7daaabd minor ui fixes 2019-05-13 17:17:27 +03:00
etourdot
995ebb5cf8 #742: fix options screen bug when language changed 2019-05-13 17:09:11 +03:00
Yair Morgenstern
c9bd56da95 Resolved #732 - don't change peace negotiation deals depending on how much you dislike the enemy 2019-05-12 22:29:22 +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
42a0e2e771 Continuation of d2541e6, to better fit coding standards (everything worked fine) 
I reallly like the way you did this, so I'm making it enabled by default =D
 2019-05-12 19:29:02 +03:00
sulai
d2541e6c4a improved "next turn" - button (#741) 
* as long as there are units due to be checked by the player, replace "next turn" button by "next unit" button

* fixed the next-turn button to update within WorldScreen.update()

* moved due methods to CivilizationInfo.kt

* "next turn" button will also show "pick a tech" and "pick a policy" when needed

* added "check for idle units" to the game settings

* "check for idle units" - default to false
 2019-05-12 19:20:06 +03:00
Yair Morgenstern
cf9194f767 Other civ you're at war with is always at least Enemy, if not Unforgivable 2019-05-11 23:39:00 +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
Duan Tao
0e68a23d29 Fix crash. 2019-05-11 22:13:41 +03:00
Duan Tao
4ab118273b Transfer unique bulidings properly. 2019-05-11 22:13:41 +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
Duan Tao
3b30daf852 Code cleanup. 2019-05-10 18:20:07 +03:00
Duan Tao
91baeddde2 Fix crash from diplomacy screen. 2019-05-10 18:20:07 +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
2ac654e26b Fix first contact popup. 2019-05-09 18:54:43 +03:00
Duan Tao
c221d50e01 Add 2 more type of city-states. 2019-05-09 18:54:43 +03:00
Duan Tao
0b6422f9e7 Better check for culture buildings. 2019-05-09 18:04:05 +03:00
Duan Tao
029ab965d1 Legalism checks replaced culture building correctly. 2019-05-09 18:04:05 +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
f8a4f15f33 Separated City-state and Major civ diplomacy tables, because they're more different than similar at this point 
Centralized nation leader name
 2019-05-08 17:58:49 +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
ff508f22b0 Add border conflict counter for periodly popup. 2019-05-08 13:32:23 +03:00
Duan Tao
06f25b5b5b Fix peace popup with city-state. 2019-05-08 13:32:23 +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
Duan Tao
cb867f0066 Code improvement for city state border conflict. 2019-05-07 15:23:08 +03:00
Duan Tao
ad54fb3c56 Invading city-state border will damage relationship. 2019-05-07 13:55:11 +03:00
Duan Tao
30531316d2 Player can enter city-state borders. 2019-05-07 13:55:11 +03:00
Duan Tao
ef7b73ad5f Unlock city states. 2019-05-07 13:55:11 +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