Commit Graph

4834 Commits

Author SHA1 Message Date
fc1896eaf1 Puppeted cities can no longer become capitals (#7360) 2022-07-07 16:28:57 +02:00
aadec7e211 fixed zoom buttons not toggling without reloading the worldscreen (#7378)
* feature

* readablity
2022-07-05 22:06:38 +03:00
f3e043cd8f Update UnitGroup.kt (#7375)
Handle unitBaseImage and actionGroup layers of unit icons properly if unit is idle
2022-07-05 22:04:51 +03:00
99367c2212 Version rollout (#7366)
* Bump version and create initial changelog entry

* Update Persian_(Pinglish-UN).properties (#7365)

Translate some English words

* Update Persian_(Pinglish-UN).properties (#7364)

* Update Spanish.properties (#7362)

Improve unique understanding, not even I could really understand xDDD

* Update French.properties (#7361)

* Update Simplified_Chinese.properties (#7356)

* Update Simplified_Chinese.properties

* Update android/assets/jsons/translations/Simplified_Chinese.properties

* Some buttons were just filled (Brazillian Portuguese)! (#7355)

* Yet another section filled!

Just translated some menu options and buttons. I feel nice.

* Removed 'Requires translation' text

* new translations (#7352)

* Update Lithuanian.properties (#7350)

* Update German translation (#7349)

* Update Spanish.properties (Floating Gardens) (#7346)

In Mexico they are called "Chinampas"

* Revert "Update Persian_(Pinglish-UN).properties (#7365)" (#7367)

This reverts commit bb09098ce9.

* Revert "Update Persian_(Pinglish-UN).properties (#7364)" (#7368)

This reverts commit 6e337127ab.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Pssstr <85759927+Pssstr@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: KESMGAMA <108433075+KESMGAMA@users.noreply.github.com>
2022-07-05 22:04:28 +03:00
8b4bb89995 Fix duplicate version in string (#7374) 2022-07-05 08:05:06 +03:00
33e5b6475a Fix actionGroup Opacity (#7370)
Makes actionGroup layer of unit icon 100% opaque when selected.
2022-07-04 22:16:42 +03:00
4f97c239b4 Add civ names under their icon in diplomacy screen (#7240) 2022-07-04 17:26:30 +02:00
9477b319bc Generalize production-to-stat conversion uniques (#7342)
* Generalize production to stat conversion enabling uniques

* Remove unnecessary code

* Rename class

* Update sound
2022-07-04 16:38:24 +03:00
1649b236bb Slight optimization of getAttackableEnemies (#7353) 2022-07-04 16:35:49 +03:00
716d5d3214 Unit icon alpha control (#7343)
* Unit icon alpha/size control

Implemented sliders in Options -> Display to give user control over unit icon opacity and size.

* Simplified sliders and re-added idle 50% transparency

* Minor fixes from PR review

* Removed unit icon size adjustment
2022-07-04 16:35:36 +03:00
8203557633 Better AI targeting (#7359) 2022-07-04 16:34:33 +03:00
21f0f9255d Version rollout (#7348)
* Bump version and create initial changelog entry

* Update in Hungarian (#7341)

After all this time.... I'm back with a translating. Tried my best.

* More translations to Portuguese-Brazilian (#7340)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update Turkish.properties (#7338)

* Update Spanish.properties (#7327)

* Update Catalan.properties (#7324)

* Update Filipino.properties (#7320)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#7319)

* Update German translation (#7318)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7317)

* Update Simplified_Chinese.properties (#7315)

* Update Simplified_Chinese.properties

* Apply suggestions from code review

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update French.properties (#7308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-07-01 10:07:48 +03:00
818655f928 fix notification log not removing [ ] used for translations (#7335)
* fix

* improved

* removed unused imports
2022-07-01 09:37:30 +03:00
437f0f90b9 Add support for era-specific unit sprites (#7293)
* Add era specific unit sprites

* Check era numbers instead of names

* Reset atlas

* Reset

* Code deduplication

* More consistent function name

* Use lambda expression instead of function

* Get rid of gross kludge

* Use era names instead of numbers
2022-07-01 09:36:54 +03:00
64ab79faf3 Moddable prettier Tutorials - Step 1 (#7326)
* Moddable prettier Tutorials - Step 1

* Moddable prettier Tutorials - TranslationFileWriter

* Moddable prettier Tutorials - Kdoc

* Moddable prettier Tutorials - UX for open options task
2022-07-01 09:36:11 +03:00
57ed61af41 Save compatibility handling (#7255)
* Add serialization version to GameInfo

* Add handling of incompatible saves due to a dfiferent save version

* Fix compilation?

* Fix ios compilation

* Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version

* Update initial version

* Update initial version

* Fix merge mistake
2022-07-01 09:34:41 +03:00
08cede4f5a Fix OutOfMemoryError when loading a game and another is already loaded (#7306)
* Fix OutOfMemoryError when loading a game and another is already loaded

* Fix merge error...
2022-07-01 09:34:33 +03:00
119440ccec fixing translatable (#7277)
* 1 - speeds not translatable

* 2 - start year:
2022-07-01 09:34:13 +03:00
61509f747e Don't wake sleeping civilians if they're in a city (#7311) 2022-07-01 09:33:35 +03:00
724ac56c62 Exception handleing when loading mod options (#7279)
* try catches

* catching specific exceptions

* try catch when calling the function

* removed unused import
2022-07-01 09:33:16 +03:00
b3cd36c70e Fix translation issues caused by nested brackets and braces (#7242)
* Fix translation issues

* Readd comment

* Reviews

* Update translation line
2022-07-01 09:32:56 +03:00
27854bc031 Fix crash when exploring (#7314)
* Exploring units now take several turns to reach a ruin (but only if it is in vision, not behind fog of war)
Re-did this because the last pull request was a mess and so was everything else I was doing

* Fix crash reported by @Aditya von Karma#8015 on discord

* Update UnitAutomation.kt

Use canReach instead of canMoveTo

* Update UnitAutomation.kt

Use both canReach and canMoveTo
2022-06-27 15:51:46 +03:00
bc9a42e452 Save uncaught exception to file (#7247)
* Refactor: Rename GameSaver to UncivFiles

* Save last uncaught exception to file

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-25 22:30:27 +03:00
3e9a485b86 Exploring units now take several turns to reach a ruin (but only if it is in vision, not behind fog of war) (#7285)
Re-did this because the last pull request was a mess and so was everything else I was doing
2022-06-25 22:20:01 +03:00
56812f0297 added gameParameter option to disable start bias (#7241)
* disable start bias

* better indentation

* improved

* improvedx2

* now for generated maps too

* made it choose a random location instead of the last one

* -||-

* checks

* forgot I can write directly on github :)
2022-06-25 22:14:32 +03:00
725c298a2a Fix crash handling not disposing previous screens (#7301) 2022-06-25 22:10:42 +03:00
51ba657b75 Added option to select font size (#7238) 2022-06-25 13:46:12 +02:00
8047278d80 Add Notifications Log (#7122) 2022-06-25 13:40:42 +02:00
50a8ff3ce0 Fix crash when melee unit captures civilian then tries to attack it (#7282) 2022-06-24 14:05:49 +02:00
51caf7a4ed Fix Mayan UB not appearing in Civilopedia (#7283) 2022-06-24 11:53:55 +03:00
4f6a2eb2f4 Add notification when a civ is resurrected through liberation (#7276) 2022-06-24 01:24:29 +02:00
e69789a683 Allow modded harbor-type buildings to connect cities to capital (#7254) 2022-06-23 20:53:32 +02:00
b716d4a68d Fix "Religions to be founded" count (#7278) 2022-06-23 20:42:53 +02:00
e0a65fb95a Fix the fix 2022-06-23 20:01:44 +02:00
50ec861edd fix (#7281) 2022-06-23 18:27:33 +03:00
b558d92a1e Fix city ambient sounds not working on Desktop (#7271) 2022-06-23 01:08:18 +02:00
466560abba Fix city sounds not being played on released game versions (#7268) 2022-06-22 12:39:16 +02:00
884a16d632 Fix city ambience sound not being stopped when the city screen is updated via UncivGame.replaceCurrentScreen 2022-06-22 10:44:39 +02:00
7e36d62b6e Fix crash 2022-06-22 10:00:17 +02:00
68cc4303ec Make popups and text fields nicer to interact with on Android (#7211)
* Make popups and text fields nicer to interact with on Android

* Refactor: Rename createTextField to UncivTextField.create

* Fix multiplayer save delete text
2022-06-22 09:32:20 +03:00
a13a39293f Rework Policy and Diplomacy buttons (#7027)
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review

* Worldscreen reorg 1 - Tech policy Diplomacy

* Tech Policy Diplomacy buttons - postmerge fix and 7130 simpler
2022-06-22 09:31:07 +03:00
50e479b21d Fix cases where AI great people get stuck trying to build a great improvement (#7239) 2022-06-22 09:29:43 +03:00
8f53262fc4 CityScreen plays a sound when opened (#7163)
* added sounds to cityScreen

* changes? ..don't know how to name this commit

* removed try block

* improved era1 sound and added slider for city enter sounds

* added Information Era sound

* added Future Era sound

* better option name + translation

* added Atomic Era sound

* normalized sounds

* prevent spam + better era 0 and 1 sounds

* cleanup

* sound improvements to medieval and atomic

* volume now tied to sound effects

* improved information sound

* improved future sound

* sounds now stop if you exit the city screen

* improved Renaissance sound

* now in separate function

* now using the music controller

* better file names

* WLTK day sound + sounds are now configurable in Eras.json

* removed redundant setting and fixed comment

* added PlaySingle

* musicController no longer used

* Gdx.audio.newMusic is now used

* function name

* function are now in their own class

* CitySoundPlayer now has 1 instance in UncivGame and is hooked

* credits

* sounds loop

* loopable sounds

* updated credits

* fixed sound not stopping when changing city without leaving cityScreen

* changed WLTKNew sound

* added toggle for the sounds

* changed WLTK sound, removed music and made all tracks have the same volume

* addressed some of the issues

* addressed more issues

* increased sounds volume + volume slider

* made WLTK sound slightly quieter

* removed entry from Vanilla eras

* revert back to CitySoundPlayer.kt

* no more hooks

* removed unused stuff

* changees

* completly reverted MusicController

* and the MusicTrackChooserFlags

* fixed ESC not stopping sounds

* updated credits to mention the sounds are modified

* dispose()

* removed try block
2022-06-22 09:11:03 +03:00
7de3fdf452 Fix disappearing terrain when switching between mods (#7257) 2022-06-22 09:08:38 +03:00
83926eac7c Fix policies not contributing stats from city-states (#7237) 2022-06-21 01:18:42 +02:00
954d0e4fe0 AI missionaries avoid cities with inquisitors (#7218) 2022-06-20 22:46:11 +03:00
2224e65707 fixed crash in NextTurnAutomation (#7227)
* fixed crash

* redone

* reviews

* reviews 2
2022-06-20 09:50:03 +03:00
f10bf8bfbe Resolved crash for victory condition not in ruleset 2022-06-20 09:49:22 +03:00
5b5e4137db Resolved crash for stats not in statCostModifiers 2022-06-20 09:46:57 +03:00
9d5b3d4e4a Refactor: Remove unnecessary float conversion 2022-06-19 21:50:06 +02:00