mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-19 12:18:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,097 Tags
8babec78d91c1e3fe9291e825660a89a27d59b80
Commit Graph

5495 Commits

Author SHA1 Message Date
vegeta1k95
8babec78d9 Improvements to construction table (#8643) 
* Construction resource requirements are depicted with icons

* Dimming and coloring

* Don't show buildings which require another building in this city

* Don't show buildings which require another building in this city which is buildable rn

---------

Co-authored-by: vegeta1k95 <vfylfhby>
 2023-02-10 12:21:14 +02:00
Gualdimar
3c22c867f0 Fixed selecting an improvement switched to another unit even if the setting is disabled (#8645) 2023-02-10 01:52:57 +01:00
Gualdimar
49615f3bd1 Fixed missing unimproved resources in the overview table (#8646) 2023-02-10 01:52:28 +01:00
Gualdimar
3802ac9e9f Research agreement cost display (#8639) 2023-02-09 21:55:17 +02:00
Yair Morgenstern
5477a62a10 Version rollout (#8638) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8635)

* Update Filipino.properties

* Update Filipino.properties

* Update Ukrainian.properties (#8632)

* Update Hungarian.properties (#8626)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-09 19:33:36 +02:00
Yair Morgenstern
75d7494f89 Resolved #8628 - modding: conditionally-unbuildable buildings display their cost 2023-02-09 19:21:31 +02:00
Yair Morgenstern
1daf76978b Resolved #8636 - Can no longer 'upgrade unit' between turns 2023-02-09 19:12:43 +02:00
Yair Morgenstern
bf0dd071e0 Resolved #8637 - fixed air sweep crash 
Due to air sweep tiles being "attackable tiles" even when not containing combatants
 2023-02-09 19:09:58 +02:00
vegeta1k95
ca86e6fde7 Enemy indicator, city culture hex outline + misc (#8629) 
* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Better embarked selection sprite

* Small fixes

* Hotfix fog

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-09 18:46:02 +02:00
lishaoxia1985
4a3f7f0250 Some modifications for performance optimization (#8631) 2023-02-09 15:42:37 +01:00
vegeta1k95
9a9d195dbf Fix main menu buttons text alignment 2023-02-08 19:13:13 +01:00
Gualdimar
380ffa61d3 Fixed getDiplomacyManager() Exception 2023-02-08 14:23:20 +02:00
Gualdimar
89dc7dc01b Revert knows() changes 2023-02-08 14:23:06 +02:00
tunerzinc@gmail.com
e7da347a05 Fix CityScreen tile yields indicator 2023-02-08 02:34:08 +01:00
Yair Morgenstern
fac8fbc6d2 Version rollout (#8617) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#8609)

* Update Ukrainian translation (#8607)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Hungarian.properties (#8606)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#8605)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-02-07 22:25:18 +02:00
lishaoxia1985
00ca863332 Order indicators in TechScreen like original Civ V (#8615) 2023-02-07 21:58:44 +02:00
Gualdimar
fab3da36e9 Fixed the display of political relations (#8613) 
* Fixed the display of political relations

* Fixed remaining knows() calls
 2023-02-07 21:56:34 +02:00
Gualdimar
138d61face Fixed overview resources tab state check (#8610) 
* Fixed overview resources tab state check

* Fix
 2023-02-07 08:21:27 +02:00
vegeta1k95
77888be8d6 Fix MapEditor world-wrap flickering (#8608) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-06 23:47:28 +02:00
Yair Morgenstern
d161a0a088 Better great general placement calc 2023-02-06 23:44:33 +02:00
Yair Morgenstern
4642c1a576 Resolved "dead population working tiles" bug 
When removing a worked tile, remove it from locked tiles
 2023-02-06 22:53:43 +02:00
Yair Morgenstern
34815eb296 Resolved #8480 - generated maps no longer contain forbidden tile arrangements 2023-02-06 22:06:05 +02:00
Yair Morgenstern
cfc3fa05f0 Resolved #8583 - games where it's your turn are displayed first in multiplayer popup 2023-02-06 21:33:57 +02:00
Gualdimar
bbcf2d99e3 Non-integer resource modifier now applied to the civ-wide scope (#8592) 2023-02-06 21:14:40 +02:00
Gualdimar
d73814263f Fixed pillaged improvement defence bonus (#8593) 
* Fixed pillaged improvement defence bonus

* Fix
 2023-02-06 16:41:30 +02:00
Yair Morgenstern
040fcd10d3 Version rollout (#8603) 
* Bump version and create initial changelog entry

* Update German translation (#8597)

* Update French.properties (#8590)

* Update Czech.properties (#8587)

* Update Spanish.properties (#8581)

* Updated Brazilian_Portuguese.properties (#8580)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Ukrainian.properties (#8577)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
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: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-02-06 16:23:57 +02:00
OptimizedForDensity
3147c39b40 Terrain-Specific Natural Wonder Sprite Support (#8568) 
* Terrain specific natural wonder sprite support

* Simplify expression and add translation

* Merge sequenceOf()s

* Revert

* Merge sequenceOf()s

* Remove unique type
 2023-02-06 16:11:36 +02:00
vegeta1k95
f6d89678b5 Generify hasGoldToBuy -> hasStatToBuy + fix condition (#8602) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-06 16:11:00 +02:00
Yair Morgenstern
29ef6f1b86 AI tweaks for better targeting 2023-02-06 16:10:27 +02:00
vegeta1k95
4e15a1581b City Screen improvements (#8598) 
* City Screen improvements

* Buy icon reverted to Gold icon

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-06 15:22:36 +02:00
lishaoxia1985
4b2d4a3877 Gradle update, offerButton.isEnabled = false in initial (#8600) 2023-02-06 14:21:46 +02:00
vegeta1k95
8f56a88990 Fix crash when attacking city with disabled overlays (#8599) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-06 09:13:57 +02:00
Yair Morgenstern
c77ab71381 Resolved #8571 - can no longer (temporarily) alter queue in multiplayer in between turns 2023-02-06 01:00:56 +02:00
Gualdimar
d371bdedf7 Suggestion: Collapsible tutorial tasks (#8591) 
* Collapsible tutorial tasks

* Fix
 2023-02-06 00:29:04 +02:00
Yair Morgenstern
328cf56a22 Resolved #8563 - ultra-rare 'destroy civilian unit before attack' crash 2023-02-06 00:23:05 +02:00
Yair Morgenstern
bf1850cf2e Fixed bad spread of starting positions 2023-02-05 23:59:49 +02:00
Yair Morgenstern
f67412291c row/col are now 1:1 for all tiles, so each int row/col pair has a corresponding x/y pair 2023-02-05 23:50:25 +02:00
Gualdimar
fb94338214 Bigger header on policy and mod screens (#8588) 2023-02-05 21:58:57 +02:00
vegeta1k95
d507129d24 LanguagePickerScreen sorting: English > system lang > percent complete (#8584) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-05 09:29:59 +02:00
vegeta1k95
dfe410ee3e PolicyScreen: branch progress + fix spectator (#8586) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-05 09:29:18 +02:00
Gualdimar
0e84291476 Fixed completing the "Found city" tutorial by AI (#8579) 2023-02-05 09:28:36 +02:00
Yair Morgenstern
a9903ad0f5 chore: Simplified hex coord math - part 2 2023-02-05 00:59:28 +02:00
Yair Morgenstern
e390a4f579 chore: Simplified hex coord math - part 1 2023-02-05 00:29:25 +02:00
Yair Morgenstern
902b08e38f Version rollout (#8576) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8562)

* Update Ukrainian.properties (#8557)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Spanish.properties (#8555)

* Update French.properties (#8554)

* Update Hungarian.properties (#8553)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: LibertyBell <72909724+iamlibertybell@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@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: balazsszalab <balazsszalab@freemail.hu>
 2023-02-04 23:26:58 +02:00
vegeta1k95
25c65b7da5 Smooth zoom when scrolling + cleanup code for listeners (#8569) 
* Smooth zoom when scrolling + cleanups of listeners

* Remove debug leftovers

* Remove debug leftovers

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-04 22:51:42 +02:00
Gualdimar
5fdbb7f188 Policies screen top button reworked (#8564) 
* Policies screen top button reworked

* Removed completed branch from count

* refine
 2023-02-04 22:50:38 +02:00
Gualdimar
1018460730 Android autosave location fix (#8572) 2023-02-04 19:36:26 +02:00
vegeta1k95
73ce925951 Fix simulation (#8566) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-04 19:32:30 +02:00
Gualdimar
c7a6082fd7 UnitTable close button clickHandler fix (#8573) 2023-02-04 19:31:55 +02:00
Yair Morgenstern
5335a34734 Don't allow pangaea with over 70% water tiles 2023-02-03 14:15:46 +02:00