35c68b47d5
Regenerate atlas & update uniques.md
2022-06-18 23:39:08 +02:00
c922f134e6
Moddable game speeds ( #6856 )
...
* Move GameSpeed definition to JSON files
* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
1facd97782
Translated strings after generating translation files from Adv Opt. ( #7209 )
...
* Translated strings after generating translation files from Adv Opt.
* Amend missing space at the end of the line
2022-06-18 21:43:30 +03:00
f48bc94f87
4.1.11
2022-06-16 21:28:20 +03:00
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
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
564f7b476c
small fixes ( #7181 )
...
* fixes
* relaced translations with _
* better displayCutout
2022-06-16 18:56:18 +03:00
0585194eaf
Fix cutout options crash ( #7169 )
2022-06-15 15:59:58 +02:00
d562eb2dd2
4.1.10
2022-06-14 21:03:20 +03:00
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
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
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
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
d34fa7db3d
4.1.9
2022-06-10 16:56:19 +03:00
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
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
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
d795c56d58
4.1.8
2022-06-08 10:30:04 +03:00
32e93a32e2
Version rollout ( #7098 )
...
* Bump version and create initial changelog entry
* Update French.properties (#7093 )
* Update Italian.properties (#7092 )
* Update German translation (#7087 )
* Update Japanese.properties (#7086 )
* Update Japanese.properties
Added about 20 lines of Japanese translation.
Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.
* Update Japanese.properties
Replaced the commented out fastlane_full_description with appropriate \n for line breaks
* Update Japanese.properties
Various easy one line translations
* Update Spanish.properties (#7082 )
* Update Catalan.properties (#7081 )
* Update Indonesian.properties (#7079 )
Co-authored-by: yairm210 <yairm210@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: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: itmaru <34495311+itmaru@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: kensvin <63847755+Kensvin28@users.noreply.github.com >
2022-06-08 10:25:11 +03:00
b79246ee02
Certain projects cannot be hurried by great engineer ( #7076 )
2022-06-08 10:20:45 +03:00
b05072d0c9
Fix "Free technology" allowing you to get a technology you're not supposed to be able to get ( #7083 )
2022-06-08 02:16:46 +02:00
47c7026dad
Update ManuallyBlockedMods.json ( #7089 )
...
Deciv repository has been transferred recently and it has been updated with same standard as Deciv Redux.
2022-06-07 20:23:11 +03:00
ea3b1bb612
4.1.7
2022-06-06 10:02:02 +03:00
120c41dd15
Revert "Moddable prettier Tutorials - Step 1 ( #7064 )"
...
This reverts commit e91c0ff212
2022-06-06 09:59:21 +03:00
6d50169c14
Version rollout ( #7078 )
...
* Bump version and create initial changelog entry
* Update Romanian.properties (#7069 )
* Update Romanian.properties
* Update Romanian.properties
* Update Japanese.properties (#7068 )
* Update Japanese.properties
Added about 20 lines of Japanese translation.
Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.
* Update Japanese.properties
Replaced the commented out fastlane_full_description with appropriate \n for line breaks
* Update Traditional_Chinese.properties (#7066 )
* Update Traditional_Chinese.properties
* Update android/assets/jsons/translations/Traditional_Chinese.properties
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
* Update Simplified_Chinese.properties (#7065 )
* Update Simplified_Chinese.properties
Complete easy stuff.
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* ［ＺＨ］Ｆｉｘ ｔｙｐｏ
* Update Simplified_Chinese.properties
* Update Lithuanian.properties (#7060 )
* Update Lithuanian.properties
* Update Lithuanian.properties
* Update Lithuanian.properties
* Update Lithuanian.properties
* Update French.properties (#7053 )
* Update Filipino.properties (#7050 )
* Update German translation (#7048 )
* Add missing Spanish translations (#7043 )
* Add multiplayer translations
* Other translations
"Fastlane_full_description"([this](8fbcad47a4/android/assets/jsons/translations/Spanish.properties (L23)#7041 )
* Update Catalan.properties
* Amend a string missing [beliefType]
* Update Catalan.properties
* Update Catalan.properties
* Amend some Catalan localisation strings.
# Conflicts:
# android/assets/jsons/translations/Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: alexban011 <alexban011@gmail.com >
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com >
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: RIMOPA <97112832+RIMOPA@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
2022-06-06 09:37:29 +03:00
1312140793
More rankings & demographics screen icons ( #7063 )
...
* Add icons to demographics/rankings screen
* Unused import
* Some simplification
* Reviews
* Undelete atlas
2022-06-06 09:33:34 +03:00
e91c0ff212
Moddable prettier Tutorials - Step 1 ( #7064 )
2022-06-06 09:32:23 +03:00
bbe74854b4
Fix current list of un-translatables ( #7057 )
...
* Fix current list of un-translatables
* Fix current list of un-translatables - revert tr() change and tweak map editor map parameter display
2022-06-06 07:43:28 +03:00
13da7c1b9e
Better friends list UI ( #7054 )
2022-06-06 03:02:45 +02:00
a7e8b1a252
Translated notifications into Romanian ( #7045 )
2022-06-04 15:31:42 +02:00
56f11ccdca
HexaRealm tileset update ( #7017 )
...
* Delete Oil WellC.png
Since now offshore platform is back again, the "coastal" oil rig is obsolete now.
* Adding spaceship parts sprites for FantasyHex tileset
* Add files via upload
* Add files via upload
2022-06-02 08:49:09 +03:00
8fbcad47a4
4.1.6
2022-06-01 22:54:14 +03:00
ae13a87987
Version rollout ( #7038 )
...
* Bump version and create initial changelog entry
* Update Traditional_Chinese.properties (#7037 )
* Update Traditional_Chinese.properties (#7024 )
* Update Italian.properties (#7023 )
* Update Traditional_Chinese.properties (#7016 )
* Update German translation (#7015 )
* Update German translation
* Update German translation
* Update French.properties (#7012 )
* Translation PTBR (#7011 )
* fastlane ptbr wip
* fastlane ptbr done
* add fastlane translation to main ptbr
* Update Brazilian_Portuguese.properties
* tabs and multiplayer
* Update Brazilian_Portuguese.properties
* Update Brazilian_Portuguese.properties
* Update Brazilian_Portuguese.properties
* Update Brazilian_Portuguese.properties
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Chia-Hung Ni <jameseses@gmail.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: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com >
2022-06-01 22:47:54 +03:00
e4e2696160
Friends list ( #7020 )
...
* created files for friends list screen
* redone #3
* fixed some crashes and more additions
* changelog in the comment below
* Update .gitignore
included the FriendsList.json file
* changelog in the comment below, again
* optimized imports to hopefully fix the error in github build check
* replaced imports with the ones from master since OnlineMultiplayer.kt no longer exists
* imported ViewFriendsList
* used the right package for all friendsList related files and a little bit of cleanup
* check if friends list is empty before adding the select friend button
* check if the ID is correct when adding a new friend
* don't set null as playerID if no friend is selected
* added messageTexts for the input TextFields
* don't show already selected friends
* fixed checkmark not updating after selecting a friend
* you can't be your own friend! and other checks for edit button
* fix error
* replaced error type with enum, replaced nested ifs with when loop, added additional checks when editing friends
* fixed error, can't really tell how I managed to do this
* reorganized checks for adding and created settings variable to hopefully fix the github build error
* actually fixed github error
* it now removes selected friends from the list of selectable friends
* fixed not being able to change only the id of a friend
* made it look half decent
* cleanup + improved help button
* updated template.properties
* renamed variable
* some tweaks
* moved friends list to GameSettings
* tested every feature and fixed what didn't work
* removed redundant variables and final cleanup
* little improvements
* string improvements
* removed rightSideButton from ViewFriendsListScreen
* removed unnecesary uniformX and decreased padding to allow seeing more friends in ViewFriendsListScreen
2022-06-01 22:47:43 +03:00
5a4f1b0903
Allow non-SSL-encrypted HTTP traffic & warn Dropbox users ( #7013 )
...
* Add usesCleartextTrafic permission to Android manifest
* Add warning for starting a multiplayer game with the default Dropbox server
* Improve multiplayer server documentation
* Only update the current game if we're using a custom server or it's not our turn
* Refactor: Nicer variable name
* Fix compilation
* Fix type
Don't know what happened there
2022-06-01 22:40:20 +03:00
1abc65163d
Fix multiplayer sometimes duplicating games ( #6999 )
...
* Fix multiplayer sometimes duplicating games
* Fix test compilation
2022-06-01 22:24:44 +03:00
afce951724
Pillaging certain improvements may loot gold or other stat resources ( #6993 )
...
* Pillaging loots gold on certain improvements
* Add warning if improvement pillageGold > 0 and has UniqueType.Unpillagable
* Pillage yields as a UniqueType
* Forgot to undo demonstration
* Remove unused line
* Eliminate some redundancy
* Reword unique text
* Slight cleanup and add notification for pillage victim
* Reviews
* Made pillaging notifications more consistent with other hostile action notifications
* Missed a line
2022-06-01 19:13:04 +02:00
98d189384c
Update template to add 'wait' ( #7021 )
2022-05-31 16:33:47 +03:00
1b008905f6
Save and load reorg and keyboard handling ( #6929 )
...
* Load and Save Game Screens rework - Linting
* Load and Save Game Screens rework - Modularize and Keyboard
* Load and Save Game Screens rework - error handling
* Load and Save Game Screens rework - Move other save/load code
* Load and Save Game Screens rework - More Keyboard
* Load and Save Game Screens rework - Increase clipboard limit
* Load and Save Game Screens rework - Post-merge patch
* Load and Save Game Screens rework - Home, End, harden
* Load and Save Game Screens rework - Post-merge patch again
* Load and Save Game Screens rework - reviews
2022-05-31 16:31:19 +03:00
ad7397de66
Territory steal rewording
2022-05-30 21:59:32 +03:00
efa2168784
4.1.5
2022-05-30 21:50:56 +03:00
44ee9efd94
Version rollout ( #7007 )
...
* Bump version and create initial changelog entry
* Update Simplified_Chinese.properties (#7005 )
* Update German translation (#6997 )
* Update French.properties (#6987 )
* Update Romanian.properties (#6982 )
* Update Spanish.properties (#6981 )
* Update Traditional_Chinese.properties (#6973 )
* Update Indonesian.properties (#6972 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: alexban011 <alexban011@gmail.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: hhpy123 <100397618+hhpy123@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
2022-05-30 21:43:33 +03:00
8ab686cb14
Improve suggestions when constructing an improvement is not possible ( #6947 )
...
* Improve suggestions when constructing an improvement is not possible
* Reimplement getImprovementBuildingProblems() as a generator function
* Update documentation of getImprovementBuildingProblems(); forgotten in the last commit
* ImprovementPickerScreen - tr
* Rename a variable for clarity
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com >
2022-05-29 22:16:04 +03:00
a17797a709
Add Catalan translation and provide some strings. ( #6992 )
2022-05-29 16:50:47 +02:00
09195d6b62
More UniqueType unit tests and correct some broken uniques in JSON files ( #6965 )
...
* Add ruin reward unique check plus fix broken unique
2022-05-29 16:08:15 +02:00
ea31bd164f
Add optional on-screen buttons to zoom in and out ( #6933 )
2022-05-29 15:32:36 +02:00
e4e6b842cb
Refactor: Remove superfluous postCrashHandlingRunnable ( #6974 )
2022-05-28 00:11:14 +02:00
a942c961b5
Fix multiplayer turn check worker writing game data to wrong locations ( #6976 )
...
The fix in #6901 caused `arrayIndex` to go out of sync, because the `continue` happened before `arrayIndex` was incremented. This caused a later game preview to be saved to the previous game name, overwriting and duplicating it.
2022-05-27 16:34:24 +02:00
3a03799074
Refactor: Extract all cross-platform code from CustomSaveLocationHelpers into core module ( #6962 )
...
* Also fixes the GameInfo.customSaveLocation to work for Android
2022-05-27 15:53:18 +02:00
c01d2a8893
4.1.4
2022-05-27 14:06:38 +03:00
