Commit Graph

7348 Commits

Author SHA1 Message Date
heipizhu4
4d9f99fff3
Fix broken links in wiki (#7182) 2022-06-17 21:04:43 +02:00
Paul Pogonyshev
0533c9eaba
Restore unit action shortcuts accidentally dropped in commit 4fb2ad8fa (#7187) 2022-06-16 22:32:02 +03:00
itanasi
38b6770e84 Maintain Fortify bonus after Fortify until Healed (#6991)
* Maintain Fortify bonus after Fortify until Healed

* add in backward compatibility

* attempt

* Add in proper backwards compatibility

* Convert Fortify in BackwardCompatibility.kt instead

* Remove debug code

* Now with Regex

* remove unnecessary import
2022-06-16 21:30:31 +02:00
Yair Morgenstern
e4ab1eabc7
Create Privacy-Policy.md 2022-06-16 21:51:14 +03:00
Yair Morgenstern
f48bc94f87 4.1.11 2022-06-16 21:28:20 +03:00
Yair Morgenstern
192bc9eb46
Version rollout (#7185)
* Bump version and create initial changelog entry

* Update French.properties (#7174)

* Update Catalan.properties (#7173)

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7172)

* Update Filipino.properties (#7166)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#7165)

* Update Italian.properties

* Update Italian.properties

* Update Brazilian_Portuguese.properties (#7149)

* Update Brazilian_Portuguese.properties

* Fixed Floodfill_Abbreviation mistake

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kalil <kalilcamera67@gmail.com>
2022-06-16 21:20:06 +03:00
OptimizedForDensity
623b84ea30
AI considers liberating city-states from other civilizations (#7157)
* AI will consider liberating a city state on conquest

* Factor in current civ happiness for liberation consideration

* Refactor foundingCiv check into function
2022-06-16 21:12:26 +03:00
Timo T
4fb2ad8fab
Fix unit action/selection overlay not being closed when performing an action with a new unit (#7184) 2022-06-16 21:07:59 +03:00
SomeTroglodyte
e2b7891248
Two new Unit Tests (#7001)
* MapGenerator fixes

* MainMenu Background Map scaled to Screen

* Easter Eggs - Code only

* Easter Eggs - Graphics
2022-06-16 21:07:30 +03:00
alexban011
564f7b476c
small fixes (#7181)
* fixes

* relaced translations with _

* better displayCutout
2022-06-16 18:56:18 +03:00
Paul Pogonyshev
d462100c19
Refactor key handling (#7042)
* Refactor keyboard shortcut handling

* Use 'userObject' for attachments instead of a WeakHashMap

* Fix shorcut vetoing when a popup is active

* Solve misc. review complaints

* Reimplement changes in UnitActionsTable to exactly repeat what the previous code did

* Fix last commit
2022-06-15 20:04:44 +03:00
Timo T
1bbc11cc47
Fix option change not reloading main menu properly (#7170) 2022-06-15 20:01:02 +03:00
Timo T
89a7cc7246
Fix wrong Duration short formatting (#7167) 2022-06-15 20:00:13 +03:00
Timo T
0585194eaf
Fix cutout options crash (#7169) 2022-06-15 15:59:58 +02:00
Yair Morgenstern
4d0230f70e Revert "Maintain Fortify bonus after Fortify until Healed (#6991)"
This reverts commit 07b7d91107.
2022-06-14 22:03:18 +03:00
alexban011
59e4eb8373
increased kotlin version to latest 1.7.0 (#7151)
* updated to 1.7.0

* change to empty else

* bumped ios java to 1.8
2022-06-14 21:10:44 +03:00
itanasi
07b7d91107
Maintain Fortify bonus after Fortify until Healed (#6991)
* Maintain Fortify bonus after Fortify until Healed

* add in backward compatibility

* attempt

* Add in proper backwards compatibility

* Convert Fortify in BackwardCompatibility.kt instead

* Remove debug code

* Now with Regex

* remove unnecessary import
2022-06-14 21:09:31 +03:00
Timo T
a5f9623dbe
Fix OutOfMemory error when loading game state after already having a game loaded (#7145)
* Fix OutOfMemory error when loading game state after already having a game loaded

* Fix screen resize not being handled correctly

* Add withContext shortcut functions

* Add more logging

* Fix multiplayer games sometimes being loaded twice

* Make the loading screen nicer

* Make the loading screen hide previous popups for making the screenshot

* Don't do custom rendering & dispose the texture

Sometimes it makes sense to understand the library you're using...

* Fix missing GL context

* Refactor: increase readability of loadGame function
2022-06-14 21:09:09 +03:00
Timo T
b6a98e5540
Fix EventBus not being able to listen to events with more than one level of inheritance (#7009) 2022-06-14 21:08:43 +03:00
Yair Morgenstern
d562eb2dd2 4.1.10 2022-06-14 21:03:20 +03:00
Yair Morgenstern
c710b83a0d
Version rollout (#7162)
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7153)

* Update French.properties (#7142)

* Update Catalan.properties (#7140)

* Update Romanian.properties (#7139)

* Update Traditional_Chinese.properties (#7137)

* Update Traditional_Chinese.properties

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

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

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

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

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

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

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

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

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

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

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

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

* Update Traditional_Chinese.properties

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

* Update Simplified_Chinese.properties (#7136)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7134)

* Update Indonesian.properties

* Update Indonesian.properties

* Fetch upstream and more translations to brazilian portuguese (#7133)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update German translation (#7132)

* Update German translation

* Update German translation

* Update Filipino.properties (#7131)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7127)

* Update Spanish.properties

* fix some vainas

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-06-14 20:52:56 +03:00
Yair Morgenstern
4633462884 Condiional fixes 2022-06-14 20:47:12 +03:00
alexban011
fc926420e8
added cutout support (#7044)
* added support

* now toggleable in settings

* translation

* added note that it requires restart

* made it enabled by default

* padded buttons to the right if there is a cutout

* checking for cutout instead of android

* reverted button changes

* moved option to advancedTab
2022-06-14 20:34:30 +03:00
OptimizedForDensity
cac616a97b
Fix spectator's fog of war toggle (#7130) 2022-06-14 20:32:36 +03:00
Timo T
90bdcf9329
Fix scroll to wonder in the map editor (#7154)
* Fix scroll to wonder in the map editor

* Fix blink always happening
2022-06-14 20:32:06 +03:00
Timo T
c3268126ee
Fix unit being captured two times (#7141) 2022-06-14 20:31:47 +03:00
Jack Rainy
9ffd9b817b
Do not enter the city while performing an air strikes sequence (#7148) 2022-06-14 13:42:53 +02:00
OptimizedForDensity
ed922b182d
Improvements to AI military unit usage (#7147)
* Add more opportunities for AI units to attack
2022-06-14 13:34:24 +02:00
OptimizedForDensity
9ac019caea
Prevent AI from sending a second peace treaty (#7150) 2022-06-14 01:06:29 +02:00
Yair Morgenstern
46b1516159 Fixed translation order 2022-06-13 22:22:52 +03:00
Yair Morgenstern
86f2560d7e Added test for branches which require missing eras 2022-06-13 21:39:57 +03:00
Azzurite
ec6b4dc017 Docs: Create actual links 2022-06-13 02:33:10 +02:00
Azzurite
388a4424f5 Add URL example 2022-06-12 21:32:10 +02:00
Azzurite
5506ad2cd4 Fix anchor link 2022-06-12 21:28:09 +02:00
Azzurite
cb479ba4e3 Change heading to match page name 2022-06-12 18:17:47 +02:00
Timo T
4da1d442e4
Fix NPE in Nation selection & editor mods popup (#7144) 2022-06-12 18:10:03 +02:00
Azzurite
dc16bba983 Add more extensive multiplayer documentation 2022-06-12 12:55:39 +02:00
Timo T
9bd8750739
Refactor: Consistent & correct usage of coroutines (#7077)
* Refactor: Consistent usage of coroutines

* Add usage comments to the different threads

* Refactor: Properly separate crash handling into its platform-specific parts

* Fix autoSave never finishing

* Correctly handle coroutines when the GL thread is not accepting runnables anymore

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-12 00:13:49 +03:00
Timo T
9008d242a3
Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type (#7114)
* Refactor: Make Popups work on Stages instead of BaseScreens

* Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type

* Fix "Resume" game loading not fully handling exceptions

* Fix one missed refactoring

* Refactor: remove useless postRunnable
2022-06-11 22:14:44 +03:00
OptimizedForDensity
72b197fdc3
Stop AI puppets from building settlers and military (#7129)
* Stop puppeted cities from building settlers and military

* Move puppet check to function
2022-06-11 22:14:24 +03:00
Yair Morgenstern
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +03:00
Yair Morgenstern
19e0537e8c
Version rollout (#7126)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7124)

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#7112)

* Update Simplified_Chinese.properties (#7107)

* Update Catalan.properties (#7105)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7104)

* Update Italian.properties (#7102)

* Update German translation (#7101)

* Update Indonesian.properties (#7100)

* Update Lithuanian properties (#7099)

* Update Lithuanian.properties

* Update Lithuanian.properties

Co-authored-by: yairm210 <yairm210@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: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com>
2022-06-10 16:49:05 +03:00
Timo T
3e6fc0e22a
Add multiplayer turn sound notification (#6995)
* Refactor: Extract methods & reduce code duplication

* Refactor: Rename Sounds to SoundPlayer

* Refactor: Make UncivSound a data class

As far as I can see, UncivSoundConstants served no purpose

* Refactor: Reorder sounds

* Refactor: Split up ExtensionFunctions and move into own package

* Add multiplayer turn sound notification

* Refactor: Remove unnecessary double translation

* Refactor: Reduce code duplication

* Refactor: No if for boolean logic
2022-06-10 16:44:29 +03:00
Timo T
9918353c66
Fix crash during next turn automation (#7125) 2022-06-10 16:44:02 +03:00
alexban011
55ed226608
disable worldWrap if its disabled in settings (#7123) 2022-06-10 15:48:51 +03:00
Xander Lenstra
9558b79653
Removed incorrectly translated strings from indonesian translation (#7108)
They should not be translated literally, but the link above should be followed to find what should be translated instead.
2022-06-10 00:27:58 +02:00
Yair Morgenstern
5cd992a076 Resolved #7111 - Peace cooldown with city-states 2022-06-09 19:51:08 +03:00
Yair Morgenstern
538b7b8e7d refactor: Simplified city-state war declaration 2022-06-09 19:33:14 +03:00
Yair Morgenstern
467b0b2570 All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances 2022-06-09 19:26:12 +03:00
Yair Morgenstern
6c463797d8 Resolves #7080 - tileFilter matches resource name and uniques 2022-06-08 19:52:45 +03:00