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,644 Commits 6 Branches 1,040 Tags 1.2 GiB
2bd705d43e
Commit Graph

4974 Commits

Author SHA1 Message Date
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
Yair Morgenstern
b11c01bfdc
Resolve #7625 - show Unciv icon when loading game, instead of happy face (#7756) 2022-09-08 16:17:05 +03:00
Leonard Günther
35e225b68f
Replaced BackgroundActor companion (#7749) 
as it was interfering with the moddable UI
 2022-09-07 12:18:47 +03:00
nacro711072
7a1c025e10
fix: lateinit property cityInfo has not been initialized issue. (#7739) 
* fix: lateinit property cityInfo has not been initialized issue.

* use loop instead of foreach.
 2022-09-05 08:15:58 +02:00
Leonard Günther
f4dc138186
Moddable UI Skins [Basics] (#7714) 
* Made UI skins selectable

This allows mods to provide alternative skin pngs without overriding the default skin purely by being downloaded

* Added UI Skin loading from NinePatches

This allows mod creators to define the stretch region and padding directly in the png

* Update baseScreen skin on skin reload

* Merged displayTab onChange functions

As all of them are equal anyway
 2022-09-04 17:09:14 +03:00
Yair Morgenstern
30ed0f544d
Version rollout (#7742) 
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7736)

* update traditional chinese. (#7735)

* Update Korean.properties (#7731)

* Update Romanian.properties (#7729)

* Update Italian.properties (#7728)

* Update French.properties (#7724)

* Update Simplified_Chinese.properties (#7723)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7722)

* Update German translation

* Update German translation

* Update Indonesian.properties (#7719)

* Update Romanian.properties (#7725)

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

* Removed invalid translation

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
Co-authored-by: MihaiTurlea <111897551+MihaiTurlea@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: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2022-09-04 17:06:17 +03:00
Xander Lenstra
f46ab1de3a
Disable spectators from changing unit names (#7737) 2022-09-04 16:23:50 +03:00
lishaoxia1985
63324b3272
delete unnecessary random(randomness.RNG) (#7721) 2022-08-30 11:29:57 +03:00
Yair Morgenstern
b1579224a8 Better milestones for world religion 2022-08-29 00:04:44 +03:00
Yair Morgenstern
a0766f75d2 Resolve #7705 - correct filtering of civs that need to have majority religion for world religion to activate 
This was very poorly implemented
 2022-08-29 00:02:19 +03:00
Yair Morgenstern
71c5177c34
Version rollout (#7716) 
* Bump version and create initial changelog entry

* Ukrainian translations (#7711)

* Update Traditional_Chinese.properties (#7709)

* add basic and notification translative sentence.

* update missing placeholder.

* Upadate Catalan.properties (#7704)

* Update Indonesian.properties (#7703)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#7702)

* Update Czech.properties

* Update Czech.properties

Wrong translation

* Update Czech.properties

* Update Polish.properties (#7700)

* Update Vietnamese.properties (#7699)

* Update Simplified_Chinese.properties (#7698)

* 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 German translation (#7697)

* Update Spanish.properties (#7693)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7692)

* Update French.properties (#7690)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@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: kensvin <kensvin28@gmail.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: persinger <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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>
 2022-08-28 23:40:04 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities (#7665) 
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
 2022-08-28 23:25:14 +03:00
Brian
2e81a6152b
Fixed unit not giftable in one-sided open borders agreement. (#7701) 2022-08-24 00:14:47 -07:00
nacro711072
34f21dd08f
fix crash for start game with single player. (#7696) 2022-08-23 11:26:36 +03:00
alexban011
f64c5b36d0
added game option to disable unwanted spectators from a multiplayer game (#7290) 
* feature

* only display option if onlineMultiplayer is enabled

* translatable

* no more negativity

* 1

* threw UncivShowableException

* reviews

* reviewed myself
 2022-08-22 21:11:12 +03:00
CrispyXYZ
e58e184889
close app completely when clicked 'Exit' button (#7655) 
* kill app when clicked 'Exit' button

* add super.onDestroy()

* tries to fix temporarily

* Update AndroidLauncher.kt

* add System.exit(0)

* a little fix
 2022-08-22 21:09:47 +03:00
Yair Morgenstern
87a4b57bf0
Version rollout (#7688) 
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7686)

* Update Filipino.properties (#7677)

* Update Filipino.properties

* Update Filipino.properties

* update traditional_chinese for Maya. (#7675)

* update traditional_chinese for Maya.

* update

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

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

* Update Catalan.properties (#7667)

* Update Catalan.properties

* Update Catalan.properties (names of spies)

* Update Catalan.properties

* Update Indonesian.properties (#7664)

* Update Indonesian.properties

* Update Indonesian.properties

* Ukrainian translations (#7659)

* Ukrainian translations

* Misprints corrected

* New strings from a master branch

* Translations for the spy names

* More names translated

* Update German translation (#7657)

* Update French.properties (#7654)

* Update Simplified_Chinese.properties (#7652)

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Italian.properties (#7651)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Weltzer <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2022-08-22 21:02:45 +03:00
Jack Rainy
aa2d457260
Restore the button's style correctly (#7683) 2022-08-22 20:17:04 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code (#7658) 
* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png
 2022-08-22 13:02:52 +02:00
Brian
86834de82a
Improved options to rename units (#7676) 
Co-authored-by: Brian Huckaby <bdhuckaby@gmail.com>
 2022-08-22 11:46:55 +03:00
Jack Rainy
e2de79acbd
Suggest to adopt policy when the game starts with some culture (#7682) 2022-08-20 21:16:59 +03:00
Xander Lenstra
089e762f72
Fixed a crash when marrying a city-state without cities (#7684) 2022-08-20 21:11:25 +03:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Ouaz
11fd49c765
Fix "1.5x unhappiness" still being mentioned (#7669) 
Follows #7420
 2022-08-16 13:23:19 +03:00
Xander Lenstra
b1727f9360
Fix spies being gained in non espionage games (#7661) 
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it

* No spies gained when espionage is disabled

* Added missing function
 2022-08-14 18:37:39 +03:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies (#7641) 
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it
 2022-08-13 22:45:16 +03:00
MindaugasRumsa51
89979748a1
Notificiations tab scroll fix in empire overview (#7536) 
* Update NotificationsOverviewTable.kt

* Update EmpireOverviewCategories.kt

* Update NotificationsOverviewTable.kt
 2022-08-13 22:43:42 +03:00
OptimizedForDensity
9967642573
Fix infinite city-state tribute bug (#7653) 2022-08-13 22:43:25 +03:00
Yair Morgenstern
afa2327828
Version rollout (#7650) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties（2nd attempt） (#7646)

* Update Simplified_Chinese.properties

* A checkpoint for undoing commits

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7644)

* Update German translation (#7642)

* Update German translations

* Updat German translations

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Polish.properties (#7640)

* Update Spanish.properties (#7639)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7636)

* Perform housekeeping for Ukrainian translations - symbols, word order, and extra translations (#7626)

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

* Update Catalan.properties (#7614)

* Update Catalan.properties

* Update Catalan.properties. Change verbal periphrases and apostrophe symbol.

* Update Catalan.properties

* Update French.properties (#7608)

* Update French.properties

* Update French.properties

Update translation to 4.2.3

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-08-12 14:30:26 +03:00
OptimizedForDensity
8f23ae52cc
List which city owns each tile in the city screen UI (#7631) 2022-08-12 14:26:09 +03:00
OptimizedForDensity
28f65a7599
Add free belief unique + refactor a few religion functions (#7612) 
* Free belief unique

* Fix edge case

* Another edge case

* Bug fixes

* Fix some conditions

* Refactor another function

* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)

* Fix the edge case handling

* Cleanup

* Reviews + more refactoring and cleanup

* Update comments

* Unnecessary comment

* Improvements

* Typo
 2022-08-12 14:24:42 +03:00
Yair Morgenstern
306aef4c67 Resolved #7647 - Mod translations loaded upon lod download 2022-08-12 14:24:22 +03:00
OptimizedForDensity
a4424d2ab1
Several pathfinding optimizations (#7523) 
* Slight pathfinding optimization

* Cache canReach()

* More optimizations

* Use hashset instead of two arraylists
 2022-08-08 17:13:27 +03:00
Yair Morgenstern
29b6b35f56
Version rollout (#7635) 
* Bump version and create initial changelog entry

* Update German translation (#7634)

* Update Korean.properties (#7630)

* fix a few style issues in the German translation (#7621)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Kristian Rother <krother@academis.eu>
 2022-08-07 23:48:01 +03:00
OptimizedForDensity
b630388984
Add unit type to Civilopedia (#7620) 2022-08-07 17:37:11 +03:00
OptimizedForDensity
f1a69744cb
Fix mod translation file generation (#7629) 2022-08-07 17:36:55 +03:00