mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 22:00:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 7 Branches 1,098 Tags
35f33cd373278399621e63de2091fa88ef8c466a
Commit Graph

5627 Commits

Author SHA1 Message Date
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
Yair Morgenstern
662b3a5e08 Fixed unique buildings and units not replacing originals 2023-02-03 13:12:00 +02:00
Yair Morgenstern
0548b3b472 chore: renamed GameInfo.ruleSet -> ruleset 2023-02-03 13:06:32 +02:00
Yair Morgenstern
5329b9125b Resolved #8556 - crash when purchasing inquisitor 2023-02-03 13:03:42 +02:00
Gualdimar
4c7d7e1119 Fix unresponsive policy screen header (#8552) 
* Fix unresponsive policy screen header

* Update PolicyPickerScreen.kt
 2023-02-03 11:34:57 +02:00
alexban011
3180fce94d Fix UX of random nations pool && keep advanced tab open when updating the screen (#8452) 
* added feature to select specific city states

created MultiNationSelectPopup to reuse for the city states

* keep advanced tab open when update() is called

* Revert "added feature to select specific city states"

This reverts commit 4a1e6964b0.

* improved UX

* translations

* fix checks
 2023-02-03 09:51:18 +02:00
Gualdimar
af2307782f isSpectator check for notifications (#8558) 2023-02-03 09:40:02 +02:00
OptimizedForDensity
772615cffa UI Double/Multi Click Functionality and Double Click on Tech to Exit Tech Screen (#8560) 
* Multi-Click Framework and Double Click on Tech to Exit Tech Screen

* Update condition and add comment

* Extra criteria in case there are multiple listeners (Android Studio throws an error without the redundant 'is' check)

* Re-add exiting paper sound effect on double click
 2023-02-03 09:39:22 +02:00
vegeta1k95
9a35f4a283 Performance optimization: fast and smooth zoom (#8549) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-02 20:29:05 +02:00
Yair Morgenstern
38f544a35d chore: improvement stat functions are more related to 'stat' than to 'improvement' 2023-02-02 20:22:13 +02:00
Yair Morgenstern
e21cfe8145 chore: separated tile description into a separate file 2023-02-02 20:14:33 +02:00
Yair Morgenstern
e84887b8c2 chore: separated unit cached values into separate file 2023-02-02 19:50:00 +02:00
Yair Morgenstern
7d93b24d8c Renamed MapUnit.civInfo -> civ 2023-02-02 19:31:41 +02:00
Yair Morgenstern
6414ad95ae Renamed City.civInfo -> civ 2023-02-02 19:21:12 +02:00
Yair Morgenstern
3066a50020 Resolved #8539 - modding: "Unbuildable" accepts conditionals 2023-02-02 19:18:15 +02:00
Yair Morgenstern
ba097cee9d Stats serialize to notifications - see #8446 2023-02-02 18:16:51 +02:00
Yair Morgenstern
ccabc6164c Version rollout (#8546) 
* Bump version and create initial changelog entry

* Update Korean.properties (#8544)

* Update Ukrainian.properties (#8528)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#8527)

* Update German translation

* Fixed manufactory

* Update Hungarian.properties (#8525)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
 2023-02-02 17:15:35 +02:00
Yair Morgenstern
866a92a483 Resolved #8543 - fixed crash switching to tileset immediately after downloading tileset mod 2023-02-02 17:11:56 +02:00
vegeta1k95
3859a26732 Better World-Wrap (#8494) 
* Better World-Wrap

* Remove redundant list

* Fix flickering on sides + cleanup of ZoomableScrollPane

* Resolved #8529 - fixed 5hex image issues

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-02-02 17:07:50 +02:00