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

1954 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Yair Morgenstern
20450250bd Resolved #778 - AI construction would generate too many workers late-game 2019-05-18 23:30:52 +03:00
Brian Gainor
081ed9dc4a Check terrain requirements for buildings first 
If a city isn't next to a mountain, it shouldn't show Observatory with
"Needs a Library".
 2019-05-18 23:22:51 +03:00
Brian Gainor
cd77074045 Fix typos in Nations.json 2019-05-18 23:20:19 +03:00
sulai
73e397c2c2 Improved city button (#771) 
* improved CityButton

* keep city button out of the way if a unit on the city tile is selected

* fixed city button to be clickable always. however this hides units behind it

* added click area for city buttons in an own layer, so the units render in front and the city button click area handles the clicks

* city button: simplified code
 2019-05-18 23:09:02 +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
0e54a1b91c City button now looks normal when being razed or in resistance - before the health bar positioning ade the entire button totally out of whack 2019-05-17 14:26:07 +03:00
Yair Morgenstern
c98a6fc4d7 Resolved #758 - water melee units can now take cities (apparently this is a Vanilla vs G&K difference, I'll go with the G&K because it causes more interesting gameplay options) 2019-05-17 14:15:52 +03:00
Yair Morgenstern
862c714b47 Added city-state icon to diplomacy screen, so you know who's a city state and who's a major civ at a glance 2019-05-17 13:03:59 +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
martin
5e97d32898 keep city button out of the way if a unit on the city tile is selected 2019-05-16 19:42:34 +03:00
martin
e8a9157a65 improved CityButton 2019-05-16 19:42:34 +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
Yair Morgenstern
59e30529c4 Resolved #753 - can no longer pillage tiles of allied civs (that's an act of war) 2019-05-14 20:47:21 +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
martin
c11915c978 highlight unit action buttons to show their current action (sleep, fortify, set up) 
- works especially well for fortification, will not show that state in the unitTable any more where it caused a layout problem
- in case of set up it's now very clear if a unit is set up or not
 2019-05-14 17:07:01 +03:00
martin
1c3b44af16 idle unit buttons: set due=false and select the right unit in case of 2 units per tile 2019-05-14 17:07:01 +03:00
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