mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,095 Tags
da7786a2cb15d91dcd819befa499a176d03512ad
Commit Graph

5710 Commits

Author SHA1 Message Date
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
OptimizedForDensity
2c0ce05f78 Performance Improvements to Construction Automation (#8508) 
* Improvements to construction automation

* Remove early return in work boat consideration

* Reviews and minor addition

* Move cache init to correct file

* I swear I didn't delete that line during the merge

* Redundancy
 2023-02-02 17:07:04 +02:00
Gualdimar
e113a3a140 Select the next unit after closing the improvement screen (#8545) 2023-02-02 17:05:30 +02:00
Gualdimar
5a267e436c Add Reset tutorials button (#8536) 
* Add Reset tutorials button

* Fix typo
 2023-02-02 13:33:07 +02:00
vegeta1k95
b7c9a30c38 Fix promotion screen buttons clickhandler (#8535) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-02 09:06:16 +02:00
vegeta1k95
daef1e0769 Performance optimization: don't draw empty tile layers (#8538) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-02 09:05:48 +02:00
Yair Morgenstern
a84470c74e Resolved #8529 - fixed 5hex image issues 2023-02-01 21:26:38 +02:00
Gualdimar
d43e190d24 CityRenamePopup (#8534) 
it is now possible to rename a city by clicking on its name in the UnitTable on the world screen(bottom left)
 2023-02-01 20:08:49 +02:00
vegeta1k95
b79411a5b2 Fix city table selection (#8531) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-02-01 19:18:43 +02:00
Gualdimar
296a2f689f Update CityScreenCityPickerTable.kt (#8533) 2023-02-01 19:18:03 +02:00
OptimizedForDensity
adde5c2bda Refactor Construction Rejection Reasons (#8526) 
* Refactor Rejection Reasons to use Sequences

* Renaming

* Rework some functions
 2023-02-01 10:41:36 +02:00
Yair Morgenstern
087d100887 Version rollout (#8523) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8504)

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

* Update German translation

* Update German translation

* Update German translation

* Update Ukrainian.properties (#8474)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Fixed test

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
 2023-01-31 23:46:36 +02:00
OptimizedForDensity
c3da760c3b Notification log fix (#8509) 
* Fix ruin notification and broken conditional check

* Translate idle production description
 2023-01-31 23:08:17 +02:00
OptimizedForDensity
913cb3cf00 Fix Faith Healers healing enemies (#8522) 
* Fix faith healers belief and add Friendly/Enemy mapUnitFilter support

* Use Ally instead of Friendly since Ally denotes the ally of a CS and not necessarily a friendly civ

* Fewer words

* Remove mapFilter implementation

* Remove nullability
 2023-01-31 23:07:12 +02:00
vegeta1k95
03d5ba0f07 Add next-turn-progress bar for growth/production on CityButtons (#8506) 
* Add next-turn-progress bar for growth/production on CityButtons

* Small nitpicks

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-31 22:44:57 +02:00
itanasi
02e10b1000 Only heal when pillaging Improvements (#8511) 
* Only Pillaging Improvements (not Roads) Heal 25HP

* Block repairs in Hostile Tiles

* Revert "Block repairs in Hostile Tiles"

This reverts commit ae1a2e9ece.
 2023-01-31 22:35:53 +02:00
vegeta1k95
898d312109 Fix incorrect dimming (#8505) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-31 22:26:13 +02:00
Gualdimar
7258507088 Autosave fix (#8517) 
* Update UncivFiles.kt

* Update WorldScreen.kt
 2023-01-31 22:24:04 +02:00