Commit Graph

4019 Commits

Author SHA1 Message Date
SomeTroglodyte
a737747284
Little Diplomatic Victory makeover (#9756)
* Linting and give two votes to UN owner

* Allow human player to abstain, show UN 2 votes

* More info on voting results

* AI won't vote for hated enemies

* Improve PopupAlert handling

* Translation templates

* One missing template
2023-07-10 15:25:59 +03:00
random271
8f761642f6
Added notification for destruction of tile improvements [via unit ability] (#9754)
* Added notification for desctruction of tile improvements [via unit ability]

* Modified template properties

* Update template.properties
2023-07-09 23:24:38 +03:00
Yair Morgenstern
a1387bca29 4.7.7 2023-07-06 00:49:38 +03:00
Yair Morgenstern
d229d45298
Version rollout (#9755)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9744)

* Update Italian.properties (#9737)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9733)

* Updated Brazilian_Portuguese.properties (#9732)

* Update Dutch.properties (#9730)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Catalan.properties (#9728)

* Update German translation (#9723)

* Update Polish.properties (#9718)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: maxdu <d.darmax@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: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-07-06 00:42:39 +03:00
SeventhM
5ea1d5722b
Fix buildings/units not triggering and golden age stat updates (#9731)
* Fix buildings not triggering, golden age stat updates, and units not triggering

* Forgot import, whoops

* uodate resources and city connection when removing a building

* Move building triggers to function, added unit notification to translations

* Quick edits without android studio sucks

* Add unitActionModifier check back to hasTriggerConditional

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2023-07-06 00:36:43 +03:00
Yair Morgenstern
19bf15558d Fixed India's 'double unhappiness' unique 2023-07-05 21:10:22 +03:00
Yair Morgenstern
f17d5a8d59 4.7.6 2023-07-02 15:20:38 +03:00
Yair Morgenstern
bfc2e3cd59
Version rollout (#9717)
* Bump version and create initial changelog entry

* Various new lines added, some minor corrections. (Dutch.properties) (#9713)

* Various new lines added, some minor corrections.

* Minor correction in placeholder

* Update Spanish.properties (#9702)

* Updated Brazilian_Portuguese.properties (#9696)

* Update French.properties (#9692)

* Update Italian.properties (#9688)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#9687)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Polish.properties (#9686)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-07-02 15:18:50 +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
Yair Morgenstern
1e75b44c23 4.7.5 2023-06-28 11:07:44 +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
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
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
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
b6aa177311 4.7.3 2023-06-23 09:39:54 +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
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
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
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
Yair Morgenstern
670a08c0b9 4.7.1 2023-06-15 11:10:23 +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
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
d666c44697
Keyboard bindings - collision check (#9580) 2023-06-13 07:31:02 +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
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
Yair Morgenstern
e669d1cd93 4.6.19 2023-06-11 12:59: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
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
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
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
1c830672ef
Fix translation templates / use as per #6131 (#9515) 2023-06-04 08:21:13 +03:00
Yair Morgenstern
a4fb6a1701 4.6.17 2023-06-03 23:04:24 +03:00
SomeTroglodyte
42b35bce4f
Allow image overlay and changing world wrap in map editor (#9493) 2023-06-03 22:43:35 +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
ebf6189c1c 4.6.16 2023-05-31 15:08:13 +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
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
Yair Morgenstern
c6942875bc 4.6.15 2023-05-28 09:05:34 +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
ef193babee
Map editor update - concurrency, resource amounts, file double-click (#9461) 2023-05-27 21:44:23 +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
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
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
Yair Morgenstern
4a7f65f281 4.6.12 2023-05-14 22:03:40 +03:00
Yair Morgenstern
3879f18288
Version rollout (#9388)
* Bump version and create initial changelog entry

* Update Italian.properties (#9381)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9378)

* Update Polish.properties (#9377)

* Updated Brazilian_Portuguese.properties (#9376)

* Update German translation (#9373)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.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: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
2023-05-14 21:55:54 +03:00
alexban011
841a1aa564
ci: improved detekt configuration and ci (#9380)
* ci: improved detekt configuration

it still needs some work but it's getting there

* detekt: separated errors from warnings

Detekt doesn't currently have a mechanism for failing only on specific issues

workaround suggested by the maintainer of Detekt

* rebased on master

* fix: resolve ExplicitItLambdaParameter

* fix: fix last star import
2023-05-14 21:55:36 +03:00
Yair Morgenstern
48bd416347
Multi-server preparations: Save server info in game, save server functionality in specific class (#9379)
* Save server info in game

* Moved server functionality into server class

* Fix Android multiplayer update
2023-05-13 21:51:44 +03:00
SomeTroglodyte
97769b89b6
Combat java.util.star-import (#9382) 2023-05-13 21:50:55 +03:00
Yair Morgenstern
9a0ba7dcd8 4.6.11 2023-05-11 13:53:12 +03:00
Yair Morgenstern
3f2dd3614f
Version rollout (#9372)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#9371)

* Update Brazilian_Portuguese.properties (#9352)

* Update Russian.properties (#9351)

There was a letter missing in the word

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: iliademid21 <132929464+iliademid21@users.noreply.github.com>
2023-05-11 13:50:21 +03:00
alexban011
f3e80a4021
Fixed a couple warnings reported by code analysis (#9364)
* fix: resolve EmptyCatchBlock warnings

* fix: resolve PrintStackTrace warnings

* fix: resolve SwallowedException warnings

* fix: resolve ThrowingExceptionsWithoutMessageOrCause warnings

* fix: resolve ConstructorParameterNaming warnings

* fix: resolve FunctionParameterNaming warnings

* fix: resolve InvalidPackageDeclaration warnings

* fix: resolve ForEachOnRange warnings

* fix: resolve ImplicitDefaultLocale warnings

* fix: resolve MayBeConst warnings

* fix: resolve NewLineAtEndOfFile warnings

* fix: resolve UnusedParameter warnings

* fix: resolve UtilityClassWithPublicConstructor warnings

* fix: resolve WildcardImport warnings
2023-05-10 11:43:53 +03:00
Skekdog
a3ef6fa314
Add May not annex cities unique (#9314)
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Fix raze button being unavailable in city screen

* Fixed raze button being available in city screen, as per civ5

* Corrected indentation

* mayAnnex instead of canAnnex, hasUnique rather than getMatchingUniques

* AI will follow rules

* Replaced getMatchingUniques with hasUnique, for real this time
2023-05-09 23:02:19 +03:00
Yair Morgenstern
d00b06bad4 4.6.10 2023-05-08 18:57:30 +03:00
Yair Morgenstern
ed2c294c6f
Version rollout (#9350)
* Bump version and create initial changelog entry

* Update Italian.properties (#9347)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#9345)

* Update German translation

* Update German translation

* Update Spanish.properties (#9344)

* update Simplified_Chinese (#9339)

* Update French.properties (#9336)

* Update French.properties

* Update French.properties

Better translation for the Kremlin quote.

* Update Polish.properties (#9335)

---------

Co-authored-by: yairm210 <yairm210@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-05-08 18:45:27 +03:00
Yair Morgenstern
e0505d1eb7 Songhai Civilian units no longer gain Amphibious promotion 2023-05-08 18:06:01 +03:00
Yair Morgenstern
cf4419912d 4.6.9 2023-05-06 21:25:13 +03:00
letstalkaboutdune
52e8623f08
AbsoluteUnits - Hussar, Cossack, Panzer (#9331) 2023-05-06 21:13:33 +03:00
Yair Morgenstern
a370117301 Resolved #9036 - New Kremlin quote 2023-05-04 10:47:00 +03:00
Yair Morgenstern
044b67d709 4.6.8 2023-05-03 00:11:43 +03:00
Yair Morgenstern
0252416e23
Version rollout (#9313)
* Bump version and create initial changelog entry

* Update Ukrainian.properties (#9311)

* Update Polish.properties (#9309)

* Update Indonesian.properties (#9307)

Improve some translations

* Update French.properties (#9303)

* Update Catalan.properties (#9299)

* Update German.properties (#9297)

Fixed mistakes from the last pull request and made a few corrections.

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

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
2023-05-03 00:06:53 +03:00
letstalkaboutdune
fd67a3520e
AbsoluteUnits - Norwegian Ski Infantry, Mehal Sefari, Carolean, Foreign Legion (#9305) 2023-05-02 00:25:07 +03:00
Yair Morgenstern
e9fca65b3d 4.6.7 2023-04-26 22:29:09 +03:00
Yair Morgenstern
271e88ad03
Version rollout (#9292)
* Bump version and create initial changelog entry

* update Simplified_Chinese translation (#9289)

Co-authored-by: chr_56 <_>

* update Japanese.properties (#9286)

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#9285)

* Update Indonesian.properties (#9283)

* Update Brazilian_Portuguese.properties (#9277)

* Update Polish.properties (#9276)

* Update French.properties (#9274)

Small translation improvements:
- Remove a few past tenses which are unnecessary in French (in the context, past participle alone is enough, especially in notifications)
- More precise translation for "the defence of [cityName]", to refer to the unit garrisoned in the attacked city ("la défense" doesn't sound well)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@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>
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>
2023-04-26 22:08:34 +03:00
SomeTroglodyte
dc223f8cab
Allow modders to use culture/faith conversion without providing the icons (#9275) 2023-04-25 09:05:05 +03:00
Yair Morgenstern
ea39fe4713 4.6.6 2023-04-24 17:42:13 +03:00
Yair Morgenstern
c7dde1bc41
Version rollout (#9273)
* Bump version and create initial changelog entry

* Completed German translation and fixed a few mistakes (#9266)

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

* Update Polish.properties (#9264)

* Update Italian.properties (#9260)

* Update French.properties (#9258)

* Update Indonesian.properties (#9257)

---------

Co-authored-by: yairm210 <yairm210@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>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
2023-04-24 17:37:40 +03:00
Yair Morgenstern
c9067df642 Remove 'reset to Dropbox' button since it's deprecated 2023-04-24 17:33:28 +03:00
Yair Morgenstern
0b3614d1df Remove experimental rendering (experiment unsuccessful) 2023-04-24 17:31:42 +03:00
Yair Morgenstern
ce76dee0fa 4.6.5 2023-04-23 10:11:22 +03:00
Yair Morgenstern
717e4befac
Version rollout (#9256)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#9255)

Now, Indonesian translation is complete

* Fixing some typos in the German translation (#9236)

* Fixing some typos in the German translation

* Fixed another typo

* Fixed a huge amount of typos

Ran over it with a hunspell. Found a few other mistakes in the process.

* Fixed mistranslations in quotes

Fixed one translation that seemed to be made with a software translator.
Replaced a translation of a translation with the original quote.

---------

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

* Fix typo in Polish.properties (#9233)

* Update Turkish.properties (#9227)

* Update Turkish.properties

* Add files via upload

* Update Spanish.properties (#9206)

* Update Spanish.properties

* Update Spanish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@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: bread <77245194+breadtard@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-04-23 10:05:35 +03:00
letstalkaboutdune
45ac4c2d59
AbsoluteUnits - Sipahi, Hakkapeliitta (#9251) 2023-04-22 21:22:28 +03:00
letstalkaboutdune
a3de63efbe
AbsoluteUnits - Janissary, Tercio, Musketeer, Minuteman (#9228) 2023-04-20 00:21:13 +03:00
Yair Morgenstern
2184c494fc
Version rollout (#9224)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9223)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Russian localization (#9222)

* Update Russian localization

Just in case, for the "X attacked our unit Y", I have chosen to make it a bit less precise (not directly stating that "Y" is player's unit) because due to language's specifics it's practically impossible with this translation scheme to not make grammar error.

* fix

should have used copy-paste

* Update Polish.properties (#9215)

* Update Italian.properties (#9209)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@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>
2023-04-19 11:42:09 +03:00
Yair Morgenstern
2f25ed3053 Replaced hardcoded embarked sight with configurable
"Normal vision when embarked" replaced by "[+1] Sight <for [Embarked] units>"
2023-04-19 11:12:21 +03:00
Yair Morgenstern
e313f00f6d
Version rollout (#9208)
* Bump version and create initial changelog entry

* Update French.properties (#9201)

* Translate Simplified_Chinese.properties (#9200)

4.6.2 Basic Translate

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: YaoSiQian <2229561981@qq.com>
2023-04-17 09:33:26 +03:00
SomeTroglodyte
4f30d27d0b
Notifications can be "selected" (#9182)
* Allow "selecting" notifications

* NotificationsScroll remembers position relative to topRight

* NotificationsScroll tries to scroll selection into view

* Fix notification selection and scroll-into-view

* User option to control enlarging selected notifications

* Post-merge missed changes

* Move, flip and reword "Enlarge" option
2023-04-16 21:20:56 +03:00
Yair Morgenstern
ab1d823477 4.6.2 2023-04-16 15:01:43 +03:00
Yair Morgenstern
4c6c6e91fd
Version rollout (#9199)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9195)

* Update Turkish.properties (#9193)

* Update Spanish.properties (#9192)

* Update French.properties (#9190)

* Update Hungarian.properties (#9187)

* Update Polish.properties (#9180)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@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: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-04-16 14:52:41 +03:00
SomeTroglodyte
90cac15c7f
Fix more leaks of the actual Player count in random mode (#9196) 2023-04-16 14:20:08 +03:00
Ouaz
d15d8b0bf1
Make new "Charts" button translatable (#9191) 2023-04-15 21:03:35 +03:00
Yair Morgenstern
bc5e486b20 Resolves #9186
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
2023-04-15 21:00:17 +03:00
Yair Morgenstern
2ce145be1e
Version rollout (#9179)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9170)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Hungarian.properties (#9161)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9160)

* update Simplified_Chinese translation (#9159)

Co-authored-by: chr_56 <_>

* Update Ukrainian.properties (#9153)

* Update French.properties (#9152)

* Update Czech.properties (#9151)

translated some of the yet untranslated texts

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: brmaku <46785630+brmaku@users.noreply.github.com>
2023-04-13 16:20:25 +03:00
WhoIsJohannes
193114078b
Show a highlight for the tile that seems most suitable to found a cit… (#9099)
* Show a highlight for the tile that seems most suitable to found a city (can be turned off in settings)

* Don't allow players to cheat through highlighting suggested map tiles for city founding.

* Don't pass whether cheating is allowed, but just decide based on whether civ is AI or not. That way it will also work correctly for automated settlers (by human players). Also show it in the first round, because why not. If the map generator puts us on a shitty starting tile, why not tell the player?

* Address comments

* Address comments
2023-04-13 15:43:46 +03:00
Yair Morgenstern
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
Ouaz
bc9f75d6e4
Make new "notifications" option translatable (#9154) 2023-04-11 11:07:25 +03:00
letstalkaboutdune
f31d2a9a2a
AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar (#9165) 2023-04-11 07:55:31 +03:00
Yair Morgenstern
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00
Vitor Gabriel
974d27667b
Updated Brazilian_Portuguese.properties (#9150) 2023-04-09 18:14:03 +03:00
Yair Morgenstern
52f288be05
Version rollout (#9149)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9145)

* Update Italian.properties (#9143)

* Update Spanish.properties (#9142)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-04-09 18:07:03 +03:00
Yair Morgenstern
adb51d9264
Resource stockpiles! (#9147)
* Resource stockpiles!

* toString extension including sign (+/-)

* Trigger uniques to provide/consume stockpiled resources

* Fixed build

* Display 'per turn' for stockpiled resources that are consumed per turn

* "Costs [amount] [resource]" works!

* Stockpile unique costs are displayed in construction button

* Added unique to prevert certain resources from being traded
2023-04-09 18:01:26 +03:00
Yair Morgenstern
7748ef42ab 4.5.17 2023-04-08 22:16:35 +03:00
Yair Morgenstern
d339de1929
Version rollout (#9139)
* Bump version and create initial changelog entry

* Added 112 dutch translations (#9131)

* Update Polish.properties (#9129)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Hungarian.properties (#9107)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9102)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Abe van der Wielen <abevanderwielen@gmail.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-04-08 22:09:54 +03:00
SomeTroglodyte
6b084f0e6b
Victory screen score charts (#9121)
* VictoryScreen with Charts by WhoIsJohannes

* VictoryScreen with Charts by WhoIsJohannes - atlas

* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
2023-04-08 21:38:27 +03:00
letstalkaboutdune
735a0f6f40
AbsoluteUnits - Mandekalu Cavalry, Conquistador, Inquisitor (Post-Industrial) (#9115) 2023-04-04 22:06:39 +03:00
AdityaMH
ad080b4dc6
Fix missing desert (again) in wheat farm in flood plains in hexarealm (#9113)
* Fix missing desert for flood plains in hexarealm tileset

* fix typo

* Fix missing desert (again) in wheat farm in flood plains
2023-04-04 16:42:32 +03:00
SomeTroglodyte
4c88fbb996
Change map resource controls presentation (#9104) 2023-04-04 10:52:42 +03:00
SomeTroglodyte
cd4e25a4f1
Victory screen reorg/cleanup (#9111)
* VictoryScreen reorg

* VictoryScreen reorg - use TabbedPager

* VictoryScreen reorg - make helpers reusable

* VictoryScreen reorg - fixed headers

* VictoryScreen reorg - debug access to Replay

* Victories reorg - more cleanup

* VictoryScreen reorg - icons and keys

* VictoryScreen reorg - RankingType

* VictoryScreen reorg - RecreateOnResize

* VictoryScreen reorg - Avoid floating text overlapping buttons

* VictoryScreen reorg - remove obsolete todo
2023-04-04 10:49:58 +03:00
Yair Morgenstern
3c595c8952 4.5.16 2023-04-03 14:56:28 +03:00
Yair Morgenstern
35d5b8c43c
Version rollout (#9100)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9094)

* Update Ukrainian.properties (#9093)

* Update Catalan.properties (#9090)

* Update Spanish.properties (#9088)

All tutorial page text

* Update Hungarian.properties (#9084)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Simplified_Chinese.properties (#9083)

- add more translation

* Update French.properties (#9082)

* Update Turkish.properties (#9081)

Add and revise translations

* Update Bulgarian.properties (#9080)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
2023-04-03 14:53:35 +03:00
SomeTroglodyte
a4c4c5f93e
Music player controls (#9087)
* Music controls cleanup

* Music controls cleanup - assets

* Music controls cleanup - fix incorrect attribution
2023-04-01 22:06:46 +03:00
Yair Morgenstern
36b90075da 4.5.15 2023-03-31 16:17:52 +03:00
Yair Morgenstern
9f521895aa
Version rollout (#9079)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9078)

- for screen orientation part translation
- and a few due-to missed translation
- and borderless

* Update Ukrainian.properties (#9076)

* Update Hungarian.properties (#9074)

* Update Indonesian.properties (#9071)

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: kensvin <kensvin28@gmail.com>
2023-03-31 15:52:29 +03:00
SomeTroglodyte
45d66f0580
Civilopedia Welcome, moddable (#8940) 2023-03-31 14:58:07 +03:00
Yair Morgenstern
6a153f61dd 4.5.14 2023-03-29 12:21:57 +03:00
Yair Morgenstern
223494fa52
Version rollout (#9069)
* Bump version and create initial changelog entry

* Update for Russian localization (#9068)

Translation for most of lines of text. There are some left as it's impossible to translate those correctly without context, which is not provided in a nice way, so only way to understand their meaning is finding them in-game (Which I couldn't do, unfortunately.)

* Update Spanish.properties (#9066)

* Update Filipino.properties (#9062)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9061)

* Update Brazilian_Portuguese.properties (#9060)

* Update Bulgarian.properties (#9053)

* Update German translation (#9049)

* Update French.properties (#9046)

* Fixed russian translation errors

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2023-03-29 12:19:57 +03:00
letstalkaboutdune
f32bf4a7a4
AbsoluteUnits - Hwach'a, Camel Archer (#9063) 2023-03-29 07:39:12 +03:00
Yair Morgenstern
837833e450 4.5.13 2023-03-26 21:55:23 +03:00
Yair Morgenstern
3047335db1
Version rollout (#9041)
* Bump version and create initial changelog entry

* Update Hungarian.properties (#9028)

* Update Hungarian.properties

* Update Hungarian.properties

* Update French.properties (#9024)

* Updated Brazilian_Portuguese.properties (#9022)

* Update Spanish.properties (#9021)

* Update Spanish.properties

Mini update

* Update Spanish.properties

* Update German translation (#9019)

* Update Polish.properties (#9017)

* Update Filipino.properties (#9015)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9012)

* Update Dutch.properties (#9010)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
2023-03-26 21:50:15 +03:00
Yair Morgenstern
7bc28c4588 Returned Perlin map type 2023-03-25 21:58:10 +03:00
SomeTroglodyte
90c295dc1c
Map scroll speed (#8958)
* Allow mouse panning in map editor too

* User control over map panning speed

* User control over map panning speed - german
2023-03-23 23:58:18 +02:00
Yair Morgenstern
df879b1c02 4.5.12 2023-03-23 22:05:00 +02:00
Yair Morgenstern
4d573b627c
Version rollout (#9009)
* Bump version and create initial changelog entry

* Update Dutch.properties (#9006)

* Update Hungarian.properties (#9000)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8999)

* Update French.properties (#8997)

* Update Italian.properties (#8988)

* Update Polish.properties (#8987)

* Updated Brazilian_Portuguese.properties (#8984)

* Update German translation (#8983)

* Update Ukrainian.properties (#8982)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
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: Lesiakower <125187776+Lesiakower@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: Gualdimar <Gualdimar@users.noreply.github.com>
2023-03-23 21:58:56 +02:00
Gualdimar
51f37af1a2
Improvements in science display (#8990)
* Displaying science overflow

* The amount of science from research agreement notification

* Check tech progress at the start of a turn

* Fixed exception

* Better remainingScienceToTech calculation

* Multiple technologies can be researched in one turn

* Small improvements
2023-03-22 21:59:35 +02:00
letstalkaboutdune
d24d8b3d84
AbsoluteUnits - Landsknecht, Knight_v2, Missionary (post-Industrial) (#8993) 2023-03-22 10:20:24 +02:00
Yair Morgenstern
4c694be94b 4.5.11 2023-03-21 14:51:53 +02:00
Yair Morgenstern
af333b214a
Version rollout (#8981)
* Bump version and create initial changelog entry

* Minor swedish update (#8978)

* Minor swedish update

* Update Swedish.properties

* Update Ukrainian.properties (#8975)

* Update Belarusian.properties (#8972)

Edited by MonoDx

* Update Spanish.properties (#8969)

* Update Hungarian.properties (#8965)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-03-21 14:47:03 +02:00
SomeTroglodyte
ba15c9c91f
Key binding simpler widget (#8946)
* Keyboard Bindings: Simpler Widget

* Keyboard Bindings: Reset binding

* Keyboard Bindings: Reset binding - patch

* Keyboard Bindings: Simpler Widget - revert opening feature

* Keyboard Bindings: Simpler Widget - improved
2023-03-21 14:08:03 +02:00
Yair Morgenstern
f66076c2a4 4.5.10 2023-03-19 19:00:26 +02:00
Yair Morgenstern
3768932b93
Version rollout (#8963)
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8955)

* Update Japanese translation (#8950)

* tutorial

* small addition

* Update Filipino.properties (#8949)

* Update Filipino.properties

* Update Filipino.properties

* Update Hungarian.properties (#8943)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update French.properties (#8942)

* Update Polish.properties (#8941)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#8939)

* Update German translation (#8937)

* Update Ukrainian.properties (#8936)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Updated Brazilian_Portuguese.properties (#8934)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@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: mape6 <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-03-19 18:55:54 +02:00
Yair Morgenstern
c3b8eaa6d2 4.5.9 2023-03-16 22:59:52 +02:00
Yair Morgenstern
26e292ab11
Version rollout (#8930)
* Bump version and create initial changelog entry

* Update Polish.properties (#8922)

* Update Spanish.properties (#8918)

* Update French.properties (#8916)

* Update Hungarian.properties (#8915)

* Update Ukrainian.properties (#8914)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Italian.properties (#8913)

* Updated Brazilian_Portuguese.properties (#8911)

* Update Filipino.properties (#8910)

* Update German translation (#8909)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
2023-03-16 22:53:35 +02:00
SomeTroglodyte
5a58d8c39c
Harden and improve "Download Mod from Url" parser (#8924) 2023-03-16 22:43:16 +02:00
Gualdimar
ba63f9a62b
Fixed the positioning of popups after changing the screen orientation on Android (#8927) 2023-03-16 20:48:24 +02:00
Gualdimar
5ee3df96c8
Trade ending notification (#8925)
* Notification of the end of a trade in 3 and 1 turns

* Notification about the loss of an alliance is not shown if the city state is captured.

* Shortened
2023-03-16 14:30:12 +02:00
Caballero Arepa
a4aa5b7b5a
Improved Minimap colors (#8919)
* Improved minimap colors

G&Ks change

* Improved minimap colors

Changes for Vanilla
2023-03-16 14:29:37 +02:00
Yair Morgenstern
9a112728c1 translation fix 2023-03-15 22:28:58 +02:00
Yair Morgenstern
6aef2ff3c6 Resolved #8888 - Added trigger condition notification for several unit triggers 2023-03-15 19:08:50 +02:00
Yair Morgenstern
0a50f6deec 4.5.8 2023-03-15 10:45:19 +02:00
Yair Morgenstern
445bcf9701
Version rollout (#8908)
* Bump version and create initial changelog entry

* Update German translation (#8907)

* Update German translation

* Update German translation

* Update Hungarian.properties (#8902)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8898)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Simplified_Chinese.properties (#8895)

* Update Ukrainian.properties (#8893)

* Update French.properties (#8890)

* Updated Brazilian_Portuguese.properties (#8887)

* Update Swedish.properties (#8886)

small update

* Update Italian.properties (#8884)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: pdt012 <54163911+pdt012@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-03-15 10:42:29 +02:00
SomeTroglodyte
aab975a61b
Key bindings Step 3 - Better UI (#8891)
* Configurable key bindings - better Widget step 2

* Configurable key bindings - step 2 updated help
2023-03-15 09:05:50 +02:00
SomeTroglodyte
f1c891252e
Fix SelectBox ScrollPane being transparent (#8889)
and make Skin.json conform to JSON standard
2023-03-15 09:04:51 +02:00
Yair Morgenstern
a2da1ff7ee Resolved translation errors at #6131 2023-03-13 23:26:32 +02:00
Yair Morgenstern
860d9425ce 4.5.7 2023-03-13 17:19:43 +02:00
Yair Morgenstern
cad179c701
Version rollout (#8882)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8881)

* Minor fixes to the translations (#8879)

* Update Swedish.properties (#8878)

Small update swedish translation

* Update French.properties (#8875)

* Update Polish.properties (#8874)

* Update Bulgarian.properties (#8873)

* Update Spanish.properties (#8870)

* Update Czech.properties (#8868)

* Update Czech.properties

* Update Czech.properties

* Update Ukrainian.properties (#8869)

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
2023-03-13 17:12:54 +02:00
SomeTroglodyte
db08c30363
Make City center minimum tile yields moddable (#8804)
* Slight cleanup of TileStatFunctions

* Make City center minimum tile yields moddable

* Make City center minimum tile yields moddable - patch1

* Make City center minimum tile yields moddable - patch1
2023-03-13 17:02:08 +02:00
Yair Morgenstern
cd8b68253b All units can be automated
Modders can choose which units get it as a primary action
2023-03-13 16:55:50 +02:00
SomeTroglodyte
10caf8e93e
Key bindings Step 2 (#8872)
* Configurable key bindings - Enable via Hidden debug-option

* Configurable key bindings - better Help

* Configurable key bindings - better Widget step 1
2023-03-12 22:45:06 +02:00
WhoIsJohannes
f4dca2281e
Add Replay feature in VictoryScreen (#8844)
* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil

* Revert "Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil"

This reverts commit d4cddb4312.

* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Revert some unintentional indentation changes

* Refactor some common logic of Minimap and ReplayMap into MinimapTileUtil

* Slightly increase ReplayMap size and simplify logic to calculate tile size since input is static.

* Indentation again... :|

* Unify isCityCenter & isCapital into an enum in TileHistory and shorten identifiers

* Use city.getTiles() instead of city.tiles in CityInfoConquestFunctions.kt

* Improve tileSize calculation in ReplayMap.kt

* Remove extra padding in VictoryScreen -> Replay to prevent WorldScreenTopBar from acting up on the next turn.

* Make return value of MinimapTileUtil.spreadOutMinimapTiles more useful to callers

* Cancel Replay timer when VictoryScreen is disposed or when Replay is opened again.

* Cancel replay map timer task whenever tab is switched in VictoryScreen

* Improve serialization for TileHistory by using a custom serializer. This removes the need for holding two copies of the same thing and to use String based keys.

* Add backwards compatibility for replay. The replay will start at the turn where it came into play.

* Remove debugging code :|

* Use gameInfo field rather than going throug the global UncivGame...
2023-03-12 19:59:48 +02:00
Yair Morgenstern
22da4b29c8 4.5.6 2023-03-11 20:37:35 +02:00