mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 02:16:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,695 Commits 6 Branches 1,040 Tags 1.2 GiB
7c6df3db7e
Commit Graph

5009 Commits

Author SHA1 Message Date
Yair Morgenstern
7c6df3db7e
Version rollout (#7940) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7932)

* One hungarian update (#7928)

I'm back, tried my best with this one.

* Update German translation (#7927)

* Update Spanish.properties (#7924)

* Update Japanese.properties (#7923)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* update Vietnamese (#7922)

* Update Traditional_Chinese.properties (#7921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update French.properties (#7919)

* Update Filipino.properties (#7918)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Russian.properties (#7917)

* Update Russian.properties

* Update Russian.properties

* Update Traditional_Chinese.properties (#7916)

* Update Brazilian_Portuguese.properties (#7915)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@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: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2022-10-22 20:24:46 +03:00
itanasi
55e6541ee0
Add Temperature Offset Slider (#7891) 
* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature

* A bunch of debug code
Make default Water Level -0.05 for Default

* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity

* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider

* Remove all debug code

* Undo Desert temp setting
 2022-10-22 20:12:57 +03:00
itanasi
c39aca7a31
Change Default Map Generation to Perlin (#7856) 
* Changes

* Slight adjustment to MainMenuScreen

* Make default waterThreshold for Default to be -0.05

* blip

* blip

* Rename cellular automata to Smoothed Random
 2022-10-22 20:11:55 +03:00
Yair Morgenstern
69d7f48893 Resolved #7115 - incorrect tile yields due to caching conditional uniques 2022-10-21 16:10:17 +03:00
qwerty
b0de127a07
BlockedHolyCity other way around (#7930) 2022-10-19 10:59:34 +03:00
Yair Morgenstern
24e8401fad Error deprecated uniques 2022-10-14 10:13:45 +03:00
MindaugasRumsa51
22a97855b1
show wars in global politics (#7887) 
* Update GlobalPoliticsOverviewTable.kt

* Update GlobalPoliticsOverviewTable.kt
 2022-10-13 23:05:43 +03:00
Yair Morgenstern
f0ad7581bc Resolved crash when mods make 2 techs require each other 2022-10-13 22:55:12 +03:00
Yair Morgenstern
f3b4db9d64 Hopefully resolved ANRs from WorldScreen updates 2022-10-13 21:18:34 +03:00
Yair Morgenstern
95205893b7 Deprecated old uniques 2022-10-13 20:46:48 +03:00
Yair Morgenstern
fdd5d0c796
Version rollout (#7914) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7913)

* Update Brazilian_Portuguese.properties (#7911)

fixing brazilian portuguese wrong translation

* Update Lithuanian.properties (#7909)

* Update Catalan.properties (#7908)

* Update Indonesian.properties (#7907)

* Update Italian.properties (#7906)

* Update Ukrainian.properties (#7905)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

smol fix

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#7903)

* update (#7902)

* Update Filipino.properties (#7900)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7899)

* Update Brazilian_Portuguese.properties (#7897)

* Update Spanish.properties (#7896)

* Update Russian.properties (#7895)

* Update Russian.properties

* Update Russian.properties

* tests fixed by removing bad translation

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: David Wesley <david.moura12@hotmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.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: deqtodo <94169613+deqtodo@users.noreply.github.com>
 2022-10-13 20:06:49 +03:00
Yair Morgenstern
ad8c4a1e97 Rename forOptionsPopup -> tryFixUnknownUniques 2022-10-12 12:28:14 +03:00
MindaugasRumsa51
08ba5736d0
Update TechManager.kt (#7912) 2022-10-12 09:11:40 +03:00
Yair Morgenstern
bbcae01e82 Resolved #7687 - Always reload translations and images when resuming game 2022-10-09 12:48:54 +03:00
Yair Morgenstern
5c973b0de5 Resolved #7846 - Don't show hidden improvements in nation info 2022-10-09 12:28:19 +03:00
nacro711072
ad72c42911
fix untranslated string about politics (#7901) 
* fix untranslated string about politics

* update shortcut about textbutton

* check all usage of template "[numberOfTurns] Truns Left"

* revert textbotton and add click event by chain.
 2022-10-07 12:36:00 +03:00
Yair Morgenstern
c4bac19bb2 Resolved #7878 - Handle errors when renaming multiplayer games 2022-10-07 11:40:54 +03:00
Yair Morgenstern
b8d1f1d801 Resolved #7893 - Military units take most efficient route to capture civilians 2022-10-06 17:46:55 +03:00
Yair Morgenstern
2ef0284235 4.2.12 2022-10-05 23:13:32 +03:00
Yair Morgenstern
07acbee9ad
Version rollout (#7894) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7885)

* Update Filipino.properties (#7874)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Fix grammar mistake (#7873)

* Fix grammar mistake

"Abandonada"?? Quién puso eso?? No pudo ser yo... o_o

* Update Spanish.properties

* update traditional_chinese.properties (#7872)

* Update Traditional_Chinese.properties (#7871)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#7868)

* Update Czech.properties (#7867)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Lithuanian.properties (#7866)

* Update Vietnamese.properties (#7865)

* update

* update

* Updated Brazilian_Portuguese.properties (#7864)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#7861)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Chris <cmanlove1234@outlook.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-10-05 23:10:52 +03:00
itanasi
91bb6fa89a
Create Cannot Move Unique (#7855) 
* Create Cannot Move Unique

* Covering other potential avenues of moving

* Remove transient, fix Air Units movement range UI

* Better fix for AirUnits
 2022-10-05 21:29:56 +03:00
Yair Morgenstern
2a740b9ede Converted dynamic listener classes into real classes 
PArt of a crazed bid for saving memory, triggered by #7876
 2022-10-02 22:42:15 +03:00
Xander Lenstra
364da94e5d
Fixed softlock forcing you to found a pantheon without available beliefs (#7883) 2022-10-02 15:50:08 +03:00
xk730
bf275cc1c4
Update GameParameters.kt (#7880) 
这为解决#7877中所提及的（notanyoneCanSpectate）提供了第二种解决方案
This provides a second solution to the (notanyoneCanSpectate) mentioned in # 7877
 2022-10-01 22:57:05 +03:00
Yair Morgenstern
6623991079
Version rollout (#7859) 
* Bump version and create initial changelog entry

* Update Catalan.properties (#7858)

* Update Catalan.properties

* Update Catalan.properties

* Update Simplified_Chinese.properties (#7845)

* Update Simplified_Chinese.properties

Small fixes

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties (#7841)

* translate some unit & beliefs.

* translate buildings

* translate some character name.

* Update Filipino.properties (#7840)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7837)

* update Vietnamese (#7836)

* update

* update Vietnamese

* update Vietnamese.properties

* update Vietnamese

* Update Italian.properties (#7835)

* Update Simplified_Chinese.properties (#7834)

* Update Lithuanian.properties (#7831)

* Update German translation (#7829)

* Update German translation

* Update German translation

* Update French.properties (#7827)

* Update Brazilian_Portuguese.properties (#7824)

* Update Indonesian.properties (#7823)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
 2022-09-25 16:37:56 +03:00
Xander Lenstra
e2187a268f
Fixed crash when getting a spy and expanding a city simultaneously (#7849) 2022-09-23 14:16:29 +03:00
Xander Lenstra
14d253fe24
Added a conditional for WLTKD (#7830) 2022-09-22 22:34:47 -07:00
nacro711072
77a1f4a6c1
fix: display "null" text on battleTable if the policy branch autocracy completely (#7843) 2022-09-22 11:48:18 +02:00
Timo T
72d0f2b6b7
Fix multiplayer turn checker option not showing up on Android (#7844) 
It should *only* show up on Android, this was caused by a logic fail in a refactoring.
 2022-09-21 16:58:20 +03:00
Yair Morgenstern
55c7183160
Version rollout (#7822) 
* Bump version and create initial changelog entry

* Update Polish.properties (#7818)

* Update Traditional_Chinese.properties (#7815)

* translate policy/technology/tile/building

* correct typo

* Update French.properties (#7813)

* Update Indonesian.properties (#7812)

* Translate vietnamese (#7810)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* update Vietnamese.properties

dịch full 4.2.9

* Update Vietnamese.properties

* Update Vietnamese.properties

* fix

* fix

* f

* Update Brazilian_Portuguese.properties (#7808)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#7803)

Few translations added

* Update Simplified_Chinese.properties (#7802)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#7801)

Two small fix

* Updated dutch translations (#7796)

* Updated dutch translations

* Fixed translation typos

* Used a better translation in dutch translation

Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>

* Update Vietnamese.properties (#7780)

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: BJiggers <113617818+BJiggers@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: marktermaat <mark.termaat+github@gmail.com>
Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
 2022-09-19 16:18:09 +03:00
Xander Lenstra
7f365423e1
Spies now show their current action and take time to move and set up (#7776) 
* Spies now show their current action and take time to move and set up

* Fixed tests

* Reviews

* More reviews
 2022-09-19 16:13:57 +03:00
Leonard Günther
d05b3d376b
Moddable UI skins (#7804) 
* Added SkinStrings and SkinConfig

TODO SkinCache

* Deprecated all old ui background getters

* Added SkinCache

for SkinConfigs to take effect

* Modable or moddable? idk ¯\_(ツ)_/¯

* Added separate alpha to config
 2022-09-19 16:13:09 +03:00
Yair Morgenstern
1256724ee3
Desktop settings initialize to fullscreen (#7821) 2022-09-19 16:12:49 +03:00
Yair Morgenstern
d34fd718c9
Special images for embarked units (#7819) 2022-09-19 16:12:40 +03:00
alexban011
d980b0d9ff
Global politics overview screen (#7469) 
* getting the data

* finished getting the data

* optimization + separator

* vrtical separators

* more functions

* made it look good

* reverted debug variables

* cleanup

* added icon

* credits

* translations

* removed redundant equalizeColumns

* removed redundant separator

* column headers

* reviews

* removed redundant function

* latest translations

* latest review

* checks 1

* removed space

* removed vars and used DiplomacyManager instead

* combined overview screens

* 2 more translations

* little cleanup and fix
 2022-09-19 16:12:24 +03:00
Yair Morgenstern
2bd705d43e
Version rollout (#7800) 
* Bump version and create initial changelog entry

* translate opening statement of civ. (#7798)

* Update Catalan.properties (#7789)

* Update German translation (#7786)

* Update Indonesian.properties (#7779)

* Update Simplified_Chinese.properties (#7778)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update android/assets/jsons/translations/Simplified_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Translate vietnamese (#7774)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* Update Brazilian_Portuguese.properties (#7773)

* Updated Lines from Unique Types

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Delete Brazilian_Portuguese.properties

* updated

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update French.properties (#7767)

* Update Italian.properties (#7765)

* Update Spanish.properties (#7764)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-09-15 16:09:08 +03:00
Xander Lenstra
8fd3b3194e
Enabled vietnamese (#7772) 
* Enabled vietnamese

* Fixed tests

* Fix tests (again)
 2022-09-15 16:02:14 +03:00
Xander Lenstra
5ae9b221fc
Starting in later eras triggers era uniques in all previous eras (#7787) 2022-09-15 16:01:10 +03:00
OptimizedForDensity
291b962f97
Generalize Great Wall unique (#7660) 
* Generalize Great Wall unique

* Update JSON entries

* And movement calculation too

* Rename other functions

* Cache movement penalty uniques

* Check destination tile instead of unit type
 2022-09-15 16:00:19 +03:00
nacro711072
708986c1de
fix wrong happiness point on resume game if adopt 'Cultural Diplomacy' policy. (#7793) 
* fix wrong happiness point on resume game.

* update.
 2022-09-13 13:58:58 +03:00
Yair Morgenstern
8fec196db1 Got rid of uppercase C in Unciv in ALL places! 2022-09-12 23:26:28 +03:00
xk730
3b8b1dee3b
Increased help button size (#7784) 
我试图将MainMenuScreen的helpButton放大了一点，因为有很多玩家向我抱怨说第一次查找时找不到这个按钮。
I tried to enlarge the helpButton of MainMenuScreen a little, because many players complained to me that they could not find this button the first time they searched.
 2022-09-12 02:00:34 -07:00
nacro711072
d65c756e4c
fix no victoryTypes for the first time gaming with "quick game" opion. (#7785) 2022-09-12 00:34:47 +03:00
Yair Morgenstern
351c6aa798
Solve CS placement clustering (#7783) 2022-09-12 00:33:22 +03:00
nacro711072
2157f1849e
Fixed: double unit while loading game from customFile. (#7771) 2022-09-10 08:06:31 -07:00
Yair Morgenstern
9a95825ed7
Version rollout (#7763) 
* Bump version and create initial changelog entry

* dịch thêm (#7760)

thêm fanpage và group UnCiv Việt Nam

* Update Simplified_Chinese.properties (#7753)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* update traditional_chinese.properties (#7752)

* update chinese.properties.

* update chinese.properties.

* Update Spanish.properties (#7751)

* Update Indonesian.properties (#7750)

* Update Filipino.properties (#7746)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7744)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
 2022-09-08 23:51:13 +03:00
Yair Morgenstern
ab1236683f
AI: Recognize when no further techs can be researched, even if some techs are blocked (#7755) 2022-09-08 22:48:58 +03:00
Xander Lenstra
11bfe93ce7
Fixed a wrongly implemented feature disabling pantheon founding (#7738) 2022-09-08 22:48:46 +03:00
Xander Lenstra
0542855f88
Spies give vision in cities in which they are stationed (#7762) 2022-09-08 22:48:35 +03:00
Yair Morgenstern
30c426959b
Resolves second part of #7708 - don't re-raise tech popups for previously researched techs (#7757) 2022-09-08 16:17:17 +03:00