Commit Graph

7306 Commits

Author SHA1 Message Date
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
Timo T
9918353c66
Fix crash during next turn automation (#7125) 2022-06-10 16:44:02 +03:00
alexban011
55ed226608
disable worldWrap if its disabled in settings (#7123) 2022-06-10 15:48:51 +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
5cd992a076 Resolved #7111 - Peace cooldown with city-states 2022-06-09 19:51:08 +03:00
Yair Morgenstern
538b7b8e7d refactor: Simplified city-state war declaration 2022-06-09 19:33:14 +03:00
Yair Morgenstern
467b0b2570 All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances 2022-06-09 19:26:12 +03:00
Yair Morgenstern
6c463797d8 Resolves #7080 - tileFilter matches resource name and uniques 2022-06-08 19:52:45 +03:00
Yair Morgenstern
b15e949a33 Resolves #7103 - mapholder size reset after resize 2022-06-08 19:40:41 +03: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
OptimizedForDensity
207cba0844
Fix scout not upgrading through ruins (#7091) 2022-06-08 10:19:42 +03:00
Timo T
006d360feb
Fix UncivServer not correctly handling put request (#7095) 2022-06-08 10:19:02 +03:00
SomeTroglodyte
0ac89a906d
WordScreenTopBar rework, portrait-friendlier (#6945)
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review
2022-06-08 10:18:30 +03:00
alexban011
29c55cd393
fixed minimap showing fog of war everywhere when you joined a mp game without being a player (#7094)
* reveal tiles if spectator

* better formatting

* even better formatting

* removed additional new line
2022-06-08 10:18:11 +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
e5d8de6b58 Resolved crashes when centering on a city-state with no cities 2022-06-07 23:31:22 +03:00
Azzurite
23f55a959c Fix wrong default folder name 2022-06-07 20:19:18 +02:00
The Bucketeer
47c7026dad
Update ManuallyBlockedMods.json (#7089)
Deciv repository has been transferred recently and it has been updated with same standard as Deciv Redux.
2022-06-07 20:23:11 +03:00
OptimizedForDensity
c40b25a73b
Fix rare case where ruins would delete an AI unit while trying to upgrade it (#7084)
* Fix rare case where ruins could delete AI units when upgrading the unit

* Don't moveToTile if the unit is destroyed

* Update comment

* Forgot to uncomment line

* Move currentMovement = 0f to destroy()
2022-06-07 08:27:25 +03:00
OptimizedForDensity
f5317eb53b
Prevent duplicate ruin reward (#7085) 2022-06-06 22:34:23 +03:00
Yair Morgenstern
c9d8ccc596 Fastlane descriptions 2022-06-06 10:09:59 +03:00
Yair Morgenstern
ea3b1bb612 4.1.7 2022-06-06 10:02:02 +03:00
Yair Morgenstern
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)"
This reverts commit e91c0ff212.
2022-06-06 09:59:21 +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
OptimizedForDensity
1312140793
More rankings & demographics screen icons (#7063)
* Add icons to demographics/rankings screen

* Unused import

* Some simplification

* Reviews

* Undelete atlas
2022-06-06 09:33:34 +03:00
SomeTroglodyte
e91c0ff212
Moddable prettier Tutorials - Step 1 (#7064) 2022-06-06 09:32:23 +03:00
alexban011
6c990b67e2
spectators can no longer move and attack with units after selecting them (#7062)
* less power for spectators

* better formatting
2022-06-06 09:32:02 +03:00
OptimizedForDensity
7ae54aceb1
Fix medic promotion healing enemies (#7074) 2022-06-06 09:30:38 +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
Jack Rainy
862f368075
Bugfixes to the units' teleportation (#7071)
* Allow to pass other units when teleporting

* Teleport to the closest city tile

* Additional unit tests
2022-06-05 23:17:59 +03:00
OptimizedForDensity
97b2b56956
Fix amphibious promotion (#7070) 2022-06-05 17:22:50 +02:00
Timo T
868e551ba9
Fix test logging not using format specifiers for arbitrary text (#7073) 2022-06-05 16:57:16 +02:00
alexban011
a7e8b1a252
Translated notifications into Romanian (#7045) 2022-06-04 15:31:42 +02:00
OptimizedForDensity
14f85e7c33
AI always uses great prophets if it has one & fixes them standing around in enemy land tiles (#7040) 2022-06-04 15:12:24 +02:00
Timo T
22c8b033c9
Fix editor zoom in (#7047) 2022-06-02 16:51:18 +03:00
SomeTroglodyte
7df71571dc
Prevent senseless BattleTable display and fix right-click issues (#7003) 2022-06-02 15:32:09 +02:00
SomeTroglodyte
cdeabd044d
MainMenu Background Map scaled to Screen and minor MapGen fixes (#7000)
* MapGenerator fixes

* MainMenu Background Map scaled to Screen

* MainMenu Background Map scaled to Screen - groupSize as public const
2022-06-02 08:57:33 +03:00
The Bucketeer
56f11ccdca
HexaRealm tileset update (#7017)
* Delete Oil WellC.png

Since now offshore platform is back again, the "coastal" oil rig is obsolete now.

* Adding spaceship parts sprites for FantasyHex tileset

* Add files via upload

* Add files via upload
2022-06-02 08:49:09 +03: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
12674ed69e
Fix aircraft disappearing when their carrier is teleported (#7035)
* Fix carrier teleporting without moving airplanes

* Unit test to ensure aircraft and carriers are teleported togother

* Fix other cases where teleportation may occur

* Simplify unit test condition

* Update linting and move return condition

* Allow override for teleporting transported units

* Make sure test catches if transported units get deleted

* Reviews
2022-06-01 22:28:11 +03:00
SomeTroglodyte
02226018fa
Fix Pixel unit nation colors after combat (#7033)
* Fix Pixel Unit national colors reverting to white after battle

* A little linting on top

A little linting on top
2022-06-01 22:26:56 +03:00
Timo T
068e1587bc
Improve performance of worldmap panning (#7034)
* Refactor: change CrashHandlingStage to UncivStage

* Add possibility to disable pointer enter exit events temporarily

* Disable pointer enter/exit events and TileGroupMap.act while panning

* Change ZoomableScrollPane to be self-contained and reduce coupling
2022-06-01 22:26:24 +03:00
Timo T
1abc65163d
Fix multiplayer sometimes duplicating games (#6999)
* Fix multiplayer sometimes duplicating games

* Fix test compilation
2022-06-01 22:24:44 +03:00
haimlm
51e3349ecc
Added running unciv in docker (#7031) 2022-06-01 22:21:56 +03:00