Commit Graph

7284 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Joan Josep
a17797a709
Add Catalan translation and provide some strings. (#6992) 2022-05-29 16:50:47 +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
SomeTroglodyte
1731e8aa44
Fix incorrect attribution (#6978) 2022-05-28 22:54:44 +03:00
alexban011
7db4806274
Fix GitHub markdown of crash report save game (#6986) 2022-05-28 01:20:52 +02:00