Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,357 Commits 6 Branches 1,054 Tags 1.1 GiB
fix-queue-priority
Commit Graph

4528 Commits

Author SHA1 Message Date
yairm210
e16ac94d51 Fix tests 2025-01-05 12:03:05 +02:00
yairm210
e8f89ba1c7 More generic battle notifications 2025-01-05 11:57:15 +02:00
yairm210
b8383cb9ef More generic battle notifications 2025-01-05 11:45:54 +02:00
yairm210
a809348e72 . 2025-01-05 11:25:22 +02:00
yairm210
f493bdf7e0 New battle damage messages - to be translated before we move to the new format 2025-01-05 11:25:02 +02:00
yairm210
661d0b30a9 Added battle damage translation line when attacker is undamaged 2025-01-05 10:39:37 +02:00
yairm210
935dc2250b Added battle damage translation line when attacker is undamaged 2025-01-05 10:36:28 +02:00
yairm210
ff82b238f4 4.15.0 2025-01-04 20:35:41 +02:00
Yair Morgenstern
cb2295653d
Version rollout (#12748) 
* Bump version and create initial changelog entry

* Update Latin translation (#12740)

* Update Latin translation

* Fix translation

* Fix translation

* Revert.

* Redo

* Update Spanish.properties (#12736)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Brazilian_Portuguese.properties (#12733)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2025-01-04 20:09:09 +02:00
yairm210
e2f346490c Resolved #12417 - "Costs [amount] [stockpiledResource]" works for improvements 2025-01-04 20:08:55 +02:00
General_E
a4a403b104
Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands (#12725) 
* Settler settle best tile when not escort and dangerous Tiles instead of running away

Settler unit will now settle on best tile in dangerous Tiles without escort instead of running away.

* Update WorkerAutomation.kt

* Update SpecificUnitAutomation.kt

* Update WorkerAutomation.kt

* Update SpecificUnitAutomation.kt

* Now city states get mad when you steal their Lands

* new version

* change to getDiplomacyManagerOrMeet

* added text to template.properties and changed AlertPopup.kt

* Update template.properties

* with period at the end :b

* add flag now

* Made Option to declare war when a city state is bullied unavailable
 2025-01-04 20:05:08 +02:00
SpacedOutChicken
03869f5068
Edit Babylon's icon (#12739) 
This shifts the icon slightly down and to the left to make a more balanced appearance.
 2025-01-04 19:20:16 +02:00
yairm210
89c6331b45 4.14.19 2025-01-01 15:10:04 +02:00
Yair Morgenstern
aec9507f60
Version rollout (#12732) 
* Bump version and create initial changelog entry

* Update Russian.properties (#12731)

I kept seeing this space for 3 years of playing this game, and it makes my anxiety act like crazy, delete it please xD

* Update Brazilian_Portuguese.properties (#12727)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update German translation (#12723)

* Update Spanish.properties (#12720)

by z4TaN

* Update Latin translation (#12715)

* Update Latin translation

* Update translation

* Fix typo

* Update Italian.properties (#12714)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: shwwwa <shwwwa.dev@gmail.com>
Co-authored-by: altiereslima <altieres.lima@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2025-01-01 15:07:26 +02:00
SpacedOutChicken
841fc3090c
Change Babylon's image to Lamassu (#12730) 
* Add new Babylon image

Add Lamassu image to replace Babylon's current lion icon

* Update Credits.md for Bablyon icon

Change credits file to match Babylon's new image
 2025-01-01 14:53:51 +02:00
EmperorPinguin
32e74ee770
Update UnitPromotions.json (#12713) 
* Update UnitPromotions.json

* Update UnitPromotions.json

* Update UnitPromotions.json

* Update UnitPromotions.json

* Update UnitPromotions.json

* Update UnitPromotions.json

* Update UnitPromotions.json
 2025-01-01 14:50:01 +02:00
yairm210
49ac329d2b Disable minify :\ 2024-12-31 09:45:16 +02:00
yairm210
d352dfe53b Enable minify! #experimental 2024-12-30 11:22:51 +02:00
Yair Morgenstern
aedbc61c91 Update SDKs, library versions 2024-12-30 11:20:00 +02:00
Yair Morgenstern
4ec7b07040 Better proguard rules to enable r8 minification 2024-12-30 11:10:02 +02:00
yairm210
e224ae62ef 4.14.18 2024-12-25 20:54:14 +02:00
Yair Morgenstern
647484a5e0
Version rollout (#12709) 
* Bump version and create initial changelog entry

* Update Latin translation (#12708)

* Update Latin translation

* Update translation

* Fix translation

* Update Catalan.properties (#12700)

* Update French.properties (#12698)

* Update Brazilian_Portuguese.properties (#12696)

* Update Indonesian.properties (#12695)

Translation and corrections.

* Update Russian.properties (#12694)

* Update Russian.properties

* Update Russian.properties

* Update Croatian translation (#12693)

* update untranslated lines

* fix error

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: dadadnet <dadadnet38@gmail.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
 2024-12-25 20:46:03 +02:00
yairm210
f6c342f7cf 4.14.17 2024-12-22 11:01:21 +02:00
Yair Morgenstern
532022385d
Version rollout (#12692) 
* Bump version and create initial changelog entry

* Update Dutch.properties (#12684)

* Update Dutch.properties

* Update Dutch.properties

* Update Latin translation (#12683)

* Update Latin translation

* Update translation

* Fix translation

* Update translation

* Update translation

* Update translation

* Fix translation

* Update translation

* Update Italian.properties (#12674)

* Update French.properties (#12671)

* Update Russian.properties (#12670)

* Update Brazilian_Portuguese.properties (#12669)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Croatian translation (#12668)

* Translation of new entries and update instructions

* Formal form for gameplay and corrections

* update instructions

* Update Indonesian.properties (#12667)

Translation.

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: dadadnet <dadadnet38@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
 2024-12-22 10:18:26 +02:00
SeventhM
a6bacca0b7
Add unique for increased improvement rates rather than decreased build times (#12680) 
* Add unique for increased improvement rates rather than decreased build times

* Fix uniques

* Ruleset text

* Treat mad modder divide by zero
 2024-12-22 10:13:19 +02:00
yairm210
992100412d Fix rare Android crash where we don't have permissions to copy external mods on app start 2024-12-17 12:14:22 +02:00
yairm210
9f4828d55a 4.14.16 2024-12-16 15:10:22 +02:00
Yair Morgenstern
3356ddb205
Version rollout (#12665) 
* Bump version and create initial changelog entry

* Update Dutch.properties (#12664)

* Update Brazilian_Portuguese.properties (#12654)

* Update Croatian translation (#12651)

* minor corrections

* minor corrections 2

* fix formal and informal language

* grammar corrections

* Add Croatian instructions

* Update Simplified_Chinese.properties (#12648)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
 2024-12-16 14:56:03 +02:00
Toxile
c68b19470f
UI: standardised alignment and creation of options checkboxes, Unciv-themed slider buttons, multiplayer settings server text field layout and spacing (#12650) 
* [1]

* [2]

* [1]

* [3]

* [3]

* [4]

* Update template.properties
 2024-12-16 10:55:13 +02:00
yairm210
6f535f5c15 4.14.15 2024-12-14 18:53:34 +02:00
Yair Morgenstern
effddc03f3
Version rollout (#12647) 
* Bump version and create initial changelog entry

* Update Dutch.properties (#12630)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Latin translation (#12629)

* Update translation

* Update translation

* Update translation

* Update Croatian translation (#12621)

* Update cities of Byzantium, Kelts, Cartage and Maya

* update city names

* update city names 2

* translation of person names

* Gramatical gender in diplomacy and few corrections

* update city names and city name corrections

* translate remaining cities

* fix wording consistency

* minor corrections

* minor consistency corrections

* Correct translation of "request"

* Correct translation of "Button"

* Update Catalan.properties (#12620)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
 2024-12-14 18:40:57 +02:00
yairm210
0e1dfed64b Fixed Thai diacritic support 2024-12-11 11:40:37 +02:00
yairm210
66f9ed549b 4.14.14 2024-12-09 18:55:13 +02:00
SeventhM
1c25206dbb
Fix The Hague's english name (#12581) 2024-12-09 18:40:44 +02:00
Yair Morgenstern
f6025122a7
Version rollout (#12619) 
* Bump version and create initial changelog entry

* Update Latin translation (#12616)

* Update translation

* Update translation

* Update translation

* Fix translation

* Update translation

* Update translation

* Fix translation

* Update dutch translations (#12589)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Croatian translation (#12586)

* City name of native Americans

* Greek and Babylonian cities

* Update Egyptian cities and few terms

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
 2024-12-09 18:40:29 +02:00
yairm210
e143c76d63 Resolved #12601 - "Unit built" notification selects the built unit 2024-12-08 10:35:25 +02:00
itanasi
d745b10a1b
Crop images (#12583) 2024-12-06 12:06:05 +02:00
yairm210
19a1bbcdc3 4.14.13 2024-12-05 22:33:49 +02:00
Yair Morgenstern
cf276b5e68
Version rollout (#12574) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#12570)

* Added new translations

* Added more translations and corrections

* More translations

* Update Latin translation (#12569)

* Update Latin translation

* Update translation

* Update translation

* Update translation

* Update Brazilian_Portuguese.properties (#12568)

* Update Polish.properties (#12566)

* Added new translations (#12563)

* Added new translations

Added some new translations.

* Fixed [victoryType] issue

Fixed the issue where [victoryType] was missing in the translation.

* Update German translation (#12558)

* Update Russian.properties (#12557)

* Update Russian.properties

* Update Russian.properties

* Update Indonesian.properties (#12556)

Translation and corrections.

* Update Croatian translation (#12554)

* European, Russian and US cities

* Grammar fixes and corrections

* Cities of middle east and Asia

* cities of African continent, Byzantium and Cartage

* Orthography of names and Babylonian cities

* Partial consistency check for formal and informal form

* formal and informal check

* check transliteration of foreign personal names

* update city names

* Update French.properties (#12553)

* Update Italian.properties (#12552)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Bryan Tabares <53207975+abaddon431@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: SHypoleac <michal.wolonciej@interia.pl>
Co-authored-by: vojtechblazek <138218528+vojtechblazek@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: dadadnet <dadadnet38@gmail.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2024-12-05 22:24:30 +02:00
yairm210
03214379f2 perf(mem): Create one TileSetStrings shared across all terrain emojis 2024-12-05 19:39:14 +02:00
yairm210
c011a254d9 Fixed translations 2024-12-03 22:25:37 +02:00
Rob Loach
199eacfe17
hexarealm: Fix Snow Lake edge name (#12562) 2024-12-03 22:03:01 +02:00
yairm210
1c0ba1f20b 4.14.12 2024-12-02 20:15:31 +02:00
Yair Morgenstern
cadcab41e8
Version rollout (#12551) 
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#12549)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Typo

* Update Ukrainian translations (#12547)

Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>

* Update Latin translation (#12543)

* Update Latin translation

* Update translation

* Update Croatian translation (#12535)

* minor corrections

* Partial translation of city names

* Partial translation of tutorial 2

* Minor corrections and partial tutorials translation

* Finalize translation of tutorials and civilopedia

* English cities and difficult words

* French, Russian, German and Spanish city names

* Religion names and Greek, Ottoman, Persian and Danish cities

* names and Roman, Swedish and Byzantium cities

* minors corrections 2

* Babylonian, Egyptian and Japanese cities

* Indian cities and difficult words

* Ethiopian cites

* Chinese cities and corrections

* minor corrections

* City names corrections for vanilla Unciv and grammar corrections

* City names correction for GNK

* Update Spanish.properties (#12534)

* Update Spanish.properties

Translated two new lines.

* Fix spelling mistake

* fix tests

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: gabrielseven <72280913+gabrielseven@users.noreply.github.com>
Co-authored-by: Kostiantyn Ko <test9@mormat.name>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: U+1F596 <101731484+JTech-Labs@users.noreply.github.com>
 2024-12-02 20:11:34 +02:00
yairm210
cff67ddb5b Resolved #12546 - Spies assigned to cities moved to other civs are returned to hideout 2024-12-02 19:18:08 +02:00
yairm210
8a376de6c3 Resolved #12544 - multiline unique descriptions hidden in doc 2024-12-02 18:19:56 +02:00
yairm210
eb3d8c9c01 Better text: the religion we spread may not be ours 2024-12-02 14:51:07 +02:00
yairm210
0150076f18 Removed 'please' from Civ demands to make them more demand-y 2024-12-02 14:39:30 +02:00
yairm210
306907568d 4.14.11 2024-11-27 23:22:35 +02:00
Yair Morgenstern
3d1bd65c09
Version rollout (#12533) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#12530)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Croatian translation (#12526)

* Translate technologies and terrains

* Translate tile improvements, tile resources, unit promotions, units, unit types, victory types and beliefs

* Translate Gods & Kings

* Partial translation of tutorials

* check and fix grammar

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
 2024-11-27 23:14:40 +02:00