Commit Graph

6934 Commits

Author SHA1 Message Date
8820ae6dad Generalized a few nation uniques (#6443)
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
2022-03-28 17:33:31 +03:00
7526114281 Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
870659d142 Translation writer conditionals (#6433)
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
2022-03-28 17:30:16 +03:00
0352df10e8 Resolved #6447 - Solved out of memory errors for modded base rulesets 2022-03-28 17:23:19 +03:00
52f797c8e3 Added check for multiple policies with the same name - unlike techs buildings etc, these are also saved in the *policy branch* and so can affect gameplay 2022-03-28 16:43:04 +03:00
892fc1f936 Empire Overview Tweaks to better utilize new TabbedPager (#6434) 2022-03-26 21:16:51 +01:00
2c2ffd02d1 Apply Char(Int) and Char.code patch to Maya Calendar (#6435) 2022-03-26 21:33:45 +03:00
c93f0339a3 Reactivate Worldscreen Ctrl key bindings (#6437) 2022-03-26 21:33:35 +03:00
2ef8581b52 4.0.1 4.0.1 2022-03-25 17:48:12 +03:00
926d3bcf4c Version rollout (#6426)
* Bump version and create initial changelog entry

* Update Japanese.properties (#6417)

* Update Japanese.properties (#6410)

* Update Filipino.properties (#6409)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
2022-03-25 17:45:31 +03:00
f6a0a5595f Custom server port (#6406)
* custom server port

* format

* format

* Modify port range.

* Custom server port in client.

* replace `rangeTo`.

* format: Rename `getUrlWithPort` to `checkMultiplayerServerWithPort`.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-25 17:40:13 +03:00
84561e7ad4 Add Moddable Policy Priorities (#6390)
* Fixed G&K policy eras

Patronage should be Medieval and Freedom should be Industrial in G&K

* Added 'priorities' object to policy branch entries

* Fixed Vanilla policy eras

Also set testing priorities in advance

* Partial code formatting

* Reworked how the AI chooses a policy to newly adopt

* Removed debugging codes

* Update Civilization-related-JSON-files.md

Added Branch priorities

* Assigned actual priorities to each branch

Also fixed a debugging value in Ruleset.kt (-1 -> 0)
2022-03-25 17:33:42 +03:00
dd529db297 Enable ModOptions uniques and ModConstants from non-base mods (#6345)
* Enable ModOptions uniques and ModConstants from non-base mods

* Update ModConstants.merge for new ModConstants values
2022-03-25 17:30:51 +03:00
7f3b075ac4 Implement a rudimentary CrashReportSysInfoDesktop (#6400)
* Implement a rudimentary CrashReportSysInfoDesktop

* Now gets Windows info the hard way
2022-03-25 17:29:09 +03:00
2f035e55f7 Improved Widgets - Fixing Tabbed Pager Scrolling (#6413)
* Fix TabbedPager problems when fixedContent wider than widget - Sync ScrollPanes approach V2

* UncivTooltip no longer has a reason to limit itself to Group
2022-03-25 17:28:36 +03:00
e8ab73df98 Make max Zoom out a setting and fix a merge mistake (#6420) 2022-03-25 17:28:24 +03:00
f9b34fd40d More thorough workaround for Char.code and Char(Int) crashing (#6419) 2022-03-25 17:27:52 +03:00
0b50715fb3 Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421)
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)

* Bring German and template up to par as baseline

* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth

* TranslationFileWriter legacy guessing now _much_ simpler

* Fix "chance to be destroyed by nukes" case

* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
2022-03-25 17:27:25 +03:00
f013d400b0 Added test to find unmatched < and > for conditional typos. (#6415) 2022-03-23 19:04:16 +01:00
9721b38f6b Update Installing-on-macOS.md 2022-03-23 09:16:44 +02:00
22a84b0c82 4.0.0-patch1 4.0.0-patch1 2022-03-22 21:20:12 +02:00
80d9872b6e Fix crash starting up on Lollipop (#6412) 2022-03-22 21:19:23 +02:00
59dd696c3f Fix crash on loading a save where Machu Picchu is built (#6402) 2022-03-21 23:33:28 +02:00
d001516b8e Missed important kudos! 2022-03-21 21:32:45 +02:00
5fa10348b5 4.0.0 4.0.0 2022-03-21 21:29:55 +02:00
7a337dea4d Version rollout (#6399)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#6386)

* Update French.properties (#6371)

* Update Italian.properties (#6370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@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>
2022-03-21 21:18:37 +02:00
c1737b6183 Custom desktop font (#6377)
* Custom desktop font

* Add `getDesktopAllFonts` to setting custom desktop font.

* Custom font.
`desktopFontFamily` change to `fontFamily`.
Add GameSettings.getSettingsForPlatformLaunchers().

* Add `Custom font` setting UI.

* Add `Custom font` on Android.

* `Default Font` use translations.

* format

* remove open fun.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:12:16 +02:00
130fd653a4 Prevent Char-to-code crash (#6392) 2022-03-21 21:09:01 +02:00
cf21ade76e Moddable Ice generation (any impassable feature on Water possible) (#6329)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:08:25 +02:00
7734a48237 Empire Overview Religion: Fixed header, selection more visible (#6369) 2022-03-21 21:06:19 +02:00
367a427436 Unified two uniques into one more descriptive unique (#6380)
* Unified two uniques into one more descriptive unique

* Fixed fallout generation & typo
2022-03-21 21:05:54 +02:00
dcd8e6c845 Added an AI for building & using spaceship parts (#6374) 2022-03-21 21:05:43 +02:00
f6a989f1fc Empire Overview Diplomacy (#6375)
* Empire Overview Diplomacy: Preparations

* Empire Overview Diplomacy: DiplomacyScreen linkable

* Empire Overview Diplomacy: Overhaul

* Empire Overview Diplomacy: List always begins a new row between major and minor civs
2022-03-21 21:05:30 +02:00
984c4d9b2d Unified & generalized a few uniques (#6379)
* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
2022-03-21 21:05:20 +02:00
2b1251258c Unciv server (#6384)
* Background implementation for Unciv server with ktor.

Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.

* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today

* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!

* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!

* Documentation for running and using the server

* Better texts, translations, etc

* Trog is right this should be a PUT not POST
2022-03-21 21:05:02 +02:00
77839b4b9d Empire Overview Units: Persist scroll, unit select, show due, jump city, fixed header (#6368) 2022-03-21 21:04:47 +02:00
1df49749f2 Split 6 tiles visible unique into its parts, making it more moddable (#6389)
* Split sight unique into its parts, making it more moddable

* Standardized unique ordering
2022-03-21 21:03:33 +02:00
3374bb15d5 Reduce warnings (#6382) 2022-03-21 21:03:24 +02:00
ddb26dc56d Fix CS unit gift crash (#6393)
* Fix CS unit gift crash

* Clarify CityStateGreatPersonGift decision

* Removed misplaced comment
2022-03-21 21:02:50 +02:00
22477c1ccb Fixed a bug where the resource supply overview would not add up (#6381) 2022-03-20 08:16:34 +02:00
fef993d5dc Don't drop uploads due to itch.io failure 3.19.18 2022-03-17 23:49:32 +02:00
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
36c8ce78cc Fixed hidden unit uniques being shown to users in construction table - #6131 2022-03-17 23:30:56 +02:00
ba4561add6 Empire Overview City: Fixed header, show sort, persist descending (#6366) 2022-03-17 23:27:44 +02:00
4bb48b68b6 Empire Overview Stats: Culture, Faith and Wrap ability (#6367) 2022-03-17 23:27:37 +02:00
ea362a448b Fixed rejection reason texts not showing the instance's text - see #6131 2022-03-17 23:12:45 +02:00
bf0a44413f Version rollout (#6365)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6359)

* Update Filipino.properties (#6358)

* Update Spanish.properties (#6356)

* Update French.properties (#6352)

* Update Indonesian.properties (#6351)

* Update Italian.properties (#6350)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SOULTAKER1011 <90161631+SOULTAKER1011@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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-03-17 22:52:03 +02:00
f884f30226 Double Zoom Out Range (#6354)
* Simple dumb solution. Just make WorldMapHolder twice as big!

* A bunch of attempts

* Just change to max 4x size

Co-authored-by: itanasi <spellman23@gmail.com>
2022-03-17 22:25:24 +02:00
89e73ad7c5 Redesign EmpireOverviewScreen as TabbedPager (#6364) 2022-03-17 22:23:09 +02:00