Commit Graph

4718 Commits

Author SHA1 Message Date
Yair Morgenstern
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)"
This reverts commit e91c0ff212.
2022-06-06 09:59:21 +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
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
Yair Morgenstern
8fbcad47a4 4.1.6 2022-06-01 22:54:14 +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
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
Jack Rainy
cd9746560e
Autoassign the population when the manual assignment fails (#7028)
* Whitespaces "magic"

* Fallback to assign the worker automatically
2022-05-31 23:59:19 +03:00
SomeTroglodyte
8e5a9a3385
Small fix - the Civilopedia link for buildings from CityScreen lower right had regressed (#7030) 2022-05-31 23:58:11 +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
983a9b705e Resolved #7008 - Civs get *random* luxury resources near their starting location 2022-05-30 22:25:52 +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
SomeTroglodyte
69698e99ee
Reorder TileGroup layers to draw borders under Pixel Units (#6980)
* Reorder TileGroup layers to draw borders under Pixel Units

* Reorder TileGroup layers to draw borders under Pixel Units - reviews
2022-05-29 22:16:35 +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
alexban011
97ed9cd668
Disable state-changing buttons for puppet cities (#6975) 2022-05-29 19:53:15 +02:00
SomeTroglodyte
f1e3e1b094
Fix NextTurnButton lateinit crash (#6979) 2022-05-29 16:51:33 +02:00
OptimizedForDensity
09195d6b62
More UniqueType unit tests and correct some broken uniques in JSON files (#6965)
* Add ruin reward unique check plus fix broken unique
2022-05-29 16:08:15 +02:00
alexban011
ea31bd164f
Add optional on-screen buttons to zoom in and out (#6933) 2022-05-29 15:32:36 +02:00
alexban011
57c027dca5
Land melee units can only attack water units once they are able to embark (#6957) 2022-05-29 15:27:57 +02:00
itanasi
37d6233f5d
Dynamically adjust StatsTable height (#6990)
* Dynamically adjust StatsTable height

* redo Gradle?

* redo Gradle?

* Remive undeeded default

* Remove reduant init() line

* Make top portion fixed and lower section scroll
2022-05-29 08:46:35 +03:00
alexban011
b8f987d791
changed main menu world shape to rectangular (#6983)
* change to rectangular

* clean up
2022-05-29 04:51:15 +02:00
Yair Morgenstern
f613bba7d4 Better minimap buttons 2022-05-29 00:07:07 +03:00
alexban011
7db4806274
Fix GitHub markdown of crash report save game (#6986) 2022-05-28 01:20:52 +02:00
Timo T
3a03799074
Refactor: Extract all cross-platform code from CustomSaveLocationHelpers into core module (#6962)
* Also fixes the GameInfo.customSaveLocation to work for Android
2022-05-27 15:53:18 +02:00
itanasi
317e8c74df
Citizen Management as Expandable Tab (#6969)
* Add ScrollPane to CityStatsTable, limit to half screen height

* Reformat CitizenManagementTable to not have clashing background. Add Expander functionality
Remove button and Table from CityScreen
CitizenManagement added in CityStatsTable
Other cleanup

* Move Reset Citizens to within ExpanderTab

* Minor code format whitespace
2022-05-27 13:59:57 +03:00
itanasi
67065d766b
Make Locked Tiles workable, and thus clickable (#6966) 2022-05-27 13:55:51 +03:00
Yair Morgenstern
62dc05ee5c
AI counteroffers will no longer contain items already offered by the player for 'double declaration of war' etc (#6940) 2022-05-27 13:55:33 +03:00
alexban011
591c96b0c1
puppet cities only focus on gold (#6946)
* fixed issue

* cleanup

* puppets only like making gold

* fully revert file to master file

* Update CityInfo.kt
2022-05-27 13:52:23 +03:00
Timo T
214fae6f59
Add simple logging solution (#6952)
* Add simple logging solution

* Fix Android compilation

For some reason I stashed this and didn't unstash.

* Add better logging explanation
2022-05-27 13:45:13 +03:00
itanasi
e7a90f2ad0
Make so Citizen Management buttons don't work if Spectator (#6954) 2022-05-26 15:24:55 +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
SomeTroglodyte
e54fda5a4a
Resource supply list reorg (#6881)
* ResourceSupplyList reorg

* ResourceSupplyList reorg - instrumentation

* ResourceSupplyList reorg - map of maps

* ResourceSupplyList reorg - revert to ArrayList

* ResourceSupplyList reorg - review

* ResourceSupplyList reorg - review

* ResourceSupplyList reorg - almost-immutability
2022-05-25 19:42:51 +03:00
SomeTroglodyte
e1b76e776d
Fix floodfill abbreviation translation showing on fortify key tooltips (#6909)
* Fix floodfill abbreviation translation showing on fortify key tooltips

* Fix floodfill abbreviation translation - fix case

* Fix floodfill abbreviation translation - existing and comment
2022-05-25 19:39:08 +03:00
SomeTroglodyte
392a8d5de9
Re-hide Enable Portrait option on desktop (#6912)
* Re-hide Enable Portrait Option in desktop version

* MainMenu Background Map Job cancellable

* MainMenu Background Map generation cancellable

* MainMenu Background Map cancellable - remove instrumentation

* Revert "MainMenu Background Stuff"
2022-05-25 19:37:44 +03:00