Commit Graph

932 Commits

Author SHA1 Message Date
alexban011
119440ccec
fixing translatable (#7277)
* 1 - speeds not translatable

* 2 - start year:
2022-07-01 09:34:13 +03:00
OptimizedForDensity
b3cd36c70e
Fix translation issues caused by nested brackets and braces (#7242)
* Fix translation issues

* Readd comment

* Reviews

* Update translation line
2022-07-01 09:32:56 +03:00
Yair Morgenstern
8f0e64e02d 4.1.14 2022-06-25 22:47:35 +03:00
Yair Morgenstern
250ab4010f
Version rollout (#7305)
* Bump version and create initial changelog entry

* Update Russian.properties (#7303)

* Update Portuguese.properties (#7300)

* Update Romanian.properties (#7294)

* Update Romanian.properties

* Update Romanian.properties

* oopsie

* Update Swedish.properties (#7286)

* Update Catalan.properties (#7274)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7273)

* French.properties: update translation (#7272)

* French.properties: fix grammatical mistake

Multiplayer, not multiplayers, as the subject of the adjective is a
single game, server, etc. but never players themselves.

* French.properties: Update French translation

* Update Simplified_Chinese.properties (#7270)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#7269)

* Update Italian.properties (#7266)

* Update Filipino.properties (#7265)

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7263)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7262)

* Update Indonesian.properties (#7260)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Amarques-UCSD <77080462+Amarques-UCSD@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Baapity <62382567+Baapity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <oss+github@mayeul.net>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-06-25 22:38:41 +03:00
alexban011
56812f0297
added gameParameter option to disable start bias (#7241)
* disable start bias

* better indentation

* improved

* improvedx2

* now for generated maps too

* made it choose a random location instead of the last one

* -||-

* checks

* forgot I can write directly on github :)
2022-06-25 22:14:32 +03:00
alexban011
51ba657b75
Added option to select font size (#7238) 2022-06-25 13:46:12 +02:00
alexban011
8047278d80
Add Notifications Log (#7122) 2022-06-25 13:40:42 +02:00
OptimizedForDensity
4f6a2eb2f4
Add notification when a civ is resurrected through liberation (#7276) 2022-06-24 01:24:29 +02:00
Yair Morgenstern
315adb7648 4.1.13 2022-06-22 09:47:51 +03:00
Yair Morgenstern
147b73fad2
Version rollout (#7259)
* Bump version and create initial changelog entry

* Update French.properties (#7258)

* translation (#7253)

* Update Simplified_Chinese.properties (#7251)

* Update Simplified_Chinese.properties

Imcomplete. A save commit only.

* Update android/assets/jsons/translations/Simplified_Chinese.properties

* Update Italian.properties (#7245)

* Update Filipino.properties (#7235)

* Improve German.properties (#7231)

* Update Lithuanian.properties (#7229)

* Update Catalan.properties (#7225)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Timo T <azzurite@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-06-22 09:36:33 +03:00
alexban011
8f53262fc4
CityScreen plays a sound when opened (#7163)
* added sounds to cityScreen

* changes? ..don't know how to name this commit

* removed try block

* improved era1 sound and added slider for city enter sounds

* added Information Era sound

* added Future Era sound

* better option name + translation

* added Atomic Era sound

* normalized sounds

* prevent spam + better era 0 and 1 sounds

* cleanup

* sound improvements to medieval and atomic

* volume now tied to sound effects

* improved information sound

* improved future sound

* sounds now stop if you exit the city screen

* improved Renaissance sound

* now in separate function

* now using the music controller

* better file names

* WLTK day sound + sounds are now configurable in Eras.json

* removed redundant setting and fixed comment

* added PlaySingle

* musicController no longer used

* Gdx.audio.newMusic is now used

* function name

* function are now in their own class

* CitySoundPlayer now has 1 instance in UncivGame and is hooked

* credits

* sounds loop

* loopable sounds

* updated credits

* fixed sound not stopping when changing city without leaving cityScreen

* changed WLTKNew sound

* added toggle for the sounds

* changed WLTK sound, removed music and made all tracks have the same volume

* addressed some of the issues

* addressed more issues

* increased sounds volume + volume slider

* made WLTK sound slightly quieter

* removed entry from Vanilla eras

* revert back to CitySoundPlayer.kt

* no more hooks

* removed unused stuff

* changees

* completly reverted MusicController

* and the MusicTrackChooserFlags

* fixed ESC not stopping sounds

* updated credits to mention the sounds are modified

* dispose()

* removed try block
2022-06-22 09:11:03 +03:00
Yair Morgenstern
8d742eef38 4.1.12 2022-06-19 21:55:28 +03:00
Yair Morgenstern
806135586d
Version rollout (#7222)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7204)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Lithuanian.properties (#7203)

* Update Filipino.properties (#7192)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-06-19 21:49:20 +03:00
SomeTroglodyte
9683e27526
Civilopedia tweaks (#7051)
* Civilopedia Files Split

* Central showReligionInCivilopedia function

* ConstructImprovementConsumingUnit with Conditional for Prophet

* Show Units capable of building an Improvement

* "Needs removal of terrain features to be built"
2022-06-19 02:29:07 +02:00
Timo T
197241b2e0
Various UX improvements (#7207)
* Refactor: Format JSON

* Change button hover color to be darker

* Refactor: Change disabled buttons to always look disabled, even if they don't have the default style

* Make disabled style a little grayer

* Refactor: Make addCloseButton not start a new row

* Refactor: Remove "...inRow" popup button methods & add button style parameter

* Reorder "ok/cancel" popups to have "ok" on the right side

* Fix pointer enter/exit events being disabled by default

* Fix equalizeLastTwoButtonWidths not setting the cells to be equal size

* Change YesNoPopup to ConfirmPopup

* Add ConfirmPopup to deletion of save files
2022-06-19 00:53:30 +02:00
OptimizedForDensity
c922f134e6
Moddable game speeds (#6856)
* Move GameSpeed definition to JSON files

* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
Joan Josep
1facd97782
Translated strings after generating translation files from Adv Opt. (#7209)
* Translated strings after generating translation files from Adv Opt.

* Amend missing space at the end of the line
2022-06-18 21:43:30 +03:00
Yair Morgenstern
f48bc94f87 4.1.11 2022-06-16 21:28:20 +03:00
Yair Morgenstern
192bc9eb46
Version rollout (#7185)
* Bump version and create initial changelog entry

* Update French.properties (#7174)

* Update Catalan.properties (#7173)

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7172)

* Update Filipino.properties (#7166)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#7165)

* Update Italian.properties

* Update Italian.properties

* Update Brazilian_Portuguese.properties (#7149)

* Update Brazilian_Portuguese.properties

* Fixed Floodfill_Abbreviation mistake

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@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: Kalil <kalilcamera67@gmail.com>
2022-06-16 21:20:06 +03:00
Yair Morgenstern
d562eb2dd2 4.1.10 2022-06-14 21:03:20 +03:00
Yair Morgenstern
c710b83a0d
Version rollout (#7162)
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7153)

* Update French.properties (#7142)

* Update Catalan.properties (#7140)

* Update Romanian.properties (#7139)

* Update Traditional_Chinese.properties (#7137)

* Update Traditional_Chinese.properties

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Simplified_Chinese.properties (#7136)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7134)

* Update Indonesian.properties

* Update Indonesian.properties

* Fetch upstream and more translations to brazilian portuguese (#7133)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update German translation (#7132)

* Update German translation

* Update German translation

* Update Filipino.properties (#7131)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7127)

* Update Spanish.properties

* fix some vainas

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-06-14 20:52:56 +03:00
alexban011
fc926420e8
added cutout support (#7044)
* added support

* now toggleable in settings

* translation

* added note that it requires restart

* made it enabled by default

* padded buttons to the right if there is a cutout

* checking for cutout instead of android

* reverted button changes

* moved option to advancedTab
2022-06-14 20:34:30 +03:00
Yair Morgenstern
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +03:00
Yair Morgenstern
19e0537e8c
Version rollout (#7126)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7124)

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#7112)

* Update Simplified_Chinese.properties (#7107)

* Update Catalan.properties (#7105)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7104)

* Update Italian.properties (#7102)

* Update German translation (#7101)

* Update Indonesian.properties (#7100)

* Update Lithuanian properties (#7099)

* Update Lithuanian.properties

* Update Lithuanian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com>
2022-06-10 16:49:05 +03:00
Timo T
3e6fc0e22a
Add multiplayer turn sound notification (#6995)
* Refactor: Extract methods & reduce code duplication

* Refactor: Rename Sounds to SoundPlayer

* Refactor: Make UncivSound a data class

As far as I can see, UncivSoundConstants served no purpose

* Refactor: Reorder sounds

* Refactor: Split up ExtensionFunctions and move into own package

* Add multiplayer turn sound notification

* Refactor: Remove unnecessary double translation

* Refactor: Reduce code duplication

* Refactor: No if for boolean logic
2022-06-10 16:44:29 +03:00
Xander Lenstra
9558b79653
Removed incorrectly translated strings from indonesian translation (#7108)
They should not be translated literally, but the link above should be followed to find what should be translated instead.
2022-06-10 00:27:58 +02:00
Yair Morgenstern
d795c56d58 4.1.8 2022-06-08 10:30:04 +03:00
Yair Morgenstern
32e93a32e2
Version rollout (#7098)
* Bump version and create initial changelog entry

* Update French.properties (#7093)

* Update Italian.properties (#7092)

* Update German translation (#7087)

* Update Japanese.properties (#7086)

* Update Japanese.properties

Added about 20 lines of Japanese translation.

Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.

* Update Japanese.properties

Replaced the commented out fastlane_full_description with appropriate \n for line breaks

* Update Japanese.properties

Various easy one line translations

* Update Spanish.properties (#7082)

* Update Catalan.properties (#7081)

* Update Indonesian.properties (#7079)

Co-authored-by: yairm210 <yairm210@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-06-08 10:25:11 +03:00
OptimizedForDensity
b79246ee02
Certain projects cannot be hurried by great engineer (#7076) 2022-06-08 10:20:45 +03:00
MindaugasRumsa
b05072d0c9
Fix "Free technology" allowing you to get a technology you're not supposed to be able to get (#7083) 2022-06-08 02:16:46 +02:00
Yair Morgenstern
ea3b1bb612 4.1.7 2022-06-06 10:02:02 +03:00
Yair Morgenstern
6d50169c14
Version rollout (#7078)
* Bump version and create initial changelog entry

* Update Romanian.properties (#7069)

* Update Romanian.properties

* Update Romanian.properties

* Update Japanese.properties (#7068)

* Update Japanese.properties

Added about 20 lines of Japanese translation.

Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.

* Update Japanese.properties

Replaced the commented out fastlane_full_description with appropriate \n for line breaks

* Update Traditional_Chinese.properties (#7066)

* Update Traditional_Chinese.properties

* Update android/assets/jsons/translations/Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Simplified_Chinese.properties  (#7065)

* Update Simplified_Chinese.properties

Complete easy stuff.

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* [ZH]Fix typo

* Update Simplified_Chinese.properties

* Update Lithuanian.properties (#7060)

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update French.properties (#7053)

* Update Filipino.properties (#7050)

* Update German translation (#7048)

* Add missing Spanish translations (#7043)

* Add multiplayer translations

* Other translations

"Fastlane_full_description"([this](8fbcad47a4/android/assets/jsons/translations/Spanish.properties (L23))) cannot be translated

* Add confuse but not so translation

* merge?

* Update Catalan.properties (#7041)

* Update Catalan.properties

* Amend a string missing [beliefType]

* Update Catalan.properties

* Update Catalan.properties

* Amend some Catalan localisation strings.

# Conflicts:
#	android/assets/jsons/translations/Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: RIMOPA <97112832+RIMOPA@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-06-06 09:37:29 +03:00
SomeTroglodyte
bbe74854b4
Fix current list of un-translatables (#7057)
* Fix current list of un-translatables

* Fix current list of un-translatables - revert tr() change and tweak map editor map parameter display
2022-06-06 07:43:28 +03:00
alexban011
13da7c1b9e
Better friends list UI (#7054) 2022-06-06 03:02:45 +02:00
Yair Morgenstern
8fbcad47a4 4.1.6 2022-06-01 22:54:14 +03:00
Yair Morgenstern
ae13a87987
Version rollout (#7038)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7037)

* Update Traditional_Chinese.properties (#7024)

* Update Italian.properties (#7023)

* Update Traditional_Chinese.properties (#7016)

* Update German translation (#7015)

* Update German translation

* Update German translation

* Update French.properties (#7012)

* Translation PTBR (#7011)

* fastlane ptbr wip

* fastlane ptbr done

* add fastlane translation to main ptbr

* Update Brazilian_Portuguese.properties

* tabs and multiplayer

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
2022-06-01 22:47:54 +03:00
alexban011
e4e2696160
Friends list (#7020)
* created files for friends list screen

* redone #3

* fixed some crashes and more additions

* changelog in the comment below

* Update .gitignore

included the FriendsList.json file

* changelog in the comment below, again

* optimized imports to hopefully fix the error in github build check

* replaced imports with the ones from master since OnlineMultiplayer.kt no longer exists

* imported ViewFriendsList

* used the right package for all friendsList related files and a little bit of cleanup

* check if friends list is empty before adding the select friend button

* check if the ID is correct when adding a new friend

* don't set null as playerID if no friend is selected

* added messageTexts for the input TextFields

* don't show already selected friends

* fixed checkmark not updating after selecting a friend

* you can't be your own friend! and other checks for edit button

* fix error

* replaced error type with enum, replaced nested ifs with when loop, added additional checks when editing friends

* fixed error, can't really tell how I managed to do this

* reorganized checks for adding and created settings variable to hopefully fix the github build error

* actually fixed github error

* it now removes selected friends from the list of selectable friends

* fixed not being able to change only the id of a friend

* made it look half decent

* cleanup + improved help button

* updated template.properties

* renamed variable

* some tweaks

* moved friends list to GameSettings

* tested every feature and fixed what didn't work

* removed redundant variables and final cleanup

* little improvements

* string improvements

* removed rightSideButton from ViewFriendsListScreen

* removed unnecesary uniformX and decreased padding to allow seeing more friends in ViewFriendsListScreen
2022-06-01 22:47:43 +03:00
Timo T
5a4f1b0903
Allow non-SSL-encrypted HTTP traffic & warn Dropbox users (#7013)
* Add usesCleartextTrafic permission to Android manifest

* Add warning for starting a multiplayer game with the default Dropbox server

* Improve multiplayer server documentation

* Only update the current game if we're using a custom server or it's not our turn

* Refactor: Nicer variable name

* Fix compilation

* Fix type

Don't know what happened there
2022-06-01 22:40:20 +03:00
OptimizedForDensity
afce951724
Pillaging certain improvements may loot gold or other stat resources (#6993)
* Pillaging loots gold on certain improvements

* Add warning if improvement pillageGold > 0 and has UniqueType.Unpillagable

* Pillage yields as a UniqueType

* Forgot to undo demonstration

* Remove unused line

* Eliminate some redundancy

* Reword unique text

* Slight cleanup and add notification for pillage victim

* Reviews

* Made pillaging notifications more consistent with other hostile action notifications

* Missed a line
2022-06-01 19:13:04 +02:00
MartinP
98d189384c
Update template to add 'wait' (#7021) 2022-05-31 16:33:47 +03:00
SomeTroglodyte
1b008905f6
Save and load reorg and keyboard handling (#6929)
* Load and Save Game Screens rework - Linting

* Load and Save Game Screens rework - Modularize and Keyboard

* Load and Save Game Screens rework - error handling

* Load and Save Game Screens rework - Move other save/load code

* Load and Save Game Screens rework - More Keyboard

* Load and Save Game Screens rework - Increase clipboard limit

* Load and Save Game Screens rework - Post-merge patch

* Load and Save Game Screens rework - Home, End, harden

* Load and Save Game Screens rework - Post-merge patch again

* Load and Save Game Screens rework - reviews
2022-05-31 16:31:19 +03:00
Yair Morgenstern
ad7397de66 Territory steal rewording 2022-05-30 21:59:32 +03:00
Yair Morgenstern
efa2168784 4.1.5 2022-05-30 21:50:56 +03:00
Yair Morgenstern
44ee9efd94
Version rollout (#7007)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#7005)

* Update German translation (#6997)

* Update French.properties (#6987)

* Update Romanian.properties (#6982)

* Update Spanish.properties (#6981)

* Update Traditional_Chinese.properties (#6973)

* Update Indonesian.properties (#6972)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: hhpy123 <100397618+hhpy123@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-05-30 21:43:33 +03:00
Paul Pogonyshev
8ab686cb14
Improve suggestions when constructing an improvement is not possible (#6947)
* Improve suggestions when constructing an improvement is not possible

* Reimplement getImprovementBuildingProblems() as a generator function

* Update documentation of getImprovementBuildingProblems(); forgotten in the last commit

* ImprovementPickerScreen - tr

* Rename a variable for clarity

Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2022-05-29 22:16:04 +03:00
Joan Josep
a17797a709
Add Catalan translation and provide some strings. (#6992) 2022-05-29 16:50:47 +02:00
alexban011
ea31bd164f
Add optional on-screen buttons to zoom in and out (#6933) 2022-05-29 15:32:36 +02:00
Yair Morgenstern
c01d2a8893 4.1.4 2022-05-27 14:06:38 +03:00
Yair Morgenstern
82efebf1c8
Version rollout (#6971)
* Bump version and create initial changelog entry

* Update German translation (#6967)

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#6960)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Check passing

Kind of embarrassing. A double fault.

* Update French.properties (#6943)

* Update Italian.properties (#6941)

* Update Traditional_Chinese.properties (#6921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update android/assets/jsons/translations/Traditional_Chinese.properties

I think this is better

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Spanish.properties (#6944)

* Update Spanish.properties

Question: Can translated lines have <" "> in them? Or does it break something?
I ask because in spanish the hierarchy of quotation marks is: «First order “Second ‘third order’ order”».
As probably most fonts don't have <« »> (neither does my keyboard), these (" ") are the "correct" ones to use instead of < ' ' >.

* Update Spanish.properties

* Change  <' '> for <" ">

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@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>
Co-authored-by: hhpy123 <100397618+hhpy123@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-05-27 14:00:11 +03:00
Timo T
ea03b97639
#6914 Multiplayer Status Display (#6916)
* Handle subclassing of Events properly

Previously, you could only listen to the exact class

* Add relevant parent classes for the multiplayer events

* Refactor: use the old name as the main name in MultiplayerGameNameChanged event

* Add being able to stop listening to events in the EventBus

* Add tests for EventBus

* Refactor: Extract GameList into standalone file

* Refactor: safeUpdateIf to more generic throttle function

* Refactor: Extract multiplayer UI helper functions into separate file

* Refactor: Extract load/download multiplayer game into logic class from UI

* Make loading a multiplayer game automatically update the in-memory game in OnlineMultiplayer

* Refactor: Extract multiplayer settings into separate object

* Add multiplayer status display

* Fix error with multiplayer games not correctly being cleaned up after successful update

* Prevent loadLatestMultiplayerState() while next turn update is running

* Show "Working..." while waiting for next turn calculations instead of "Waiting for [civ]..."

* Fix race condition while updating online game state
2022-05-25 22:22:58 +02:00