Commit Graph

4851 Commits

Author SHA1 Message Date
e65e1dc9ce Fix any civ being able to capture barbarians (#7418) 2022-07-10 19:15:17 +03:00
0f5e0b546e Remove double XP gain from Intercept (#7414) 2022-07-10 11:53:38 +03:00
f2365568d4 Fix multiple capture uniques resulting in double-capture (#7403) 2022-07-10 01:12:59 +02:00
0511372fe8 Stop automate production setting from automating other players' production in MP (#7351)
* Fix automate production option in multiplayer

* More explicit condition
2022-07-09 22:50:53 +03:00
aab49e7295 Fix policy uniques not being applied (#7404) 2022-07-09 22:50:30 +03:00
43da7ee3cd Sort game speeds in Civilopedia by game speed modifier (#7408) 2022-07-09 22:49:37 +03:00
b21f616120 Fix Desktop multiplayer options showing a double separator (#7410) 2022-07-09 22:49:16 +03:00
6c533d63fb Hopefully resolved ANRs caused by available fonts taking too long to load 2022-07-08 16:54:21 +03:00
f08dedea31 Version rollout (#7400)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#7398)

* Update Simplified_Chinese.properties (#7397)

* Herbad patch 1 (#7395)

* Update Persian_(Pinglish-UN).properties

* Update Persian_(Pinglish-UN).properties

Edit the problem

* Update German translation (#7391)

* Update Catalan.properties (#7389)

* Update Lithuanian.properties (#7385)

* Update Filipino.properties (#7384)

* Update French.properties (#7383)

* Update Spanish.properties (#7381)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-07-08 16:00:38 +03:00
58e65978dc Prevent theme music tracks from randomly playing (#7396)
* Don't play theme music tracks randomly

* Tweak

* Remove redundant code

* Ambient string to variable
2022-07-08 15:49:55 +03:00
7c64015aed Improve AI belief picking (#7369)
* Improve AI belief picking

* Change default gameTimeScalingPercent to 100

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-07-08 15:49:35 +03:00
33237d5a59 feature (#7325) 2022-07-08 15:48:41 +03:00
3422e161ad Removed deprecated uniques 2022-07-08 15:48:33 +03:00
87aa5bc2c0 Resolved #7379 - puppet cities generate no extra unhappiness (per Civ V) 2022-07-08 14:17:29 +03:00
e8eb66a4f6 Resolved crash when resuming before music controller initialized 2022-07-07 19:57:34 +03:00
ce5f0dd879 Increase mod search request page size (#7377) 2022-07-07 17:43:16 +02:00
60f7ea4322 Unstack enemy unit strength modifiers (#7390) 2022-07-07 17:52:16 +03:00
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