mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-06 09:08:17 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,825 Commits 6 Branches 1,048 Tags 1.1 GiB
4565907985
Commit Graph

9825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
e872f5ade4 Resolves #10601 - Defeated (no units/cities) hotseat multiplayer no longer appears for turns ("player X ready") 2023-11-28 13:51:34 +02:00
Yair Morgenstern
c3216e96eb cleanup 2023-11-28 12:20:18 +02:00
yairm210
9d411a16bc 4.9.2-patch5 2023-11-28 10:15:53 +00:00
Joan Josep
3c24d6d3af
Update Catalan.properties (#10579) 2023-11-28 12:15:39 +02:00
Yair Morgenstern
d0a4111d84 I think I found the conflict - checkout ref! 2023-11-28 12:14:56 +02:00
Will Allen
b4b73336b3
Fix typo (#10608) 2023-11-28 12:09:47 +02:00
SomeTroglodyte
20fa1d3f06
(CQ) Linting and comments on TileSetStrings and ImageAttempter (#10582) 
* (CQ) Linting and comments on TileSetStrings and ImageAttempter

* (CQ) Linting and comments on TileSetStrings and ImageAttempter - some more
 2023-11-28 12:07:54 +02:00
Yair Morgenstern
50ce8b30b6 Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
Yair Morgenstern
e022eb803a Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
SomeTroglodyte
48ede93bfa
Wesnoth map import polished up (#10580) 2023-11-28 12:01:53 +02:00
Yair Morgenstern
208ad8a641 ALL TOGETHER NOW 2023-11-28 11:59:12 +02:00
yairm210
bc935a310c 4.9.2-patch4 2023-11-28 09:58:25 +00:00
Yair Morgenstern
0af8cb60a5 Tag does not trigger rebuild - maybe now it will 2023-11-28 11:57:48 +02:00
yairm210
4b597a3c9d 4.9.2-patch3 2023-11-28 09:53:21 +00:00
Yair Morgenstern
9a2c45d9e8 You know what let's just check out the second half 2023-11-28 11:52:45 +02:00
Yair Morgenstern
339815fa41 damn wrong filename 2023-11-28 11:52:24 +02:00
SomeTroglodyte
5437c68b4c
City sounds again (#10590) 
* Fix City ambience sounds stopping when switching to next/previous cities

* Fix City ambience sounds no longer fade in
 2023-11-28 11:50:30 +02:00
Yair Morgenstern
f5d74ad129 whoops 2023-11-28 11:50:10 +02:00
Yair Morgenstern
eb50ea4403 Readymade didn't work, trying my own github script for PR merge 2023-11-28 11:48:55 +02:00
Yair Morgenstern
b0e67376c6 Merge pull request properly 2023-11-28 11:38:15 +02:00
Yair Morgenstern
dbdabbaede Use manual access token to merge PR 2023-11-28 11:36:15 +02:00
Yair Morgenstern
3cf710cc58 Try using git commit created by other people 2023-11-28 11:20:58 +02:00
Yair Morgenstern
84e1c03547 Added patch automation step! 2023-11-28 11:06:40 +02:00
Yair Morgenstern
18673b02b6 Added script to update versions on patch release 2023-11-26 19:06:24 +02:00
Yair Morgenstern
205296aab7 Nicer command display 2023-11-26 19:06:24 +02:00
Yair Morgenstern
7847237677
4.9.2-patch2 2023-11-26 18:27:19 +02:00
Oskar Niesen
10b3d69dad
Fixed isGoodTileToExplore() to check if there is no enemy in range (#10586) 2023-11-26 18:24:46 +02:00
dHannasch
09fdd8b8e2
Wrap INonPerpetualConstruction.requiredTech into function (#10585) 
* Update IConstruction.kt

* Update Building.kt

* Update BaseUnit.kt

* Update BaseUnit.kt

* Update Building.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update CityStateFunctions.kt

* Update Building.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update BaseUnit.kt

* Update RulesetValidator.kt

* Update TechnologyDescriptions.kt

* Update CityStateDiplomacyTable.kt

* Update CityStateDiplomacyTable.kt
 2023-11-26 08:48:09 +02:00
Yair Morgenstern
acfe8a3ad1
4.9.2-patch1 2023-11-26 08:15:29 +02:00
SeventhM
17a7465ba3
Fix founding cities removing city center tile improvement (#10584) 
* Fix founding cities removing city center tile improvement

* Simplify since we know the tile
 2023-11-26 08:08:14 +02:00
Yair Morgenstern
5396c41efc 4.9.2 2023-11-25 22:35:40 +02:00
Yair Morgenstern
962c6ab7cb
Version rollout (#10578) 
* Bump version and create initial changelog entry

* Update Polish.properties (#10556)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Spanish.properties (#10555)

* Update French.properties (#10553)

* Update Italian.properties (#10552)

* Update Turkish.properties (#10549)

* Update Turkish.properties

Added new translations

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Malay.properties (#10548)

323 - 417

* Update Brazilian_Portuguese.properties (#10547)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: komandotayfa <53448093+komandotayfa@users.noreply.github.com>
Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-11-25 21:56:24 +02:00
SomeTroglodyte
e15b6cab76
Tweak Language Pickers to scroll the selected one into view when appropriate, and allow selection with letter keys (#10569) 2023-11-25 20:11:41 +02:00
SomeTroglodyte
b61c9de39e
Comment unique (#10575) 
* Comment Unique

* Comment Unique translations

* Comment Unique more descriptive documentation

* New languages
 2023-11-25 20:11:30 +02:00
Oskar Niesen
f1ceaa216a
Get distance to nearest enemy rework (#10481) 
* Initial refactor

* Moved checking if a tile has an enemy to a new method

* Rewrote getDistanceToEnemyUnit

* changed the position of the logic of checking if the enemy is still there

* Changed some of the other methods to use the ThreatManager getClosestEnemy()

* Added a new getTilesWithEnemyUnitsInDistance method

* Added a new getEnemyMilitaryUnitsInDistance method

* Converted a few lines to use ThreatManager

* Changed Air units to use threat manager

* Fixed tileWithEnemy error

* distanceToClosestEnemyTiles now clears at the start of every turn

* Added blank lines to end of ThreatManager.kt

* Renamed tilesInRange to tilesWithEnemyUnitsInRange

* Changed ArrayList return to a MutableList

* Removed ClosestEnemyTileData being a data class

* Improved commenting

* Improved commenting2

* getEnemyMilitaryUnitsInDistance now uses a flatMap and moved getDangerousTiles to threat manager

* Created a new helper method getEnemyUnitsOnTiles

* Renamed clearThreatData to clear

* Added shortcut if maxDist is less than or equal to distanceSearched

* Fixed distanceWithNoEnemies in getTilesWithEnemyUnitsInDistance

* Fixed notFoundDistance being higher than maxDistance when takeLargerValues is false

* Added some ThreatManager tests

* Added some more ThreatManager tests

* Removed visible map after use

* getTilesWithEnemyUnitsInDistance doesn't search distances <= tileData.distanceSearched (previously was <)

* Added 3 more tests

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-11-25 20:11:10 +02:00
SomeTroglodyte
dc7f1f703a
Sound cache preloader (#10558) 
* A Preloader for sounds

* Change SoundPlayer.play to never switch threads on desktop, and limit retries, but mostly better comments
 2023-11-25 20:10:24 +02:00
Why-not-now
8c7fa24123
Fixed typo (#10572) 
* Fixed typo

* Fixed typo

* Fixed typo

* Update 5-Miscellaneous-JSON-files.md
 2023-11-25 20:08:51 +02:00
SomeTroglodyte
b8facadf7a
Fix OpenAL error Windows Events after application ends (#10551) 
* Move exitProcess to a better place

* Fix OpenAL error Windows Events after application ends

* Extensive commenting
 2023-11-25 18:22:39 +02:00
SomeTroglodyte
8c0693c998
Latin reboot (#10573) 
* Reboot Latin

* Reboot Latin - 002

* Reboot Latin - 003

* Reboot Latin - atlas
 2023-11-25 18:22:23 +02:00
SomeTroglodyte
59dab8992f
Fix City ambient sounds (#10574) 
* Fix city ambient sound not pausing when desktop version is minimized

* Fix city ambient sounds not working from jar/apk
 2023-11-25 18:08:19 +02:00
Why-not-now
3ddeb874c7
Standardise using enum instead of string (#10571) 
* Standardise using enum instead of string

* Standardise enum instead of string

* Standardise enum instead of string
 2023-11-25 18:07:30 +02:00
Why-not-now
d4cd102613
Fixed typo (#10568) 
* Fixed typo

* Fixed typo
 2023-11-24 16:17:04 +02:00
Why-not-now
ba5e658c9e
Standardise using enum instead of string (#10570) 
* Standardise using enum instead of string

* Standardise enum instead of string
 2023-11-24 16:16:49 +02:00
Yair Morgenstern
e9d3c153dc Console: Added set/remove tile improvement 2023-11-24 16:13:38 +02:00
Yair Morgenstern
df8f7c6bdd Console: Show available commands on empty command 2023-11-24 15:36:56 +02:00
Yair Morgenstern
7dc54dab03 Console: Added add/remove for cities 2023-11-24 15:36:56 +02:00
Yair Morgenstern
c75e7f9407 Move city founding effects to the proper function 2023-11-24 15:36:56 +02:00
SomeTroglodyte
b7823e0b39
"Fixed" Rusyn language (#10561) 
* Rusyn.properties

Translation on Rusyn language (ISO-code "rue")

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Update Rusyn.properties

* Add a flag for Rusyn

* LocaleCode for Rusyn to use Ukrainian Collator but still write separate fastlane files

* Update Rusyn language files

* Redo atlas

---------

Co-authored-by: KotDivuar <148721627+KotDivuar@users.noreply.github.com>
 2023-11-24 14:22:24 +02:00
SomeTroglodyte
c4b5925394
Fixed Bosnian (#10559) 
* Rescue Bosnian.properties

* Rename and revert

* Let's minimize diff size for completionPercentages.properties from now on

* One generate translations run on Bosnian

* Add the Flag

* Add the LocaleCode

* Fix illegally tranzlahtedd placeholders
 2023-11-24 07:21:27 +02:00
Yair Morgenstern
b8b5b71395 4.9.1 2023-11-23 00:11:40 +02:00