mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-09 02:25:03 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,331 Commits 6 Branches 1,050 Tags 1.1 GiB
772531a35f
Commit Graph

156 Commits

Author SHA1 Message Date
Yair Morgenstern
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
Yair Morgenstern
243647dea6 3.15.2 2021-06-18 10:08:59 +03:00
Yair Morgenstern
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
SomeTroglodyte
07a43f3f1a
Fix crash caused by cascaded ruins unit gifts (#4133) 
* Fix d1f6c5ac breaking builds

* Fix d1f6c5ac breaking builds - patch1

* Fix silent crash when ancient ruins cascade gifted units
 2021-06-14 14:44:43 +03:00
Yair Morgenstern
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
Yair Morgenstern
a5d2b2f154 3.14.16 2021-06-10 14:49:08 +03:00
SomeTroglodyte
337b9c62fd
Nations spellcheck (#4094) 2021-06-10 14:22:16 +03:00
Yair Morgenstern
8228d62d43 3.14.15 2021-06-07 22:47:52 +03:00
Aron de Jong
cd58f6ace8
Refund wasted production as gold (#4058) 
* Refund wasted production as gold

Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).

We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.

When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.

* Implement wonder refund and obsolete unit upgrade

If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.

If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.

* Shorten notification messages

* Update alerts: been obsolete -> become obsolete
 2021-06-07 22:04:33 +03:00
Yair Morgenstern
a1b0a90506 3.14.14 2021-06-04 14:33:22 +03:00
Yair Morgenstern
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
Yair Morgenstern
d7c0cc593a 3.14.12 2021-05-28 15:02:11 +03:00
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
Yair Morgenstern
fd5125904a 3.14.10 2021-05-20 22:49:40 +03:00
Yair Morgenstern
106cbb79c3 3.14.9 2021-05-18 01:07:17 +03:00
Yair Morgenstern
4f1798146c 3.14.8 2021-05-11 00:44:36 +03:00
Yair Morgenstern
0f0de8a221 3.14.7 2021-05-08 23:54:29 +03:00
Yair Morgenstern
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
Yair Morgenstern
2b6c9e7ec0
Translations update (#3826) 
* Chinese translation update (#3825)

* Update Czech.properties (#3815)

* Update Czech.properties

Note for czech translators:
Zakulacený svět zní divně, ale nevím, jak jinak to přeložit. Budu rád za nápady.

* Update Czech.properties

* Update Italian.properties (#3812)

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-04-21 21:59:13 +03:00
Yair Morgenstern
e270b017d4 3.14.2 2021-04-18 21:56:18 +03:00
Yair Morgenstern
5e1a21cd84 Fixed unitType parameters in changed unique 2021-04-14 21:57:58 +03:00
Yair Morgenstern
daab799b3a 3.14.1 2021-04-14 19:51:31 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
Yair Morgenstern
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
Yair Morgenstern
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
Yair Morgenstern
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
Yair Morgenstern
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
lishaoxia1985
d7214b7a46
Method getImprovementIcon can Setsize for all icon (#3685) 
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
 2021-03-15 21:00:09 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +02:00
Yair Morgenstern
48a330fddc 3.13.0 2021-02-13 21:52:33 +02:00
Yair Morgenstern
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
Yair Morgenstern
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
GGGuenni
679ca2ba6c
changed case sensitivity (#3577) 
somehow I forgot to change most of the texts
 2021-02-04 21:50:44 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
Yair Morgenstern
31ef5fdc77
Translations update (#3576) 
* Update Traditional_Chinese.properties (#3571)

* Update German.properties (#3569)

* Update Indonesian.properties (#3566)

* Update Russian.properties (#3564)

Co-authored-by: SiderealArt <30827929+SiderealArt@users.noreply.github.com>
Co-authored-by: Johannes <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2021-02-04 19:23:08 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572) 
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
 2021-02-04 19:13:01 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
Yair Morgenstern
aa944bad87 3.12.10 2021-01-26 22:46:47 +02:00
Yair Morgenstern
38025785b7 3.12.9 2021-01-16 21:57:30 +02:00