MartinP
98d189384c
Update template to add 'wait' ( #7021 )
2022-05-31 16:33:47 +03:00
SomeTroglodyte
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
Yair Morgenstern
983a9b705e
Resolved #7008 - Civs get *random* luxury resources near their starting location
2022-05-30 22:25:52 +03:00
Yair Morgenstern
ad7397de66
Territory steal rewording
2022-05-30 21:59:32 +03:00
Yair Morgenstern
efa2168784
4.1.5
2022-05-30 21:50:56 +03:00
Yair Morgenstern
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
SomeTroglodyte
69698e99ee
Reorder TileGroup layers to draw borders under Pixel Units ( #6980 )
...
* Reorder TileGroup layers to draw borders under Pixel Units
* Reorder TileGroup layers to draw borders under Pixel Units - reviews
2022-05-29 22:16:35 +03:00
Paul Pogonyshev
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
alexban011
97ed9cd668
Disable state-changing buttons for puppet cities ( #6975 )
2022-05-29 19:53:15 +02:00
SomeTroglodyte
f1e3e1b094
Fix NextTurnButton lateinit crash ( #6979 )
2022-05-29 16:51:33 +02:00
Joan Josep
a17797a709
Add Catalan translation and provide some strings. ( #6992 )
2022-05-29 16:50:47 +02:00
OptimizedForDensity
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
alexban011
ea31bd164f
Add optional on-screen buttons to zoom in and out ( #6933 )
2022-05-29 15:32:36 +02:00
alexban011
57c027dca5
Land melee units can only attack water units once they are able to embark ( #6957 )
2022-05-29 15:27:57 +02:00
itanasi
37d6233f5d
Dynamically adjust StatsTable height ( #6990 )
...
* Dynamically adjust StatsTable height
* redo Gradle?
* redo Gradle?
* Remive undeeded default
* Remove reduant init() line
* Make top portion fixed and lower section scroll
2022-05-29 08:46:35 +03:00
alexban011
b8f987d791
changed main menu world shape to rectangular ( #6983 )
...
* change to rectangular
* clean up
2022-05-29 04:51:15 +02:00
Yair Morgenstern
f613bba7d4
Better minimap buttons
2022-05-29 00:07:07 +03:00
SomeTroglodyte
1731e8aa44
Fix incorrect attribution ( #6978 )
2022-05-28 22:54:44 +03:00
alexban011
7db4806274
Fix GitHub markdown of crash report save game ( #6986 )
2022-05-28 01:20:52 +02:00
Timo T
e4e6b842cb
Refactor: Remove superfluous postCrashHandlingRunnable ( #6974 )
2022-05-28 00:11:14 +02:00
Azzurite
067be5a292
4.1.4-patch1
2022-05-27 16:36:14 +02:00
Timo T
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
Timo T
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
Yair Morgenstern
c01d2a8893
4.1.4
2022-05-27 14:06:38 +03:00
Yair Morgenstern
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
itanasi
317e8c74df
Citizen Management as Expandable Tab ( #6969 )
...
* Add ScrollPane to CityStatsTable, limit to half screen height
* Reformat CitizenManagementTable to not have clashing background. Add Expander functionality
Remove button and Table from CityScreen
CitizenManagement added in CityStatsTable
Other cleanup
* Move Reset Citizens to within ExpanderTab
* Minor code format whitespace
2022-05-27 13:59:57 +03:00
itanasi
67065d766b
Make Locked Tiles workable, and thus clickable ( #6966 )
2022-05-27 13:55:51 +03:00
Yair Morgenstern
62dc05ee5c
AI counteroffers will no longer contain items already offered by the player for 'double declaration of war' etc ( #6940 )
2022-05-27 13:55:33 +03:00
alexban011
591c96b0c1
puppet cities only focus on gold ( #6946 )
...
* fixed issue
* cleanup
* puppets only like making gold
* fully revert file to master file
* Update CityInfo.kt
2022-05-27 13:52:23 +03:00
Timo T
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
OptimizedForDensity
c48c6df22a
Fix piety complete faith discount ( #6961 )
2022-05-27 00:44:16 +03:00
itanasi
e7a90f2ad0
Make so Citizen Management buttons don't work if Spectator ( #6954 )
2022-05-26 15:24:55 +03:00
Timo T
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
Yair Morgenstern
8dadab872c
4.1.3
2022-05-25 19:53:45 +03:00
Yair Morgenstern
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
SomeTroglodyte
e54fda5a4a
Resource supply list reorg ( #6881 )
...
* ResourceSupplyList reorg
* ResourceSupplyList reorg - instrumentation
* ResourceSupplyList reorg - map of maps
* ResourceSupplyList reorg - revert to ArrayList
* ResourceSupplyList reorg - review
* ResourceSupplyList reorg - review
* ResourceSupplyList reorg - almost-immutability
2022-05-25 19:42:51 +03:00
SomeTroglodyte
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
SomeTroglodyte
392a8d5de9
Re-hide Enable Portrait option on desktop ( #6912 )
...
* Re-hide Enable Portrait Option in desktop version
* MainMenu Background Map Job cancellable
* MainMenu Background Map generation cancellable
* MainMenu Background Map cancellable - remove instrumentation
* Revert "MainMenu Background Stuff"
2022-05-25 19:37:44 +03:00
SomeTroglodyte
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
SomeTroglodyte
0461d9d7fd
Fix Right-Click attacks made no sound ( #6906 )
...
* Fix Right-Click attacks made no sound
* Fix Right-Click attacks made no sound - no UI in logic
* Fix Right-Click attacks made no sound - comments
* Fix Right-Click attacks made no sound - comments
2022-05-25 19:34:41 +03:00
SomeTroglodyte
e927ef6f64
ImageGetter.getDrawable a few ns faster ( #6936 )
2022-05-25 19:33:17 +03:00
SomeTroglodyte
6f7af9ee22
KeyPressDispatcher no longer silently eats exceptions ( #6931 )
2022-05-25 19:32:24 +03:00
OptimizedForDensity
fe0ec08e61
Fix missing icons and translations in civilopedia accessed from main menu ( #6922 )
...
* Fix blank icons
* Apply translations to civilopedia + use complex ruleset
* Unused import
* Typo
* Simplify definition
2022-05-25 19:31:12 +03:00
Timo T
156db1f5f7
Go back to current game when you press "Resume" on the main menu ( #6882 )
2022-05-25 19:27:59 +03:00
SomeTroglodyte
16874f5da6
Implement a waiting command ( #6884 ) ( #6896 )
...
* Implement a waiting command (#6884 )
* Resolve misc. issues with commit 27a03bca893d9fe9cc2ca7ed154
2022-05-25 04:07:20 +02:00
alexban011
0661bbc31b
Fixed slider sound playing when opening NewGameScreen and MapEditor ( #6932 )
...
* fixed slider sound playing in some of the tabs
* made "initial" value mandatory to avoid such issues in the future
* initial values now taken from gameParameters
* whitespaces
2022-05-24 22:43:00 +02:00
alexban011
93afb26c62
Added option for confirmation when clicking "next turn" button ( #6925 )
2022-05-24 21:32:35 +02:00
Azzurite
4eaf3c8355
Regenerate atlas for e672ca6bf4
2022-05-24 17:34:02 +02:00
The Bucketeer
e672ca6bf4
Adding the missing spaceship parts unit sprites for FantasyHex tileset ( #6928 )
2022-05-24 17:32:20 +02:00
Yair Morgenstern
b710f8f6a1
4.1.2-patch1
2022-05-23 10:48:37 +03:00
