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
82efebf1c8
Version rollout ( #6971 )
...
* Bump version and create initial changelog entry
* Update German translation (#6967 )
* Update German translation
* Update German translation
* Update German translation
* Update Simplified_Chinese.properties (#6960 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Check passing
Kind of embarrassing. A double fault.
* Update French.properties (#6943 )
* Update Italian.properties (#6941 )
* Update Traditional_Chinese.properties (#6921 )
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update android/assets/jsons/translations/Traditional_Chinese.properties
I think this is better
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
* Update Spanish.properties (#6944 )
* Update Spanish.properties
Question: Can translated lines have <" "> in them? Or does it break something?
I ask because in spanish the hierarchy of quotation marks is: «First order “Second ‘third order’ order”».
As probably most fonts don't have <« »> (neither does my keyboard), these (" ") are the "correct" ones to use instead of < ' ' >.
* Update Spanish.properties
* Change <' '> for <" ">
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@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: hhpy123 <100397618+hhpy123@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
2022-05-27 14:00:11 +03:00
214fae6f59
Add simple logging solution ( #6952 )
...
* Add simple logging solution
* Fix Android compilation
For some reason I stashed this and didn't unstash.
* Add better logging explanation
2022-05-27 13:45:13 +03:00
c48c6df22a
Fix piety complete faith discount ( #6961 )
2022-05-27 00:44:16 +03:00
ea03b97639
#6914 Multiplayer Status Display ( #6916 )
...
* Handle subclassing of Events properly
Previously, you could only listen to the exact class
* Add relevant parent classes for the multiplayer events
* Refactor: use the old name as the main name in MultiplayerGameNameChanged event
* Add being able to stop listening to events in the EventBus
* Add tests for EventBus
* Refactor: Extract GameList into standalone file
* Refactor: safeUpdateIf to more generic throttle function
* Refactor: Extract multiplayer UI helper functions into separate file
* Refactor: Extract load/download multiplayer game into logic class from UI
* Make loading a multiplayer game automatically update the in-memory game in OnlineMultiplayer
* Refactor: Extract multiplayer settings into separate object
* Add multiplayer status display
* Fix error with multiplayer games not correctly being cleaned up after successful update
* Prevent loadLatestMultiplayerState() while next turn update is running
* Show "Working..." while waiting for next turn calculations instead of "Waiting for [civ]..."
* Fix race condition while updating online game state
2022-05-25 22:22:58 +02:00
8dadab872c
4.1.3
2022-05-25 19:53:45 +03:00
1ffbaa668a
Version rollout ( #6938 )
...
* Bump version and create initial changelog entry
* Update Traditional_Chinese.properties (#6935 )
* Update Italian.properties (#6934 )
* Update French.properties (#6926 )
* Update Traditional_Chinese.properties (#6924 )
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Spanish.properties (#6923 )
* Update Traditional_Chinese.properties (#6920 )
* Update German translation (#6919 )
* Update Indonesian.properties (#6918 )
* Update Simplified_Chinese.properties (#6917 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.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: Ouaz <Ouaz@users.noreply.github.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: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
2022-05-25 19:45:56 +03:00
e1b76e776d
Fix floodfill abbreviation translation showing on fortify key tooltips ( #6909 )
...
* Fix floodfill abbreviation translation showing on fortify key tooltips
* Fix floodfill abbreviation translation - fix case
* Fix floodfill abbreviation translation - existing and comment
2022-05-25 19:39:08 +03:00
0f63000ac8
Show required resource for upgrades, rework upgrade logic ( #6849 )
...
* Show required resource for upgrades, rework upgrade logic
* Show required resource for upgrades - reviews
2022-05-25 19:35:27 +03:00
93afb26c62
Added option for confirmation when clicking "next turn" button ( #6925 )
2022-05-24 21:32:35 +02:00
4eaf3c8355
Regenerate atlas for e672ca6bf4
2022-05-24 17:34:02 +02:00
e672ca6bf4
Adding the missing spaceship parts unit sprites for FantasyHex tileset ( #6928 )
2022-05-24 17:32:20 +02:00
b59b890ced
Fix multiplayer turn check worker exception ( #6915 )
2022-05-23 10:48:08 +03:00
6836038252
4.1.2
2022-05-22 20:40:51 +03:00
39adaed6b1
Version rollout ( #6911 )
...
* Bump version and create initial changelog entry
* Translations to Brazilian Portuguese (#6900 )
* More translations to Brazilian Portuguese
* Adding more translations to Brazilian Portuguese
* Translations to Brazilian Portuguese
* Update Russian.properties (#6898 )
* Update Spanish.properties (#6885 )
* Update Spanish.properties
* Update Spanish.properties
* Update Italian.properties (#6883 )
* Update German translation (#6878 )
* Update French.properties (#6874 )
* Update Traditional_Chinese.properties (#6872 )
* Update Filipino.properties (#6864 )
* Update Filipino.properties
* Update Filipino.properties
* Update Indonesian.properties (#6863 )
* Update Simplified_Chinese.properties (#6861 )
* Correct translation of 'keep it'
* Update Simplified_Chinese.properties
Computer fixed :D
* Fix error
Player report . F not only appers here, but also affects the Fortify's F
* Update Traditional_Chinese.properties (#6858 )
* Translation rebuild and fix
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com >
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.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: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
2022-05-22 20:36:49 +03:00
fc9668f2d0
Refactor: change GameSaver from singleton to single instance pattern & move autosave logic into GameSaver ( #6846 )
...
* Refactor: change GameSaver from singleton to single instance pattern & move autosave logic info GameSaver
Singleton just doesn't make sense anymore when we have to `init(..)` with different arguments, then we should just make a normal class out of it
* Fix not correctly checking for missing external files dir
* Refactor: use more appropriate library method
* Add logging for external files dir
2022-05-22 19:51:35 +03:00
740886c890
Refactor UncivShowableException ( #6899 )
2022-05-22 13:55:19 +02:00
f34b97a421
Fix multiplayer turn checker potentially stopping turn checks for everyone that plays that game if a file was not found remotely ( #6901 )
2022-05-22 00:13:48 -07:00
244f9477df
Initial Event Bus implementation & Event-based multiplayer updates ( #6826 )
...
* Add EventBus
* Refactor: Extract multiplayer logic into their own classes & make updates event-based instead of throwaway+rebuild
2022-05-22 00:05:33 +02:00
a2bc1a1a29
Assign Population Improvements ( #6650 )
...
City management UI to allow focusing automatic worker placement
Improvements to worker / specialist assignment routines
2022-05-20 00:12:23 +02:00
07593d7034
Fix turn check worker exception ( #6867 )
...
AndroidFileHandle uses Gdx.files internally
2022-05-19 13:43:28 +03:00
3d6a01d633
Build warnings cleanup ( #6827 )
2022-05-19 02:12:18 +02:00
f464ac2544
4.1.1
2022-05-18 23:03:29 +03:00
c990c6338b
Version rollout ( #6855 )
...
* Bump version and create initial changelog entry
* Update Polish.properties a little (#6853 )
* Add some random translations
* Translate the abbreviaation WLTK as DUK (Dzień Uwielbiania Króla)
* Add antoher random translation
* Update Simplified_Chinese.properties (#6852 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Anton <antek@sniec.pl >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
2022-05-18 21:02:55 +03:00
08138c5de7
HexaRealm update ( #6850 )
...
* Delete Oil WellC.png
Since now offshore platform is back again, the "coastal" oil rig is obsolete now.
* Add files via upload
* Add files via upload
* Add files via upload
* Update HexaRealm.json
2022-05-18 20:46:03 +03:00
4513ddb75a
Version rollout ( #6851 )
...
* Update Filipino.properties (#6842 )
* Ukrainian translations (#6840 )
* Update Spanish.properties (#6839 )
* Update Spanish.properties
* Update Spanish.properties
* Update French.properties (#6836 )
* Update Italian.properties (#6835 )
* Update Traditional_Chinese.properties (#6833 )
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update Indonesian.properties (#6831 )
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: Jack Rainy <JackRainy@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
2022-05-18 08:23:28 +03:00
5353f3337c
Fix Gdx.files being garbage collected in MultiplayerTurnCheckWorker ( #6817 )
...
* Add logging to MultiplayerTurnCheckWorker
* Fix NullPointerException in turn check worker: Gdx.files is null
2022-05-18 07:35:00 +03:00
4986505363
Great General typed uniques and improved moddability ( #6818 )
...
* Great General UniqueTyped and improved moddability - draft
* Great General UniqueTyped and improved moddability - reviews
* Great General UniqueTyped and improved moddability - no reason not to cache another
* Integration with JackRainy's solution
* Integration with JackRainy's solution - part 2
* Revert of maxGreatGeneralBonusRadius logic
* Minor refactoring
* Code review: minor refactoring
* Keep the warning for the modders about the obsolete unique
* Code review: Better wording for the unique
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com >
2022-05-18 00:02:53 +03:00
7079619fe2
Great improvements can again be constructed on forest ( #6823 )
...
* Great improvements can again be constructed on forest
This PR fixes a bug where great improvements couldn't be build on
forests/marshes/jungles/etc. It does so by creating a unique which
specifically allows for removing features, and checking for that.
Additionally, we only remove these features when we have the tech to
remove them. For example, you can no longer plonk an Academy down over a
forest without having researched mining.
* Missed the file for vanilla
* Reviews
* Fixed logic
2022-05-17 20:04:49 +03:00
df9b62ff6f
Fix coroutines not being added to desktop:dist ( #6822 )
...
* Use kotlin coroutines instead of raw threads (+ refactorings)
Equal to f8e0f572
2022-05-17 08:37:12 -07:00
8329d56131
Allow generation of "Default" Deciv redux maps ( #6821 )
2022-05-16 13:03:06 +03:00
b5a2aa59b6
4.1.0
2022-05-15 20:44:18 +03:00
01497a14ec
Version rollout ( #6820 )
...
* Bump version and create initial changelog entry
* More translations to Brazilian Portuguese (#6814 )
* Update Brazilian_Portuguese.properties
* Adding translations to Brazilian Portuguese
* Adding more translations to Brazilian Portuguese
* Adding more Brazilian Portuguese translations
* Update Simplified_Chinese.properties (#6811 )
* Update Simplified_Chinese.properties
Fix 2 errors & fill in the space
* Complete translations for Civilopedia
* Update French.properties (#6794 )
* Update Indonesian.properties (#6791 )
* Update Italian.properties (#6790 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
2022-05-15 19:34:50 +03:00
e53303b249
Mark Unciv as an application that may use more memory than usual ( #6819 )
2022-05-15 19:30:48 +03:00
7ef2bbc56c
Revert "Use kotlin coroutines instead of raw threads (+ refactorings) ( #6801 )"
...
This reverts commit f8e0f572
2022-05-15 19:20:23 +03:00
c4de3530f6
Possibility to liberate a traded city ( #6797 )
2022-05-15 17:57:29 +03:00
f8e0f572e4
Use kotlin coroutines instead of raw threads (+ refactorings) ( #6801 )
...
* Refactor: Move classes into their own files
* Handle 404 FileNotFound in UncivServer
* Refactor: Rename method
* Make GameSaver.saveGame throw the exception by default if it is not handled
* Add possibility to work with FileHandles in GameSaver
* Make OnlineMultiplayerGameSaver load the multiplayerServer setting each time it does something
This theoretically makes it unnecessary for the OnlineMultiplayerGameSaver to be re-instantiated each time it is used
* Refactor: Remove duplicated code
* Refactor: Extract NextTurnButton from WorldScreen
* Refactor: Remove WorldScreen-specific code from OptionsPopup
* Use kotlin coroutines everywhere instead of plain threads
This probably also cuts down on our raw thread usage, improving performance, since we now use a cached thread pool (in addition to coroutines being able to reuse threads anyway)
* Improve deep load from notification
* Refactor: Give music download coroutine the proper name
2022-05-15 00:52:45 +03:00
816e542e1c
Notifications not scrollable far enough after in-turn notifications got added ( #6796 )
2022-05-14 23:19:02 +03:00
e94d109166
4.0.16
2022-05-13 13:00:20 +03:00
66abc2f779
Version rollout ( #6789 )
...
* Bump version and create initial changelog entry
* Update Russian.properties (#6787 )
* Update Russian.properties
* Fix translation
* Update Spanish.properties (#6782 )
511 - Yes, the double space is intentional
* Add Fastlane_short_description translations (#6781 )
Also added Civ V - Vanilla and Civ V - Gods and Kings translation.
* Update German translation (#6778 )
* Update French.properties (#6769 )
* Update Indonesian.properties (#6768 )
* Update Simplified_Chinese.properties (#6766 )
* Update Simplified_Chinese.properties
* Make 2 translation together (#1 )
* Fetch the latest update
* Update Simplified_Chinese.properties
Correct language defects and ambiguities and fill in gaps
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
* Update Italian.properties (#6765 )
* Update Korean.properties (#6754 )
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: nilleh <72703236+niltok64@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: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com >
2022-05-13 12:52:53 +03:00
