mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-30 17:34:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,144 Commits 6 Branches 1,045 Tags 1.2 GiB
587b1f40f1
Commit Graph

8144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
b669c2ab1b Units are not displaced to enemy land when kicked out of borders 2023-01-08 11:45:08 +02:00
Yair Morgenstern
fe6c19532a UI: Better unit table 2023-01-07 22:12:31 +02:00
Yair Morgenstern
a233cbc43a Resolve #8322 - fix Faith tutorial text 2023-01-07 21:13:15 +02:00
vegeta1k95
8b0a29425a
Refactored and commented GameInfo.nextTurn() (#8296) 
* Refactored and commented GameInfo.nextTurn()

* Little nitpicks

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-07 19:31:18 +02:00
vegeta1k95
a5f68612ad
Better visibility for city status icons (#8329) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-07 19:27:55 +02:00
nacro711072
6263b196cd
Refactor maptype & resolve map setting issue (#8328) 
* Add [MapGenerateMainType] to separate with [MapType].

* Add missing import.
 2023-01-07 19:27:02 +02:00
nacro711072
d01d9e31eb
update screen after disband unit. (#8326) 2023-01-07 19:25:18 +02:00
Yair Morgenstern
bdad914b87 4.3.17 2023-01-05 16:26:22 +02:00
Yair Morgenstern
52e3540936
Version rollout (#8315) 
* Bump version and create initial changelog entry

* Update German translation (#8313)

* Update Spanish.properties (#8311)

* Update Brazilian_Portuguese.properties (#8310)

* Fill in missing Ukrainian translations (#8309)

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

* Update French.properties (#8308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-01-05 16:16:44 +02:00
Yair Morgenstern
33eaff14a4 Promote button sticks out more 2023-01-05 15:56:58 +02:00
Yair Morgenstern
60f1f77fd1 AI tries to stop civs who are about to win Scientific/Cultural victory 2023-01-05 15:55:46 +02:00
Yattong the Mackerel
d69c645035
Fixing duplocation (#8314) 
[0516] It looks like your map can't be saved! = 
[0685] Multiplayer = 
[1155] National ability = 
[1357] Version = 
[1508] Location = 
[1599] Filter: = 
[1600] Enter search text =
 2023-01-05 15:39:05 +02:00
Yair Morgenstern
a0ff4c18d5 Worker automation no longer considers foreign unique improvements when deciding if to remove features 2023-01-05 13:52:17 +02:00
Yair Morgenstern
3e2a2a74f5 Resolve #8307 - no double copies of offers on AI trade counterproposals 2023-01-05 13:36:12 +02:00
Yair Morgenstern
5941beba26 Non-replacing buildings display uniques nicely in nation picker 2023-01-05 13:13:52 +02:00
Yair Morgenstern
6c708d537f Fixed Air Sweep mechanic 2023-01-04 19:39:30 +02:00
Yair Morgenstern
65d81245d2 Translated display sizes - #6131 2023-01-04 18:39:55 +02:00
Yair Morgenstern
da0793e9fd Disbanding units move to next unit only after disbanding 2023-01-04 16:10:33 +02:00
Yair Morgenstern
a47984dad6 4.3.16 2023-01-04 15:59:23 +02:00
Yair Morgenstern
81b08dd73f
Version rollout (#8306) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8303)

* Update Korean.properties (#8299)

* Update Korean.properties

* Update Korean.properties

* Update Brazilian_Portuguese.properties (#8292)

* Update German translation (#8290)

* Update German translation

* Update German translation

* Update Italian.properties (#8289)

* Update French.properties (#8287)

* Update Indonesian.properties (#8286)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2023-01-04 15:51:18 +02:00
Philip Keiter
040770a39a
Use removeTerrainFeatures and addTerrainFeature instead of setTerrainFeatures so serialization will work. (#8302) 2023-01-04 15:44:41 +02:00
vegeta1k95
5aca35c244
Added various styles for displaying resource icons (#8298) 
* Added various styles for displaying resource icons

* Removed options, implemented background type color-coding + amount indicator

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-04 15:42:51 +02:00
Yattong the Mackerel
0be1794e94
Update template.properties (#8305) 2023-01-04 15:42:00 +02:00
Yair Morgenstern
2bd59b2147 Resolve #4758 - Humidity/Temperature restrictions work on terrain features 2023-01-03 23:17:25 +02:00
Yair Morgenstern
6f5edbae0c Resolve #4811 - Allow mass unit upgrades from the unit overview screen 2023-01-03 23:04:10 +02:00
Philip Keiter
1532216335
Add new game option to randomly select from map options. (#8271) 
* Add new game option to randomly select from map options.

* Remove unused isPortrait.

* Remove unused isPortrait.

* Make other settings collapsable when using random generated.

* Make Random Generated settings start collapsed. Make padding consistent.

* Remove colons from ExpanderTab titles.

* Append "Enabled" before random map options.

* Append missing = in template.

* DRY the world wrap warning.

* Update JavaDoc of MultiCheckboxTable.
 2023-01-03 21:56:41 +02:00
vegeta1k95
0301cc89d4
Modding: allow for custom TechPortraits (#8300) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-03 19:48:08 +02:00
Ouaz
1c85388ee8
Translate "Sell" in city screen (#8297) 2023-01-03 00:40:34 +02:00
vegeta1k95
3b7b54aab6
Barbarian Civ icon (#8295) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-02 19:20:51 +02:00
vegeta1k95
72eb9504b8
Fixed PolicyScreen branches requirements text (#8280) 
* Fixed PolicyScreen branches requirements text

* Generify conditionals text pattern

* Remove GlobalAlert uniques from displaying in Policy descriptions

* Fix translations

* Fix freeze on "Tiny" displays

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-02 18:48:11 +02:00
Yair Morgenstern
ec50729767 Resolve #6551 - Calculate 'tiles can reach this turn' correctly with combinations of roads + railroads 2023-01-02 16:58:28 +02:00
vegeta1k95
d752b0b5c9
Fix connecting lines edges (#8291) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-02 15:29:52 +02:00
Yair Morgenstern
d4bd4dc4b2 Resolve #8127 - If several improvements can provide a resource, workers pick the one that gives the most yields 2023-01-02 09:43:53 +02:00
Yair Morgenstern
f2ad07a96c 4.3.15 2023-01-01 16:25:29 +02:00
Yair Morgenstern
2ce16696bd
Version rollout (#8285) 
* Bump version and create initial changelog entry

* Update Korean.properties (#8284)

* Updated Brazilian_Portuguese.properties (#8275)

* Update Spanish.properties (#8270)

* Update French.properties (#8269)

* Update Italian.properties (#8267)

* Update Polish.properties (#8266)

* Fixed Polish translations

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
 2023-01-01 16:22:34 +02:00
Yair Morgenstern
d20f8a53f8 Validate unique parameters for mods 2023-01-01 15:55:41 +02:00
Yair Morgenstern
9cf47e9f48 Display protecting civs for city-states 2023-01-01 14:59:58 +02:00
Yair Morgenstern
96172c67d4 Resolved #8251 - units check if they can capture enemy units by whether they *will* be embarked, not by whether they *are* embarked 2023-01-01 14:34:08 +02:00
Yair Morgenstern
ba7a9708e2 Rename isPlayerCivilization -> isHuman 2023-01-01 14:03:34 +02:00
Yair Morgenstern
7bc924f76f 4.3.14-patch1 2022-12-31 20:10:29 +02:00
letstalkaboutdune
5b2997df46
Added credits for trailer (#8278) 
* Added credits for trailer

* Corrected typo
 2022-12-31 20:05:41 +02:00
vegeta1k95
41b5cfa9b1
Fixed crash when policy prerequisite is a branch (#8273) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-30 14:30:02 +02:00
CrispyXYZ
38d13570a7
Fix another untranslated String in Policy Screen (#8272) 2022-12-30 11:13:54 +02:00
letstalkaboutdune
b5a021cc16
SFX Update - Arrow, Crossbow (New), Metal Hit (#8262) 
* Arrow, Crossbow, Metal Hit sound updates

Sourced from pixabay.com
https://pixabay.com/service/license/

* Update Credits.md
 2022-12-29 23:20:33 +02:00
alexban011
0273f8a38b
added buttons for controlling music (#8256) 
* added buttons for controlling music

* translations

* checks

* added `Music` to translations
 2022-12-29 21:20:45 +02:00
Yair Morgenstern
fb62ddb711 4.3.14 2022-12-29 15:51:13 +02:00
Yair Morgenstern
deef19b5bb
Version rollout (#8265) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#8264)

* Update French.properties (#8259)

* Update Korean.properties (#8254)

* Update Italian.properties (#8253)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#8245)

* Update Spanish.properties (#8244)

Co-authored-by: yairm210 <yairm210@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: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-12-29 15:46:53 +02:00
vegeta1k95
d4ec1852d5
Fix PolicyScreen branches positioning (#8238) (#8258) 
* Fix PolicyScreen branches positioning (#8238)

* Fix PolicyScreen branches positioning (#8238)

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:54:13 +02:00
vegeta1k95
a751c8e3dc
Fixed TechButton progress-bar padding, less rounded corners for buttons. (#8260) 
* Fixed TechButton progress-bar padding, less rounded corners for buttons.

* Removed extra padding on the right

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:52 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257) 
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2022-12-29 13:52:35 +02:00