mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-05 00:18:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,432 Commits 6 Branches 1,048 Tags 1.1 GiB
b921898217
Commit Graph

352 Commits

Author SHA1 Message Date
Yair Morgenstern
f73916ac3b 3.19.16 2022-03-10 19:52:29 +02:00
Yair Morgenstern
83e9aaf1d3
testy (#6312) (#6313) 2022-03-09 14:31:17 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
Yair Morgenstern
fef2797341 3.19.14-patch1 2022-03-07 13:06:58 +02:00
Yair Morgenstern
03aa489dca 3.19.14 2022-03-05 20:26:01 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
0d3a0ef7e3 Resolved untranslated texts as per #6131 
- Added unique targets as lines to translate so they'll appear in BattleTable
 2022-02-13 10:34:50 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00
Yair Morgenstern
8fda18db42 3.19.6 2022-02-07 11:27:51 +02:00
Yair Morgenstern
4f421dc44f 3.19.4 2022-02-01 10:06:47 +02:00
Yair Morgenstern
0f4449f2e9 3.19.3 2022-01-29 23:40:43 +02:00
Yair Morgenstern
6855a52466 3.19.2 2022-01-26 22:55:30 +02:00
Yair Morgenstern
336e190ff0 3.19.1 2022-01-24 11:56:00 +02:00
yairm210
682d65f02e 3.18.19 2022-01-19 14:47:43 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Yair Morgenstern
838b797699
Translations update (#5986) 
* Update English.properties. (Remove no-op translations.) (#5977)

* Update Spanish.properties (#5970)

* Update Italian.properties (#5966)

* I made some changes to the simplified Chinese translation file.  (#5987)

* Minor polishing up for accuracy and some translation

* Additional translation

* Update Simplified_Chinese.properties

Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
 2022-01-16 19:50:07 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized. 
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
 2022-01-16 19:10:30 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976) 
* Explain when cities can't be razed.

* Light refactoring and reword.

* Add update notice in translation strings.
 2022-01-16 18:43:33 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00
yairm210
8311e65120 Victory types capitalized 2022-01-14 12:21:53 +02:00
yairm210
e7042d24ea City state permutations normalized to "City-State" 
#5963
 2022-01-14 12:16:16 +02:00
yairm210
462ae2dad0 3.18.17 2022-01-14 10:49:22 +02:00
yairm210
480beb83b3 3.18.16 2022-01-09 22:34:44 +02:00
xlenstra
e68bd143d9 3.18.14 2022-01-02 21:56:24 +01:00
yairm210
0d78659e49 3.18.13 2021-12-29 00:01:42 +02:00
yairm210
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
yairm210
c70ac334bd 3.18.11 2021-12-20 21:25:17 +02:00
yairm210
0c1509bfe8 Resolved problem in new uniques with multiple parameters of the same name 
Relevant to #5783 and #5781
 2021-12-11 20:23:31 +02:00
yairm210
b537f9e386 Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes 2021-12-10 15:34:17 +02:00
yairm210
3dfb0aec70 3.18.8 2021-12-07 22:12:05 +02:00
yairm210
0d4da03b7c 3.18.7 2021-12-05 21:23:04 +02:00
yairm210
9950e963bc Resolved #5742 - removed extraneous empty lines from translation files 2021-12-04 23:13:43 +02:00
yairm210
9edc713d5c 3.18.6 2021-12-03 11:33:18 +02:00
yairm210
84e600786c 3.18.5 2021-11-27 20:08:47 +02:00
yairm210
29dfb3b20d 3.18.4 2021-11-21 21:14:42 +02:00
yairm210
8ddbe3b2b7 3.18.3 2021-11-19 12:13:23 +02:00
yairm210
eefe499fff 3.18.1 2021-11-12 00:35:57 +02:00
yairm210
de83383c8b 3.18.0 2021-11-08 19:52:09 +02:00
yairm210
8f216b3662 3.17.14 2021-11-02 18:17:20 +02:00
yairm210
405c561d5e Replaced "Map Height" with "Map Elevation" 2021-10-31 23:15:42 +02:00
yairm210
c8f2d337c3 3.17.13 2021-10-30 20:41:59 +03:00
yairm210
87d24e89c4 3.17.12 2021-10-27 21:23:20 +03:00
yairm210
3ae6d675cd 3.17.10 2021-10-20 21:20:24 +03:00
yairm210
ef2f2eccde 3.17.9 2021-10-17 21:23:58 +03:00
yairm210
f1f2c1e932 3.17.8 2021-10-13 23:27:39 +03:00
yairm210
5468821edf 3.17.7 2021-10-10 22:41:46 +03:00
yairm210
81ebacc310 3.17.6 2021-10-08 17:02:29 +03:00
yairm210
2b75124081 3.17.5 2021-10-06 18:35:41 +03:00
yairm210
8ca14eac55 3.17.4 2021-10-03 12:22:38 +03:00
yairm210
9fe19d0d52 3.17.3 2021-09-30 01:04:08 +03:00
yairm210
9b2c39321c 3.17.2 2021-09-26 14:07:40 +03:00
yairm210
98f14523ed Add all cityFilter strings from the 'source of truth', since many were missing from translation file 2021-09-22 19:47:31 +03:00
yairm210
0771cb1fad 3.17.1 2021-09-22 18:50:17 +03:00
Xander Lenstra
ce5a82c763
Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
yairm210
ef7676183d 3.17.0 2021-09-19 21:04:34 +03:00
yairm210
b0a169cf01 Translation generation so translators won't have to merge conflicts 2021-09-17 14:12:08 +03:00
yairm210
f9e0c39021 3.16.15 2021-09-14 11:37:20 +03:00
yairm210
70c3b4bd65 3.16.14 2021-09-11 23:18:35 +03:00
yairm210
e81d8ff646 3.16.13 2021-09-08 23:06:10 +03:00
yairm210
6567088efe 3.16.12 2021-09-05 15:10:21 +03:00
yairm210
7c3f8ce661 3.16.11 2021-09-02 21:03:18 +03:00
yairm210
a77e8015e1 3.16.10 2021-08-30 23:30:09 +03:00
yairm210
6a3fddc757 3.16.9 2021-08-29 01:43:22 +03:00
yairm210
30e5ac3665 3.16.8 2021-08-26 17:45:17 +03:00
yairm210
e62fdc2218 3.16.7 2021-08-23 21:11:21 +03:00
Xander Lenstra
40e35b2167
Fixed interpunction & typos in the tutorial (#4941) 
* Fixed interpunction & typos in the tutorial

* Fixed old translations not being removed (unless words were changed)
 2021-08-22 14:08:42 +03:00
yairm210
7228b2d4ae 3.16.6 2021-08-21 21:22:24 +03:00
yairm210
eb8e76ba08 3.16.5 2021-08-19 20:49:08 +03:00
yairm210
c1acda6c6b 3.16.4 2021-08-15 22:04:12 +03:00
yairm210
c100d5fb09 3.16.3 2021-08-12 20:58:48 +03:00
Yair Morgenstern
7cd368d024 3.16.2 2021-08-08 23:20:44 +03:00
Yair Morgenstern
8394930d6d 3.16.1 2021-08-06 15:21:57 +03:00
Yair Morgenstern
000ef80c0f 3.16.0-patch1 2021-08-04 18:36:43 +03:00
Yair Morgenstern
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
Yair Morgenstern
f3c0c5d202
Translations update (#4714) 
* Turkish Translations (#4695)

* Turkish Translations

those translations are for 3.15.16, new lines could be added by then i dont know

* Update Turkish.properties

* Update Korean.properties (#4687)

* Update Russian.properties (#4684)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Swedish.properties (#4683)

Translated the newly added lines.

* Update Italian.properties (#4681)

* Update Indonesian.properties (#4679)

* Fixed errors

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2021-08-01 21:25:30 +03:00
Yair Morgenstern
692cbaa84a 3.15.17 2021-07-30 16:28:17 +03:00
Yair Morgenstern
71df35622f Resolved #4675 - Fertility Rates -> Fertility Rites 2021-07-30 15:08:32 +03:00
Yair Morgenstern
221f45b966 3.15.16 2021-07-27 23:27:41 +03:00
SomeTroglodyte
34717008b8
Civilopedia phase7 (#4628) 
* Civilopedia phase 7 - Terrain

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

* Civilopedia phase 7 - Terrain - patch2 for #4641
 2021-07-27 10:41:25 +03:00
Yair Morgenstern
bc1455de2a 3.15.15 2021-07-25 19:49:39 +03:00
Yair Morgenstern
7a42ab3e99 Resolved #4394 - corrected misspelled city names 2021-07-23 16:34:04 +03:00
Yair Morgenstern
f2697ee8a1 3.15.14 2021-07-22 20:39:24 +03:00
SimonCeder
239a406bc4
Added Sweden Civ (#4566) 
* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic
 2021-07-20 17:06:15 +03:00
Yair Morgenstern
bdf46ea66c 3.15.13 2021-07-19 22:31:55 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557) 
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
 2021-07-19 00:30:10 +03:00
Yair Morgenstern
60bcc8f1cf 3.15.12-patch1 2021-07-16 09:23:49 +03:00
Yair Morgenstern
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
Yair Morgenstern
573eacb8c9 3.15.11 2021-07-12 22:03:14 +03:00
Yair Morgenstern
5a0eb11bd0 3.15.10 2021-07-10 23:56:06 +03:00
Yair Morgenstern
0cc3b6f550 Resolved #4457 - spelling mistakes 2021-07-10 23:22:44 +03:00
Yair Morgenstern
cc3146f92b Actual translations 2021-07-09 10:17:22 +03:00
Yair Morgenstern
ecd5ae5128 3.15.9 2021-07-07 20:54:19 +03:00
Yair Morgenstern
b748f92bb5 3.15.8 2021-07-04 21:09:17 +03:00
Yair Morgenstern
c91e94ae03 Translations update 2021-07-03 23:02:41 +03:00
Yair Morgenstern
95ae1cea30 3.15.7 2021-07-01 22:44:36 +03:00
Yair Morgenstern
0b6510a39c 3.15.6 2021-06-29 23:15:57 +03:00
Yair Morgenstern
c380d6e7b7
Translations update (#4306) 
* Update Korean.properties (#4305)

* Missing single quotation mark in quote (#4297)

* Missing single quotation mark in quote

Inserted ' in quote of Advanced Ballistics

* Changed quote in all language files

* Update Swedish.properties (#4282)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Russian.properties (#4269)

* Update Russian.properties

Translated new strings

* Update Russian.properties

Some fixes and improvements

* Update Russian.properties

Made some improvements

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#4267)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update German.properties (#4281)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-06-29 22:35:42 +03:00
SomeTroglodyte
ca58cf1694
Translation template fixes (#4287) 
* Translation template fixes

* Translation template fixes - patch

* Translation template fixes - another
 2021-06-27 21:22:47 +03:00
Yair Morgenstern
7b7101b0b7 3.15.5 2021-06-25 17:42:35 +03:00
Yair Morgenstern
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
Yair Morgenstern
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
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
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
e270b017d4 3.14.2 2021-04-18 21:56:18 +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
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
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
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