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

6173 Commits

Author SHA1 Message Date
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
SomeTroglodyte
7fb8bae251
Fix translated sorting (#9563) 
* Fix translated sorting

* Minor linting, missing pedia icon, missing tooltip template

* Wiki on icons for Beliefs
 2023-06-11 12:37:25 +03:00
SeventhM
c506331dcc
Pantheon Mod Constants (#9562) 
* Religion Mod Constant

* Update mistake in wiki
 2023-06-11 12:36:41 +03:00
SomeTroglodyte
8b72dba4fb
Refactor input-related components into own package (#9552) 2023-06-11 12:36:09 +03:00
Yair Morgenstern
a853851cb8 Resolved #9556 - Transform uniques accept conditionals correctly 2023-06-11 12:22:36 +03:00
Yair Morgenstern
4dad953db9 bugfix: AI evaluation of ButItemsDiscount no longer crashes 2023-06-11 11:10:33 +03:00
SomeTroglodyte
86aa3b842b
Only *display* first 5 missing mods but auto-download all (#9543) 
* Only *display* first 5 missing mods but autodownload all

* Fix removeMissingTerrainModReferences

* Linting
 2023-06-08 12:13:22 +03:00
Yair Morgenstern
fe1b5825bb
Resolves #9533 - double movement unique accepts conditionals (#9538) 2023-06-07 15:49:59 +03:00
SomeTroglodyte
936b9e34ef
Fix and unit-test Hakkapeliitta TransferMovement ability (#9539) 2023-06-07 13:35:53 +03:00
Yair Morgenstern
edccbf6273 "before adopting / after adopting" uniques accept belief as well as policy - #3242 2023-06-07 10:21:12 +03:00
Yair Morgenstern
e44af219eb 'random generated map type' is actually random 2023-06-07 10:14:15 +03:00
Yair Morgenstern
17ad432228 Resolved #9531 - only display first 5 missing mods 2023-06-07 09:58:32 +03:00
Yair Morgenstern
cf3d5d3fdb 4.6.18-patch1 
Revert palace mod checks due to incompatibility with Rekmod
 2023-06-05 23:22:48 +03:00
Yair Morgenstern
d2c0ce5229 Revert "Mod checks against sellable, missing or multiple Palace(s) (#9516)" 
This reverts commit 2d02e69d24.
 2023-06-05 23:21:23 +03:00
Yair Morgenstern
5a652dc0d4
Version rollout (#9528) 
* Bump version and create initial changelog entry

* Update German translation (#9525)

* Update Japanese.properties (#9523)

* Update Japanese.properties

*Add new translations
*Fixed some translations

* Update Japanese.properties

*Add new translations
*Add Carthage city names
*Add translations for messages - Netherlands, Carthage
*Fix translations

* Update Japanese.properties

* Netherlands, Carthage message - revert translations to null

* Update Japanese.properties

*Fixed lack of praceholders

* Update Italian.properties (#9520)

* Update Polish.properties (#9517)

* Update French.properties (#9512)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: namazulake <130637228+namazulake@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>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2023-06-05 19:38:11 +03:00
SomeTroglodyte
2d02e69d24
Mod checks against sellable, missing or multiple Palace(s) (#9516) 
* Mod checks against sellable, missing or multiple Palace(s)

* Fix Studio adding quotes unasked
 2023-06-05 19:04:27 +03:00
SomeTroglodyte
e036d27935
Fix tooltips on Android with physical keyboard detected (#9527) 2023-06-05 19:03:50 +03:00
Yair Morgenstern
688872b5b1 Resolved #9494 - Pillaged improvements have a visual indication on the icon 2023-06-04 16:56:05 +03:00
Yair Morgenstern
7602aa4d0d Fixed great engineer automation trying to reach cities it can't 2023-06-04 13:42:15 +03:00
Yair Morgenstern
c0bd8c12fb Fixed later civs not getting any CS quests 2023-06-04 11:58:27 +03:00
SomeTroglodyte
13619d18a1
Upgraded music player popup (#9514) 
* Popups get the ability to scroll only the content without the buttons

* Centralize LoadingPopup

* Split non-WorldScreenMenuPopup classes off from that file

* Linting

* Nicer music playback dialog

* Translation templates
 2023-06-04 11:53:56 +03:00
SomeTroglodyte
8a024bf9fe
Popups get the ability to scroll only the content without the buttons (#9513) 
* Popups get the ability to scroll only the content without the buttons

* Centralize LoadingPopup

* Split non-WorldScreenMenuPopup classes off from that file

* Linting
 2023-06-04 08:41:58 +03:00
Crsi
b9a916e081
Fixed special case to allow winning player to continue the MP game (#9509) 2023-06-04 08:21:24 +03:00
SomeTroglodyte
1c830672ef
Fix translation templates / use as per #6131 (#9515) 2023-06-04 08:21:13 +03:00
Yair Morgenstern
cdc4ffae74
Bump version and create initial changelog entry (#9507) 
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
 2023-06-03 22:51:46 +03:00
SomeTroglodyte
dc707382f3
More reapply CityFocus on yield changes (#9459) 2023-06-03 22:44:51 +03:00
SomeTroglodyte
42b35bce4f
Allow image overlay and changing world wrap in map editor (#9493) 2023-06-03 22:43:35 +03:00
Yair Morgenstern
9bbd3b416e Resolved #9501 - badly configured era conditional no longer causes crashes 2023-06-03 22:42:36 +03:00
Yair Morgenstern
b3e2faed71 Remove "does not support server feature set" error for uncivserver.xyz 2023-06-03 22:29:23 +03:00
Jack Rainy
aebd529400
More efficient use of the charts space (#9505) 2023-06-03 22:07:25 +03:00
SomeTroglodyte
00712e49a8
Small File Chooser and Separator fixes (#9496) 
* Fix FileChooser click-behind

* Fix separators not allowing a Table to shrink back when other cells change width
 2023-06-01 22:53:20 +03:00
Yair Morgenstern
a7107fa04d Trigger resource recalculation upon gaining a unit that requires resources 2023-06-01 11:43:55 +03:00
SomeTroglodyte
fcd309781d
Upgrading from Unit overview improved (#9485) 
* Unit upgrade tooltip in overview

* Unit upgrade tooltip in action table

* Unit upgrade tooltip in action table - colored Key

* Unit upgrade in Overview - reselect

* Fix merge problems and FormattedLine color markup ability

* Relax MarkupRenderer.render lines parameter type

* Skin has a getColor shortcut - use it

* Unit overview upgrade icons now open a menu instead of upgrading immediately

* Unit Overview upgrade - "Mid" buttons

* Unit Overview upgrade - reorg
 2023-05-31 18:41:57 +03:00
Yair Morgenstern
b851abc7fd Guard against '><' causing translation recursion 2023-05-31 15:21:49 +03:00
Yair Morgenstern
90da09e924
Version rollout (#9491) 
* Bump version and create initial changelog entry

* Update German translation (#9489)

* Update Polish.properties (#9480)

* Update Polish.properties

* Update Polish.properties

* Update French.properties (#9479)

* Update Japanese.properties (#9478)

* Update Japanese.properties
Testament of Faith

* Update Japanese.properties
Enhancer of Faith

* Update Japanese.properties
Religions

* Update Japanese.properties
some Faith Description

* Update Japanese.properties
add Faith Description

* Update Japanese.properties
delete comment

* Update Spanish.properties (#9474)

* Updated Brazilian_Portuguese.properties (#9473)

* Update Italian.properties (#9470)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: undo <3245867+undoroid@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>
 2023-05-31 14:58:28 +03:00
Yair Morgenstern
ce6d3394bc
Added checksum to be added to uploaded multiplayer games (#9483) 
* Added checksum to be added to uploaded multiplayer games

* Policy adoption triggers resource recalculation
 2023-05-31 14:58:00 +03:00
SomeTroglodyte
de09eda043
Politics overview no longer discloses random number of players (#9466) 
* Linting

* Hide player count in politics overview diagram legend if randomized

* Comment on getKnownCivs
 2023-05-31 14:52:05 +03:00
SomeTroglodyte
2c1d413b6c
Unit Overview: Improving a tile is also "what the unit is doing" (#9482) 
* Unit Overview: Improving a tile is also "what the unit is doing"

* Unit Overview automated worker actions
 2023-05-31 14:50:42 +03:00
SomeTroglodyte
9302036311
Replacement PlatformSaverLoader for Linux X11 systems (#9490) 2023-05-31 14:43:31 +03:00
janarvid
ff9d5ff9c1
Fix bug worker will not replace improvement to enable strategy resour… (#9449) 
* Fix bug worker will not replace improvement to enable strategy resources #9328

* Make test logic more clear and add some comments
 2023-05-28 17:52:37 +03:00
SomeTroglodyte
73aeabec2c
All notifications from Overview are now temporary (#9455) 
* Refactor notification history re-show functionality

* Refactor explored resources notification generator

* Refactor "Unimproved" to use existing providesResource

* Make overview resource "links" into temporary notifications

* Added link to overview resource "Unimproved" column

* Minor linting
 2023-05-28 17:51:33 +03:00
Yair Morgenstern
d7b6fea2d4 Spectators do not get natural wonder discovery notifications 2023-05-28 09:24:33 +03:00
Yair Morgenstern
ae4719c552
Version rollout (#9469) 
* Bump version and create initial changelog entry

* Update Polish.properties (#9465)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#9464)

* Update Italian.properties

* Update Italian.properties

* [Translation] Update Simplified Chinese translation (#9452)

* update Simplified Chinese

* update Simplified Chinese

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
 2023-05-28 09:00:01 +03:00
SomeTroglodyte
9739374e17
Update civ resources when a researched tech reveals a resource (#9467) 2023-05-28 08:39:36 +03:00
SomeTroglodyte
ef193babee
Map editor update - concurrency, resource amounts, file double-click (#9461) 2023-05-27 21:44:23 +03:00
SomeTroglodyte
1c124c9ddf
Fix UniqueType.RoadMaintenance being ignored (#9456) 2023-05-27 21:44:03 +03:00
SomeTroglodyte
c73d5d74d0
Fix mouse wheel on NotificationsScroll (#9451) 
* Fix mouse wheel on NotificationsScroll

* Explain why getMouseWheelX is overridden to zero
 2023-05-27 21:32:51 +03:00
SomeTroglodyte
268d27d1ed
Unit overview remembers scroll position after promoting (#9454) 2023-05-27 21:32:23 +03:00
Yair Morgenstern
8be9cd6a76 Modding: units can transform without limit on destination unit 2023-05-24 11:46:31 +03:00
Yair Morgenstern
6f830a33a9 Merge branch 'temp' 2023-05-24 11:46:05 +03:00
Yair Morgenstern
d9b62fbf3e 4.6.14-patch1 2023-05-24 11:45:55 +03:00
Yair Morgenstern
133704282c Merge branch 'temp' 2023-05-24 11:43:39 +03:00
Yair Morgenstern
4ef33b84e5 4.6.14-patch1 
Fix AI automation preventing settlers from moving
 2023-05-24 11:42:42 +03:00
Yair Morgenstern
00b52851f3 Unpurchaseable units are properly unpurchaseable 2023-05-24 00:16:49 +03:00
alexban011
0d76ae1e3c
feat: allow loading of games if there are no saved games (#9441) 2023-05-23 23:15:37 +03:00
Yair Morgenstern
5fcfa6ac2d Resolved #9444 - Crop yield chart no longer displays score data 2023-05-23 23:12:04 +03:00
Yair Morgenstern
e75742d3d6 Fixed policy branch finishers overriding branches - oops! 2023-05-23 22:37:10 +03:00
Yair Morgenstern
35718c00e7 Fixed softlock for mod policies overriding existing policy locations 2023-05-23 22:15:31 +03:00
Yair Morgenstern
b94321f535 4.6.14 2023-05-23 20:37:51 +03:00
Yair Morgenstern
5857301732
Version rollout (#9440) 
* Bump version and create initial changelog entry

* Update German translation (#9437)

* Update Spanish.properties (#9434)

* Update Brazilian_Portuguese.properties (#9433)

* Update French.properties (#9426)

* Update Italian.properties (#9422)

* Update Japanese.properties (#9346)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

*Add translations
*Add city names

* Update Japanese.properties

*Add new translations
*Fixed some translations regarding tile improvements that I have translated previously

* Update Japanese.properties

*Add translation for City-Nations messages, ruin-regarding messages, and more.

* Update Japanese.properties

Add translations for 
*Sweden, Austria, and some city-states
*Multiplayer Game notifications
*Tile Improvements
*Civilopedia explanations

* Update Japanese.properties

Add translations for
*Religion beliefs
*Civilopedia descriptions
*Victory status
*and more

* Update Japanese.properties

* Edit details

* Update Japanese.properties

*add new branches

* Update Japanese.properties

Fix wrong placeholders

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
 2023-05-23 20:33:10 +03:00
Yair Morgenstern
7aea703fcc Resolve #9432 - city-state-owned great merchants can no longer 'conduct trade mission' on their own tiles 2023-05-23 19:41:41 +03:00
Yair Morgenstern
472bb55b40 Resolve #9435 - don't crash for ByteBuffer byte errors 2023-05-23 19:29:06 +03:00
SomeTroglodyte
b3166c4922
Fix ConcurrentModificationException when puppeting a city (#9430) 2023-05-22 20:12:31 +03:00
SomeTroglodyte
5f60c887f7
Next-Turn Progressbar (#9409) 
* Next-Turn Progressbar

* Next-Turn Progressbar - doc

* NextTurnProgress: Rethink max on first turn
 2023-05-22 17:59:28 +03:00
Yair Morgenstern
575983578a
Game saves are regular json, not minimalized json (#9427) 2023-05-22 17:57:56 +03:00
Yair Morgenstern
edd09910a1 AI civilian improvement: Don't freeze when enemy is near, keep working in tiles where he can't reach 2023-05-22 14:31:49 +03:00
Yair Morgenstern
fc81d7dda3 Units that can enter foreign lands without open borders are not expelled on open borders end 2023-05-22 14:31:43 +03:00
SomeTroglodyte
ae8d69b5b3
Resolve To-do in Unit upgrade resource requirements (#9420) 
* Update Counter get() nullability

* Counter upgrade

* Use Counter for unit resource requirements

* Linting
 2023-05-22 14:28:36 +03:00
Yair Morgenstern
e2b3432d84
Population icon gets locked with doubleclick, clicks cycle between assigned and unassigned (#9428) 2023-05-22 14:27:00 +03:00
Yair Morgenstern
95ffbd6a6e 4.6.13 2023-05-21 14:16:50 +03:00
Yair Morgenstern
9c2a9975a6
Version rollout (#9418) 
* Bump version and create initial changelog entry

* Update Greek.properties (#9407)

* Update Spanish.properties (#9397)

* Update Indonesian.properties (#9393)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: marek06072 <133993044+marek06072@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
 2023-05-21 14:08:49 +03:00
Yair Morgenstern
280025fa10 Resolved #9416 - failure to get preview image no longer causes crash 2023-05-21 12:35:57 +03:00
SomeTroglodyte
a91dca0930
Fix off-by-one error in autoAssignPopulation (#9411) 
* Fix off-by-one error in autoAssignPopulation

* Fix more off-by-one errors from for-repeat conversions

* Linting: Use Actions.forever shortcut where appropriate
 2023-05-21 12:08:03 +03:00
SomeTroglodyte
ec4586af6c
Fix Ensure Minimum Stats (#9408) 2023-05-21 00:13:50 +03:00
Yair Morgenstern
728afab1db Modding: Added 'upon adopting [belief]' trigger, allowed belief adoption to trigger uniques 2023-05-19 00:22:34 +03:00
Yair Morgenstern
6841a7f214 Added turn number to victory replay 2023-05-19 00:06:03 +03:00
alexban011
6603c6cfd0
refactor: break large functions into smaller ones (#9406) 2023-05-18 22:02:26 +03:00
alexban011
54f651c2fb
fix: fixed translation text (#9404) 
* fix: fixed translation text

* fix: fixed Romanian.properties
 2023-05-18 18:30:17 +03:00
alexban011
91116f8df3
Fixed more warnings (#9401) 
* fix: fix FunctionParameterNaming warnings

* fix: fix InvalidPackageDeclaration warnings

* fix: fix MatchingDeclarationName warnings

* fix: fix WrongEqualsTypeParameter warnings

* fix: fix UnusedPrivateProperty warnings

* fix: fix UseCheckOrError warningsU

* fix: fix UseRequire warningsU

* detekt: disabled SpreadOperator rule

* fix: resolve MemberNameEqualsClassName rule

* detekt: disabled ForbiddenComment rule

* fix: resolved SwallowedException warning

* fix: resolved ThrowingExceptionsWithoutMessageOrCause warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved InstanceOfCheckForError warning

* detekt: disable TooGenericExceptionCaught warning

* detekt: disable TooGenericExceptionThrown warning

* fix: resolve part of NestedBlockDepth warnings
 2023-05-18 10:12:33 +03:00
SomeTroglodyte
d31a2d83ba
Happiness change from bought buildings can reapply citizen focus (#9395) 
* Happiness change from bought buildings can reapply citizen focus

* Fix compilation error
 2023-05-18 00:37:38 +03:00
SomeTroglodyte
1de866c7ed
Local and/or jpg mod previews (#9394) 
* Allow mod preview image to be a jpg

* Allow preview images from WIP mods lacking github url

* Wiki preview.jpg

* Allow mod preview image to be a jpg - review
 2023-05-16 13:00:44 +03:00
Yair Morgenstern
7f4b7bbd21 Resolved #9391 - clicking locally-added mods no longer crashes 2023-05-15 09:22:21 +03:00