Commit Graph

683 Commits

Author SHA1 Message Date
c83844f600 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-05-22 22:08:14 +03:00
798adad4a9 Update Other.json
More Italian translations.
2019-05-22 22:07:59 +03:00
ea9c9da48d Added missing notification translations (#792) 2019-05-22 22:07:50 +03:00
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
c8c3370cb9 show "rough terrain" property in Civilopedia 2019-05-22 21:57:14 +03:00
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +03:00
f46baec89f Resolved #770 - City-states now colored as per original civ, with black primary color 2019-05-20 22:03:43 +03:00
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
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
d07e406510 Update Other.json
You forgot a phrase.
2019-05-20 19:49:57 +03:00
22c45af5d8 Update Nations_Italian.json 2019-05-20 16:18:24 +03:00
00ef4d171c Removed portuguese misspelling 2019-05-19 22:04:56 +03:00
b24d21331e Update Other.json (#773)
Another Italian translation
2019-05-19 17:02:25 +03:00
85e0f892d5 Fixes for 700caf3 2019-05-19 07:32:13 +03:00
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
cd77074045 Fix typos in Nations.json 2019-05-18 23:20:19 +03:00
054b3b000d Resolved #752 - Added big friendship penalty for betraying declaration of friendship 2019-05-17 15:00:24 +03:00
2e16a96c4d Can no longer gift city states with gold you don't have 2019-05-16 22:08:45 +03:00
1f498f3fa6 Update Other.json
Added Italian translations
2019-05-16 19:45:38 +03:00
f6a26aaee3 Update Notifications.json
Added Italian translations.
2019-05-16 19:44:02 +03:00
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
85b7607d58 Update Other.json
Another Italian line fixed
2019-05-15 16:37:53 +03:00
6c7edd60ac Update Notifications.json 2019-05-15 14:19:02 +03:00
ced4840e8e Update Buildings.json 2019-05-15 14:18:49 +03:00
be911d8903 Update Other.json
Improved Translations
2019-05-15 14:18:31 +03:00
cc2c9c3487 Update Nations_Italian.json 2019-05-15 14:18:17 +03:00
17a856c0a5 Update Other.json 2019-05-15 14:17:58 +03:00
1bc40b01b4 Update Notifications.json 2019-05-15 14:17:58 +03:00
7b34277a7e Update Other.json 2019-05-15 14:17:58 +03:00
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
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
5463e36cca Update Other.json
Improved Italian translations
2019-05-13 18:04:08 +03:00
e348687bce Update Policies.json 2019-05-13 18:03:37 +03:00
e9700937f7 Update Units,Promotions.json
Improved Italian translation.
2019-05-13 18:01:47 +03:00
eaa0a9dbad when a unit is selected, use the ? button to read about it in the Civilopedia 2019-05-13 17:17:27 +03:00
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
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
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
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
52a676f5cb Add French Tutorial 2019-05-10 18:20:54 +03:00
656246cd10 all chinese font can be show well 2019-05-10 18:20:27 +03:00
93bf8333ca update some diplomacy words in chinese 2019-05-10 18:20:27 +03:00
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
c221d50e01 Add 2 more type of city-states. 2019-05-09 18:54:43 +03:00
7db1298ded Update Other.json 2019-05-08 22:01:01 +03:00
d0c9f57fc9 Update Other.json
Updated Italian translations.
2019-05-08 22:01:01 +03:00
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
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
3106127dc4 Update Units,Promotions.json
Italian translation for Instant Cure and its effects
2019-05-08 16:40:11 +03:00
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00