Commit Graph

4751 Commits

Author SHA1 Message Date
4633462884 Condiional fixes 2022-06-14 20:47:12 +03:00
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
cac616a97b Fix spectator's fog of war toggle (#7130) 2022-06-14 20:32:36 +03:00
90bdcf9329 Fix scroll to wonder in the map editor (#7154)
* Fix scroll to wonder in the map editor

* Fix blink always happening
2022-06-14 20:32:06 +03:00
c3268126ee Fix unit being captured two times (#7141) 2022-06-14 20:31:47 +03:00
9ffd9b817b Do not enter the city while performing an air strikes sequence (#7148) 2022-06-14 13:42:53 +02:00
ed922b182d Improvements to AI military unit usage (#7147)
* Add more opportunities for AI units to attack
2022-06-14 13:34:24 +02:00
9ac019caea Prevent AI from sending a second peace treaty (#7150) 2022-06-14 01:06:29 +02:00
46b1516159 Fixed translation order 2022-06-13 22:22:52 +03:00
86f2560d7e Added test for branches which require missing eras 2022-06-13 21:39:57 +03:00
5506ad2cd4 Fix anchor link 2022-06-12 21:28:09 +02:00
4da1d442e4 Fix NPE in Nation selection & editor mods popup (#7144) 2022-06-12 18:10:03 +02:00
dc16bba983 Add more extensive multiplayer documentation 2022-06-12 12:55:39 +02:00
9bd8750739 Refactor: Consistent & correct usage of coroutines (#7077)
* Refactor: Consistent usage of coroutines

* Add usage comments to the different threads

* Refactor: Properly separate crash handling into its platform-specific parts

* Fix autoSave never finishing

* Correctly handle coroutines when the GL thread is not accepting runnables anymore

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-12 00:13:49 +03:00
9008d242a3 Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type (#7114)
* Refactor: Make Popups work on Stages instead of BaseScreens

* Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type

* Fix "Resume" game loading not fully handling exceptions

* Fix one missed refactoring

* Refactor: remove useless postRunnable
2022-06-11 22:14:44 +03:00
72b197fdc3 Stop AI puppets from building settlers and military (#7129)
* Stop puppeted cities from building settlers and military

* Move puppet check to function
2022-06-11 22:14:24 +03:00
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +03:00
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
9918353c66 Fix crash during next turn automation (#7125) 2022-06-10 16:44:02 +03:00
55ed226608 disable worldWrap if its disabled in settings (#7123) 2022-06-10 15:48:51 +03:00
5cd992a076 Resolved #7111 - Peace cooldown with city-states 2022-06-09 19:51:08 +03:00
538b7b8e7d refactor: Simplified city-state war declaration 2022-06-09 19:33:14 +03:00
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
6c463797d8 Resolves #7080 - tileFilter matches resource name and uniques 2022-06-08 19:52:45 +03:00
b15e949a33 Resolves #7103 - mapholder size reset after resize 2022-06-08 19:40:41 +03:00
b79246ee02 Certain projects cannot be hurried by great engineer (#7076) 2022-06-08 10:20:45 +03:00
207cba0844 Fix scout not upgrading through ruins (#7091) 2022-06-08 10:19:42 +03:00
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
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
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
e5d8de6b58 Resolved crashes when centering on a city-state with no cities 2022-06-07 23:31:22 +03:00
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
f5317eb53b Prevent duplicate ruin reward (#7085) 2022-06-06 22:34:23 +03:00
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)"
This reverts commit e91c0ff212.
2022-06-06 09:59:21 +03:00
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
e91c0ff212 Moddable prettier Tutorials - Step 1 (#7064) 2022-06-06 09:32:23 +03:00
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
7ae54aceb1 Fix medic promotion healing enemies (#7074) 2022-06-06 09:30:38 +03:00
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
13da7c1b9e Better friends list UI (#7054) 2022-06-06 03:02:45 +02:00
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
97b2b56956 Fix amphibious promotion (#7070) 2022-06-05 17:22:50 +02:00
868e551ba9 Fix test logging not using format specifiers for arbitrary text (#7073) 2022-06-05 16:57:16 +02:00
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
22c8b033c9 Fix editor zoom in (#7047) 2022-06-02 16:51:18 +03:00
7df71571dc Prevent senseless BattleTable display and fix right-click issues (#7003) 2022-06-02 15:32:09 +02:00
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
8fbcad47a4 4.1.6 2022-06-01 22:54:14 +03:00
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
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