mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-13 00:04:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,611 Commits 6 Branches 1,037 Tags 1.2 GiB
9a2c45d9e8
Commit Graph

9611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yair Morgenstern
3c8d4cfcbf
Version rollout (#10546) 
* Bump version and create initial changelog entry

* Update Polish.properties (#10544)

* Update Spanish.properties (#10542)

* Update Turkish.properties (#10536)

* Update Turkish.properties

Added new translations

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Brazilian_Portuguese.properties (#10535)

* Update Simplified Chinese (#10534)

* Update French.properties (#10531)

---------

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: komandotayfa <53448093+komandotayfa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-11-23 00:06:54 +02:00
SomeTroglodyte
0cf8ea2619
Map overlay toggle buttons rework (#10505) 
* Simplify MapOverlayToggleButton signature and let the instances use individually moddable images

* Gimp sources of new images (all from existing attributions)

* New images and atlas
 2023-11-23 00:00:19 +02:00
SeventhM
a6ac9aa24d
Fix free buildings triggering from conditionals in incorrect places (#10532) 
* ignore trigger condtional uniques

* Have UniqueTriggerActivation only add the buildings of its unique

* (minor optimization) move where we find the free building

* Once again I forget about imports
 2023-11-22 23:59:53 +02:00
SomeTroglodyte
3604d82fa9
Add a map import tool able to read "Battle for Wesnoth" maps (#10541) 
* Add a map import tool able to read "Battle for Wesnoth" maps

* Fix and explain vertical distortion
 2023-11-22 23:59:22 +02:00
Sergey
30c4b323ec
Add a setting to forbid closing popups by clicking behind them (#10539) 
* Add a setting to forbit closing popups by clicking behind them

* Change default checkbox state to false

* Update template and Russian translation
 2023-11-22 23:59:07 +02:00
SomeTroglodyte
8bd2363361
[Linting] Some minor code purity stuff I came across (#10537) 
* Centralize shift and control key detection (Unit multiselect now with right-shift too)

* Lint of an ugly curly brace placement - otherwise the original was fine

* Answer open question in comment

* Follow a Gdx 1.12 deprecation

* Another clarifying comment - on ScrollPane's built-in potential surprise that the constructor calls its own overridable public methods
 2023-11-22 23:58:57 +02:00
Yair Morgenstern
4c8db02dfd
Initial scenario/dev console, with 1 command :D (#10540) 
* Initial console, with 1 command :D

* add/remove city tiles

* add/remove units!

* Added command history, accessible with up and down keys

* 'add promotion' cli command

* 'remove promotion' cli command

* Enumified

* Converted enums into classes - enums are weirdly restricted in all kinds of uncomfortable ways

* Added autocomplete!
 2023-11-22 23:41:09 +02:00
Ouaz
810392a55e
[Translation] Add back "general" unit types (#10526) 
* Add back "general" unit types

These entries have been removed from translation files, making them untranslated in-game (in Civilopedia articles)

* Revert changes in template.properties

* Fix missing unit type translations

Fix by @SomeTroglodyte
 2023-11-21 11:07:19 +02:00
Yair Morgenstern
8dc0db49e7 4.9.0 2023-11-20 23:15:39 +02:00
Yair Morgenstern
052df9c064 Better performance for 'best tile to found city' (minimized canReach calls) @tuvus 2023-11-20 23:08:18 +02:00
Yair Morgenstern
10cb51795c
Version rollout (#10530) 
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#10528)

* Update French.properties (#10524)

* Update Italian.properties (#10522)

* Update Polish.properties (#10521)

* Update Polish.properties

* Added Fastlane_short_description

* Update Malay.properties (#10520)

Translated line 33 to line 325.
Not at all finished.
This time though I didn't mess up.

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.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: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
 2023-11-20 22:52:44 +02:00
PLynx
e67fd6a28b
Add the SellBuilding Unique (#10514) 
* Restored the SellBuilding Unique

* Rephrased SellBuilding unique
 2023-11-20 22:47:47 +02:00
SeventhM
1744d1271f
Add gain stat modified by speed and improvement speed by filter uniques (#10443) 
* Add gain stat modified by speed and improvement speed by filter uniques

* Fix rulesets

* Remove nonfunctional leftover resource text

* Reword improvement unqiue as suggested
 2023-11-20 22:47:35 +02:00
Sergey
4adbd2e634
Add a TriggerUponDiscoveringTile unique type (#10523) 
* Add a TriggerUponDiscoveringTile unique type

* Add a check for trigger presence
 2023-11-20 22:47:17 +02:00