Commit Graph

7019 Commits

Author SHA1 Message Date
SomeTroglodyte
e8ab73df98
Make max Zoom out a setting and fix a merge mistake (#6420) 2022-03-25 17:28:24 +03:00
SomeTroglodyte
f9b34fd40d
More thorough workaround for Char.code and Char(Int) crashing (#6419) 2022-03-25 17:27:52 +03:00
SomeTroglodyte
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
Yair Morgenstern
f013d400b0
Added test to find unmatched < and > for conditional typos. (#6415) 2022-03-23 19:04:16 +01:00
Yair Morgenstern
9721b38f6b
Update Installing-on-macOS.md 2022-03-23 09:16:44 +02:00
Yair Morgenstern
22a84b0c82 4.0.0-patch1 2022-03-22 21:20:12 +02:00
SomeTroglodyte
80d9872b6e
Fix crash starting up on Lollipop (#6412) 2022-03-22 21:19:23 +02:00
SomeTroglodyte
59dd696c3f
Fix crash on loading a save where Machu Picchu is built (#6402) 2022-03-21 23:33:28 +02:00
Yair Morgenstern
d001516b8e Missed important kudos! 2022-03-21 21:32:45 +02:00
Yair Morgenstern
5fa10348b5 4.0.0 2022-03-21 21:29:55 +02:00
Yair Morgenstern
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
Tang
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
SomeTroglodyte
130fd653a4
Prevent Char-to-code crash (#6392) 2022-03-21 21:09:01 +02:00
SomeTroglodyte
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
SomeTroglodyte
7734a48237
Empire Overview Religion: Fixed header, selection more visible (#6369) 2022-03-21 21:06:19 +02:00
Xander Lenstra
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
Xander Lenstra
dcd8e6c845
Added an AI for building & using spaceship parts (#6374) 2022-03-21 21:05:43 +02:00
SomeTroglodyte
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
Xander Lenstra
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
Yair Morgenstern
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
SomeTroglodyte
77839b4b9d
Empire Overview Units: Persist scroll, unit select, show due, jump city, fixed header (#6368) 2022-03-21 21:04:47 +02:00
Xander Lenstra
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
SomeTroglodyte
3374bb15d5
Reduce warnings (#6382) 2022-03-21 21:03:24 +02:00
SomeTroglodyte
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
Xander Lenstra
22477c1ccb
Fixed a bug where the resource supply overview would not add up (#6381) 2022-03-20 08:16:34 +02:00
Yair Morgenstern
fef993d5dc Don't drop uploads due to itch.io failure 2022-03-17 23:49:32 +02:00
Yair Morgenstern
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
Yair Morgenstern
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
Yair Morgenstern
36c8ce78cc Fixed hidden unit uniques being shown to users in construction table - #6131 2022-03-17 23:30:56 +02:00
SomeTroglodyte
ba4561add6
Empire Overview City: Fixed header, show sort, persist descending (#6366) 2022-03-17 23:27:44 +02:00
SomeTroglodyte
4bb48b68b6
Empire Overview Stats: Culture, Faith and Wrap ability (#6367) 2022-03-17 23:27:37 +02:00
Yair Morgenstern
ea362a448b Fixed rejection reason texts not showing the instance's text - see #6131 2022-03-17 23:12:45 +02:00
Yair Morgenstern
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
itanasi
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
SomeTroglodyte
89e73ad7c5
Redesign EmpireOverviewScreen as TabbedPager (#6364) 2022-03-17 22:23:09 +02:00
SomeTroglodyte
c80db524b2
Cache 'library' helper classes of CivilizationInfo (#6363) 2022-03-17 22:22:54 +02:00
SomeTroglodyte
c117860d6f
Worldscreen unit supply deficit icon now updates properly (#6362) 2022-03-17 22:22:43 +02:00
SomeTroglodyte
365cf0dc19
Close little loophole allowing promoting a unit after moving or attacking (#6361) 2022-03-17 22:22:25 +02:00
Yair Morgenstern
abfbfd5429 Nicer commit name for version rollout 2022-03-14 11:47:04 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
SomeTroglodyte
797ce09508
Global review of Constants use, linting, maxXPfromBarbarians (#6327)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-13 22:57:40 +02:00
Yair Morgenstern
b8ef6725eb
Version rollout (#6349)
* Commit from GitHub Actions (UncivBot)

* Update Spanish.properties (#6348)

* Update Simplified_Chinese.properties (#6338)

translation2

* Update French.properties (#6336)

* Update Italian.properties (#6334)

* Update Simplified_Chinese.properties (#6331)

3.19.16 translation1

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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>
2022-03-13 22:53:45 +02:00
SomeTroglodyte
4ffb21f525
Support more freely modded Worker-like units (#6339)
* TileImprovementTime UniqueType supports UniqueTarget.Unit

* Reduce UniqueType.ConstructImprovementConsumingUnit hardcoded Great People behaviour

* Some linting

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-13 22:49:54 +02:00
Yair Morgenstern
97787bd397
Resolved #6335 - now shows conditionals precluding construction of units (#6346)
* Resolved #6335 - now shows conditionals precluding construction of units

Built simply so that if we decide to expand the conditionals that should be shown it will simply be building a hashset of conditionalsToShow

* Added an instance wrapper, so the enum has the default values and the class has the actual values

* minor lint
2022-03-13 22:45:39 +02:00
Leonard Günther
cea63eb114
Multiplayer code cleanup (#6330)
* Fixed reviewed comments of PR 6273

* Cleanup of Dropbox.kt

- moved Dropbox.kt from ui\worldscreen\mainmenu to logic\multiplayer
- moved ServerMutex and OnlineMultiplayer to own files
- changed DropBoxFileConflictException to FileStorageConflictException to match FileStorage scheme
- merged FolderListEntry with DropboxMetaData as they were basicly the same
- introduced IFileMetaData to match FileStorage scheme and modified DropboxMetaData to use it
- removed some unused imports
2022-03-13 22:44:02 +02:00
SomeTroglodyte
d8e9563a7c
Religion overview improved (#6303)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description

* Religion overview tweaked

* Religion overview tweaked - patch1
2022-03-13 22:43:40 +02:00
SomeTroglodyte
e4b0afb7e3
Update ModConstants and start its documentation (#6309)
* Update ModConstants

* Update ModConstants - revert Ice, tweak formula

* Update ModConstants - comment on predefined MapSizes
2022-03-13 22:43:23 +02:00
SomeTroglodyte
88ba48d7f1
Mod checker minor improvements (#6341)
* Enabled unique "spellcheck" flag to be passed down into complex check

* Allow mod checker to list untyped uniques, behind "secret" switch
2022-03-13 22:40:12 +02:00
SomeTroglodyte
c51f3b47de
Fix 1 Spectator N AI games in seemingly endless loop (#6337) 2022-03-13 22:38:11 +02:00
Yair Morgenstern
877dedaa89 More unique cleanup 2022-03-13 16:43:56 +02:00