mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-10 19:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,116 Commits 6 Branches 1,050 Tags 1.1 GiB
b992144ecd
Commit Graph

6154 Commits

Author SHA1 Message Date
itanasi
753358c1f0
On City Raze, previous owner doesn't pay Road Maintenance (#9706) 2023-07-02 14:53:19 +03:00
SeventhM
589a9fa29f
Fix when units can be purchased (#9715) 2023-07-02 14:53:06 +03:00
Yair Morgenstern
0edfa4841e Better image documentation for modders 2023-07-02 02:42:36 +03:00
Yair Morgenstern
bb22b1de72 Actually generated unique type documentation 2023-07-02 01:36:28 +03:00
Yair Morgenstern
d0643efe6b Added unique type documentation in wiki 2023-07-02 01:28:27 +03:00
Yair Morgenstern
fd2bfbdc10 Resolves #9561 - "Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names 2023-06-30 15:47:45 +03:00
Yair Morgenstern
947a1001c4 Resolves #9703 - AI only buys tiles contiguous to the current city tiles (was: contiguous to civ tiles) 2023-06-30 15:13:14 +03:00
SomeTroglodyte
1694a59fd2
Defense against circular references in Promotions (#9694) 
* Promotion picker - working defense against circular references

* Mod checker - complain about circular references
 2023-06-29 09:18:07 +03:00
Yair Morgenstern
6eeb630b6c chore: 'cityInfo' purge (changed to 'city' everywhere) 2023-06-28 23:38:01 +03:00
Yair Morgenstern
83270ddf8f Resolved #9689 - no city window on citybutton click 2023-06-28 19:08:52 +03:00
Yair Morgenstern
4a7f484900 Revert "Solved strange concurrency crashes due to players keypress-activating disabled buttons" 
This reverts commit ee855b8d77.
 2023-06-28 19:01:37 +03:00
Yair Morgenstern
4c28905e2c Undo Move button moved to far right, so other buttons stay in place 2023-06-28 13:23:22 +03:00
SomeTroglodyte
a8ec8f84ec
Architectural update - Make animated menu reusable (#9685) 
* Extract AnimatedMenuPopup from UnitUpgradeMenu to make its basic idea reusable

* Rebase UnitUpgradeMenu onto AnimatedMenuPopup

* Add SoundPlayer.playRepeated for future reusability

* Move UnitUpgradeMenu to popups package

* Reuse playRepeated in PromotionPickerScreen

* Reuse playRepeated in PromotionPickerScreen - clean up imports
 2023-06-28 12:05:04 +03:00
Yair Morgenstern
f5d3f346b1
Version rollout (#9684) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#9682)

* Updated Brazilian_Portuguese.properties (#9677)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update German translation (#9675)

* Update French.properties (#9674)

* Update Russian.properties (#9672)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#9670)

* Update Polish.properties (#9668)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: JOGANfruit <77359522+JOGANfruit@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-28 11:05:23 +03:00
SomeTroglodyte
c45d3ecb7c
Promotion picker allowing picking chains in one go (#9655) 
* Try to allow chained promotion picking

* Reorg PromotionPickerScreen into own package

* Draft for new PromotionTree

* Change PromotionPickerScreen to use new tree (picking still not done)

* Finish new PromotionPickerScreen - code

* Finish new PromotionPickerScreen - assets and linting

* Finish new PromotionPickerScreen - polish positioning and lines

* Finish new PromotionPickerScreen - fix sound

* Finish new PromotionPickerScreen - little optimization

* Finish new PromotionPickerScreen - emphasize line along path

* Finish new PromotionPickerScreen - merge fix

* Finish new PromotionPickerScreen - address comments

* Finish new PromotionPickerScreen - fix sort and update wiki
 2023-06-28 10:49:35 +03:00
random271
d298f85099
Fixing workers dying in mountains bug for Carthage (#9665) 
* Fixed workers dying in mountain tiles issue for Carthage

* Accounts for all damage dealing tiles

* Update WorkerAutomation.kt

* Update Tile.kt

* Update WorkerAutomation.kt

* Update WorkerAutomation.kt
 2023-06-28 10:48:44 +03:00
SeventhM
73fa87e6b4
Check for trigger uniques when starting and recaluating population (#9673) 
* Check for trigger uniques when starting and recaluating population

* Adding imports

* whoops

* Moved where starting techs are added, added a parameter, and fixed the check for GUI
 2023-06-28 10:48:33 +03:00
Yair Morgenstern
ee855b8d77 Solved strange concurrency crashes due to players keypress-activating disabled buttons 2023-06-28 10:45:36 +03:00
Yair Morgenstern
bef1843cd9 chore: Removed vestigal city.apply{} for CityInfoConquestFunctions, for clarity on what is actually for the city and what is not 
No logic changes
 2023-06-28 10:34:29 +03:00
Yair Morgenstern
42a9c3af57 Resolved #9679 - 'liberate city and resurrect civ' no longer crashes 
Kudos @SomeTroglodyte and @random271 for locating the problem :)
 2023-06-28 10:27:09 +03:00
Yair Morgenstern
a6e4b72cf4 AI no longer purchases non-contiguous tiles 2023-06-26 23:07:53 +03:00
Yair Morgenstern
0536c5f24b Resolved #9669 - city name translation for conquered popup does not get icon 2023-06-26 22:08:41 +03:00
SomeTroglodyte
6a8f4914b8
More defensive coding of speedupWonderConstruction (#9671) 2023-06-25 19:24:30 +03:00
Yair Morgenstern
330fa6593b 4.7.4 2023-06-25 10:07:17 +03:00
Yair Morgenstern
14e1683db2
Version rollout (#9667) 
* Bump version and create initial changelog entry

* Ukrainian translations (#9663)

* Update French.properties (#9662)

* Update French.properties

* Fix wrong key

* Update Spanish.properties (#9652)

* Update Spanish.properties

* Update Spanish.properties

* Brazilian_Portuguese.properties (#9649)

* Update Italian.properties (#9647)

* Update Italian.properties

* Update Italian.properties

* Update German.properties (#9646)

* Update German.properties

* Fixed missing [spyname]

---------

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

* Update Polish.properties + question (#9644)

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-25 09:58:03 +03:00
SomeTroglodyte
0aca3c307b
Notifications architectural update (#9605) 
* Improved Notifications architecture

* Revert NotificationIcon as class hierarchy

* Improved Notifications architecture - migration roadmap first step
 2023-06-25 09:47:50 +03:00
SomeTroglodyte
1a6d8d72bb
Fix ruleset error crash (#9666) 
* Harden NewGameScreen against exceptions from getComplexRuleset

* Miscellaneous tweaks to NewGameScreen - e.g. allow it to show last used custom map
 2023-06-25 09:46:00 +03:00
SomeTroglodyte
abb0dcbaae
Mod name defense attempt II (#9645) 
* Improve Load game error label readability

* Fix threading on load game screen

* Miscellaneous tweaks

* Compatibility with Mods using trailing dashes on Windows
 2023-06-25 09:38:18 +03:00
Jack Rainy
82ebb01a20
Zoom in/out of the history charts (#9660) 
* Do not recreate the Line Chart every time

* Simplifed the Line Chart creation

* Do not create objects in draw(): VictoryScreenCivGroup table

* Do not create objects in draw(): Labels

* Create labels without negative Y

* Lift the X axis if there is an negative number

* Arbitrary number of -Y labels

* Autoscale by Y axis

* Zoom in/out by click

* Autoscale by X axis

* Unit tests for LineChart

* Rework of the line chart rendering
 2023-06-25 09:37:08 +03:00
SeventhM
1285133884
Adding field for great person type (#9614) 
* Adding Field for great person types

* Switching from unit field to unique

* Simplification and adding back in the old field for backward compatibility

* Deprecate old field for checking great person

* Fix error

* Fixes part 2. I probably should've waited
 2023-06-25 09:36:33 +03:00
Xander Lenstra
aa0fb9ed8b
More unit unique tests (#9639) 2023-06-25 09:35:31 +03:00
SeventhM
bc3f1341e1
Tech column validation and removing crashes from undefined building costs (#9664) 
* Add in tech column validation

* Negative Columns

* Forgot to add techColumns to the add and clear functiond

* Remove restrictive cokumn check

* bugfixing
 2023-06-25 09:34:23 +03:00
SomeTroglodyte
650a43aa3b
Make UncivGame.isInitialized inaccessible outside of the class hierarchy (#9651) 
* Make UncivGame.isInitialized inaccessible outside of the class hierarchy

* Fix JvmName
 2023-06-25 09:03:44 +03:00
Yair Morgenstern
a246baa333 Resolved #9638 - Removing old buildings on enemy capital (when not last city) no longer crashes 2023-06-23 10:17:45 +03:00
Yair Morgenstern
ee668710e2 Resolved #9637 - Concurrent modification fix for liberated city with multiple units in it 2023-06-23 09:54:33 +03:00
Yair Morgenstern
b7e4ca358c Resolved #9641 - Removed static wrapper functions from WorkerAutomation 2023-06-23 09:51:04 +03:00
Yair Morgenstern
66eed083f2 Fixed broken build 2023-06-23 09:26:53 +03:00
Yair Morgenstern
970cb3cf3d
Version rollout (#9642) 
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#9634)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#9628)

* Update French.properties (#9626)

* Update Italian.properties (#9624)

* Update German translation (#9623)

* Update Polish.properties (#9620)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Leslie Yu <32165704+leslieyu608@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-23 09:08:38 +03:00
SeventhM
38cf71a7ab
Bug fix: Buildings not set to -1 by default correctly (#9635) 
* Change the default cost of buildings and the default time of tile improvements

* Bugfix: default building cost is now set to -1 as intended
 2023-06-23 08:52:47 +03:00
SeventhM
f78fd7e665
Move on water (#9622) 
* Add in Move on water unique

* Small fixes

* Remove redundant check
 2023-06-23 08:51:48 +03:00
Xander Lenstra
47e93a86bf
Spies now occasionally steal technologies (#9629) 
* Spies now occasionally steal technologies

* Updated the UI so it doesn't show a turn counter when that cannot be provided

* Implemented changes discussed in reveiw comments

* Renamed variable

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-06-23 08:51:34 +03:00
Xander Lenstra
3c1f0f7814
Spies in cities that are captured or destroyed now go to the hideout (#9632) 
* Spies in cities that are captured or destroyed now go home

* Turned spy flee reason string into enum
 2023-06-23 08:50:56 +03:00
Crsi
e1fb0e489d
Moved the default message to the ApiStatusCode enum (MPv2) (#9630) 2023-06-20 13:08:09 +03:00
SomeTroglodyte
ff54bcd493
Prevent mod conflicts better (#9586) 
* Tighten mod check severity and selectivity for unit-producing triggered Uniques

* Prettify display of mod check results by suppressing dupes and hiding conditionals from tr()

* Extra confirmation to play with errors, colors, improved handling of mod checkboxes

* Tweaks to improved mod checking in new game
 2023-06-19 19:02:09 +03:00
SeventhM
172fee9902
Change the default cost of buildings and the default time of tile improvements (#9621) 2023-06-19 19:01:40 +03:00
Yair Morgenstern
c0e5f9d736 Linked Unit Types and Promotions in Civilopedia 2023-06-19 16:04:35 +03:00
Yair Morgenstern
e987bbbaad Added new unique - "Automatically built in all cities where it is buildable" 2023-06-19 15:40:21 +03:00
Yair Morgenstern
4107e081bd 4.7.2 2023-06-18 18:29:55 +03:00
Yair Morgenstern
4579e37848
Version rollout (#9618) 
* Bump version and create initial changelog entry

* Ukrainian translations :flag-ua: (#9615)

* update Simplified_Chinese (#9613)

* Updated Brazilian_Portuguese.properties (#9599)

* Update French.properties (#9597)

* Update Italian.properties (#9595)

* Update Italian.properties

* Update Italian.properties

* Update Polish.properties (#9594)

replaced symbols with polish letters

* Update Polish.properties (#9593)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@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: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
 2023-06-18 18:26:18 +03:00
Crsi
bd3aa54670
Multiplayer v2: networking stack, dependencies & API definition (#9589) 
* Added new ktor dependency for developing multiplayer API v2

* Added the api package, including endpoint implementations, cookie helpers, serializers and structs

* Fixed a bunch of problems related to error handling

* Fixed some API incompatibilities, added getFriends() method

Rename the Api class to ApiV2Wrapper, added a chat room screen

Replaced logging dependency, renamed the endpoint implementations

* Dropped the extra logger to remove dependencies, added the APIv2 class

* Restructured the project to make ApiV2 class the center

* Improved chat handling, added server game detail caching

Added a generic HTTP request wrapper that can retry requests easily

Added a default handler to retry requests after session refreshing

* Updated the API structs based on the new OpenAPI specifications

Switched endpoint implementations to use the new 'request', updated WebSocket structs

* Updated the auth helper, added the UncivNetworkException

Fixed some more issues due to refactoring APIv2 handler

Fixed some issues and some minor incompatibilities with the new API

* Implemented the LobbyBrowserTable, added missing API endpoint

Fixed login and auth issues in the main menu screen

* Added new WebSocket structs for handling invites and friends

Updated the API reference implementation

* Added GET cache, allowed all WS messages to be Events, added missing endpoints

Added func to dispose and refresh OnlineMultiplayer, only show set username for APIv2

* Reworked the ApiV2 class to improve WebSocket handling for every login

Added small game fetch, fixed lobby start, some smaller fixes

* Change the user ID after logging in to fix later in-game issues

Attention: Afterwards, there is restoration of the
previous player ID. Therefore, it won't be possible to
revert back to APIv0 or APIv1 behavior easily (i.e., without
saving the player ID before logging in the first time).

Added serializer class for WebSocket's FriendshipEvent enum

Fixed chat room access and cancelling friendships

* Fixed WebSocket re-connecting, outsourced configs

Updated the RegisterLoginPopup to ask if the user wants to use the new servers

Implemented a self-contained API version check with side-effects

Fixed various problems with WebSocket connections

Don't show kick button for lobby owner, handle network issues during login

* Added English translations for ApiStatusCode, fixed broken APIv1 games for uncivserver.xyz

Fixed subpaths in baseUrl, added server settings button

* Added WS-based Android turn checker, added a new event channel, fixed APIWrapper

Added a logout hook, implemented ensureConnectedWebSocket

Merge branch 'master' into dev

* Throttle auto-reconnect for WS on Android in background, added reload notice for your turn popup

Implemented real pinging with awaiting responses, fixed ping-related problems

* Adapted new getAllChats API, added outstanding friend request list, improved styling

* Added the ApiVersion enum and the ApiV2 storage emulator

* Updated the APIv2 file storage emulator

* Replaced all wildcard imports with named imports
 2023-06-18 18:17:59 +03:00
SomeTroglodyte
fa68b8746e
Fix conditionals for trigger upon declaring friendship running twice (#9601) 2023-06-18 18:15:40 +03:00
SomeTroglodyte
d79c68b273
More keyboard binding work - World, World Menu Popup, WASD (#9598) 
* Groundwork for tooltips for user-bindable keys

* WorldScreen keyboard revisited

* WorldScreen menu popup keyboard support

* WorldScreen WASD bindable
 2023-06-18 18:11:10 +03:00
Xander Lenstra
5e9059cd1e
Small comment changes in UniqueType.kt (#9617) 2023-06-18 16:35:17 +03:00
Yair Morgenstern
c823989c39 Reverted BFS changes, since they caused significant performance degradation 2023-06-18 01:03:20 +03:00
Yair Morgenstern
298771a72b Revert "Workers try to build roads utilizing existing roads, and railroads overriding existing roads" 
This reverts commit e558ebcc59.
 2023-06-18 01:01:12 +03:00
Yair Morgenstern
291c546dec Performance improvements 
- use existing map for building resource check, instead of iterating over uniques
- remove one retrieval for UniqueMap.addUnique

Idea for future improvement: setTerrainFeatures currently populates a UniqueMap for each tile. MANY tiles share the same set of features...
 2023-06-18 00:45:34 +03:00
Yair Morgenstern
ead83b912b Performance improvements 
- unit unique check uses map, not array search
 2023-06-18 00:25:03 +03:00
Yair Morgenstern
e634423b2f Performance improvements 
- containsBuildingUnique uses map, not array search
 2023-06-18 00:01:36 +03:00
Yair Morgenstern
51583ab588 Performance improvements 
- forCivGetMatchingUniques doesn't toString stateForConditionals if the result would anyway not be cached
 2023-06-17 23:59:42 +03:00
Yair Morgenstern
259eeeb56c Performance improvements 
- improvementFilter checks map instead of array for textual match
- forCityGetMatchingUniques does not string-serialize conditionals - revealed by flame chart to be significant
 2023-06-17 23:47:49 +03:00
Xander Lenstra
639d34e28d
Reordered the region of other global uniques and wrote a few unique tests (#9611) 2023-06-17 20:59:51 +03:00
Yair Morgenstern
6be79671f3 Automated air units no longer lose "automated" state after moving between cities 2023-06-16 11:17:26 +03:00
Yair Morgenstern
7748b3f358 Deprecated "Can start an [amount]-turn golden age" unique 2023-06-16 11:07:48 +03:00
Yair Morgenstern
bc0965e73e Deprecated "Can construct [improvementName]" unique 2023-06-16 11:05:48 +03:00
SomeTroglodyte
7f626083ee
Fix and cache CannotMove unique (#9596) 2023-06-16 10:37:26 +03:00
SomeTroglodyte
ea505e3e97
Fix translation problems due to nested brackets in getDifferences (#9600) 2023-06-16 10:36:24 +03:00
Yair Morgenstern
11c6a88c68
Version rollout (#9592) 
* Bump version and create initial changelog entry

* Update Hungarian.properties (#9588)

* Update Spanish.properties (#9582)

* template.properties re-sort, one missing entry (#9581)

* Updated Brazilian_Portuguese.properties (#9578)

* Update French.properties (#9577)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: JurDan | Werewolf Cookie <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-06-15 10:59:39 +03:00
SomeTroglodyte
ce29aaf472
Improve Alert Popup scrolling (#9559) 
* Revert AlertPopup button layout to pre-9513 state

* Fix merge mistake

* AlertPopup - patch

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-06-15 10:40:04 +03:00
Yair Morgenstern
c3db8ba971 AI prioritizes its path to buying highly desirable tiles 2023-06-14 09:58:02 +03:00
Yair Morgenstern
b776790556 AI prioritizes work boats, and creates work boats for close non-contiguous cities 2023-06-14 09:48:32 +03:00
Yair Morgenstern
e558ebcc59 Workers try to build roads utilizing existing roads, and railroads overriding existing roads 2023-06-14 09:31:32 +03:00
SomeTroglodyte
46a84c23b0
Make mod categories curated in Json (#9542) 
* Dynamic mod categories from online query

* Move Working string to Constants

* Move Mod categories to json

* Move Mod categories to json - UI

* Move Mod categories to json - initial json
 2023-06-14 09:12:24 +03:00
SomeTroglodyte
b0a1eed872
Scene2D debug tool (#9579) 2023-06-14 08:20:34 +03:00
SomeTroglodyte
c56644cd6d
Fix vulnerability of new NationPickerPopup icon view (#9587) 2023-06-14 07:28:45 +03:00
SomeTroglodyte
6a387fc7d2
Long press support (#9558) 
* Refactor input-related components into own package

* Unified input event system with common routing for keys and gestures

* Minor Linting

* Apply input system to World map right-click

* Replace UnitActionsTable Upgrade info tooltip with UnitUpgradeMenu

* Optimize ShortcutListener's full-stage scan

* Post-merge fixes
 2023-06-13 08:58:44 +03:00
SomeTroglodyte
d666c44697
Keyboard bindings - collision check (#9580) 2023-06-13 07:31:02 +03:00
Yair Morgenstern
02d7325576 UnitFilter also matches TechFilter for that unit 2023-06-12 23:13:47 +03:00
Yair Morgenstern
624eefccab 4.7.0-patch1 2023-06-12 23:02:38 +03:00
Yair Morgenstern
c27bb5d74d Revert "Make ExpanderTab "expand" properly (#9522)" 
This reverts commit ae74dca074.
 2023-06-12 22:54:37 +03:00
Yair Morgenstern
dc030bfbad 4.7.0 2023-06-12 19:25:40 +03:00
Yair Morgenstern
235fe86b72
Version rollout (#9573) 
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9572)

* Update Polish.properties (#9568)

* Update French.properties (#9567)

* Update Italian.properties (#9566)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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>
 2023-06-12 19:14:19 +03:00
Yair Morgenstern
320309aadd Don't kill the multiplayer updater on *pause*, instead on destroy() "exit early" 2023-06-12 18:36:34 +03:00
Yair Morgenstern
61a90a4193 Fixed user-invisible crash on multiplayer updating thread when resuming game 2023-06-12 18:19:45 +03:00
Yair Morgenstern
1bd8c4fde7 Fixed crash when resuming EmpireOverviewScreen 2023-06-12 17:34:56 +03:00
Yair Morgenstern
685df48f5a AI more willing to take happiness risk to create a new city 2023-06-12 12:10:10 +03:00
Yair Morgenstern
71828349df AI only constructs Settler if it already has worker / improvements 2023-06-12 11:27:27 +03:00
Yair Morgenstern
e5232494a0 Improved AI city location picking 
Done by ignoring tiles already belonging to another civ / within work range of another city
 2023-06-12 10:27:26 +03:00
SomeTroglodyte
404a148cfb
Key bindings - unit actions, world screen and grouped UI (#8986) 
* Keyboard Bindings: Simpler Widget

* Keyboard Bindings: Reset binding

* Keyboard Bindings: Simpler Widget - revert opening feature

* Keyboard Bindings Step 6: Unit Actions

* Keyboard Bindings Step 7: Grouped UI

* Keyboard Bindings Step 7: Grouped UI-TFW

* Keyboard Bindings Step 6: Unit Actions - patch

* Keyboard Bindings Step 9: World Screen

* Keyboard Bindings - German

* Keyboard Bindings: Fix merge errors

* Keyboard Bindings: Tiny forgotten things

* Merge fixes
 2023-06-12 10:13:57 +03:00
SomeTroglodyte
e109848e28
Nation picker gets an Icon View, keyboard selection, and fixed sort (#9553) 
* Nation picker gets an Icon View, keyboard selection, and fixed sort

* Minor linting

* Proper centering in the selection circle

* Fix merge mistakes

* Nation picker Icon View - reviews and layout tweaks
 2023-06-12 09:55:25 +03:00
Yair Morgenstern
f25637c619 Global politics table includes current civ (GOOD version) 2023-06-12 09:24:42 +03:00
Yair Morgenstern
42041647f8 Revert "Global politics overview table includes current civ" 
This reverts commit cfc292eb0a.
 2023-06-12 09:24:42 +03:00
WhoIsJohannes
6c8754adbd
Always select military unit first, don't select great people or settl… (#9569) 
* Always select military unit first, don't select great people or settlers first.

* Make diff less intrusive
 2023-06-12 07:24:34 +03:00
SomeTroglodyte
4bf319b36a
Improve connected to / disconnected from Capital handling (#9545) 
* Improve connected to / disconnected from Capital handling

* Improve connected to / disconnected from Capital handling - typo
 2023-06-12 07:18:15 +03:00
SomeTroglodyte
ae74dca074
Make ExpanderTab "expand" properly (#9522) 
* Make ExpanderTab "expand" properly

* Make ExpanderTab "expand" properly - patch1

* Make ExpanderTab "expand" properly - new signature

* Make ExpanderTab "expand" properly - enable dynamic content

* Minor WorldScreenMusicPopup visual tweaks

* Make ExpanderTab "expand" properly - tweaks

* Make ExpanderTab "expand" properly - Kdoc and types review

* Post-merge fixes
 2023-06-12 07:16:06 +03:00
Yair Morgenstern
8d2af7af78 Resolved #8736 - AI Workers remove fallout 2023-06-11 17:16:47 +03:00
Yair Morgenstern
cfc292eb0a Global politics overview table includes current civ 2023-06-11 17:00:20 +03:00
SomeTroglodyte
3187f49e91
UiElementDocsWriter improvement to cope with BorderedTable (#9506) 2023-06-11 14:45:59 +03:00
Yair Morgenstern
0d02100e51
Version rollout (#9565) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#9530)

* Update Spanish.properties

* Update Spanish.properties

* Update Brazilian_Portuguese.properties (#9529)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2023-06-11 12:49:23 +03:00
WhoIsJohannes
edac7bcd04
Show line color in more cases (#9550) 2023-06-11 12:41:40 +03:00
WhoIsJohannes
d0acedd092
Only consider attackable enemies within visible tiles. (#9551) 2023-06-11 12:38:09 +03:00