9f0e74be1f
Display the current amount of gold in the prompt dialog ( #1995 )
2020-02-23 11:25:11 +02:00
eb0fd17d9b
Fix of the click on unknown civilization ( #1989 )
...
* Fix of the click on unknown civilization
* Minor optimization
* Better naming of variable
2020-02-22 23:10:52 +02:00
13d50f250c
Resolved #1982 - Can now pic civ-equivalent Great People in great person picker screen
2020-02-22 23:10:04 +02:00
ebe9826b22
Better handling of disband and destroy of carrier with planes ( #1992 )
2020-02-22 22:32:54 +02:00
cff7435841
Better alignment for "Pick now!" in the pickerscreens ( #1984 )
2020-02-22 22:30:27 +02:00
aeee5e22eb
Sort the cities by food, production, etc. ( #1979 )
2020-02-21 11:49:55 +02:00
43918a2580
Resolved #1962 - set a max zoom level so that "infinite zoom" from capacative scrolling is no longer irrecoverable
2020-02-19 22:34:53 +02:00
8733f02f85
Bug Fix for Multiplayer Screen ( #1970 )
...
* Possible Bug Fix
Testing if clipboard content == null
This should have been a problem before
* Moved null check into addMultiplayerGame
making it more readable
2020-02-19 14:31:46 +02:00
cf84f5a0b5
Small bug fixes ( #1968 )
...
* Fixed access to unitialized variable
Fixed possible concurrency issue (long has visibility issues)
https://github.com/yairm210/Unciv/issues/1680
* Added comments
https://github.com/yairm210/Unciv/issues/1680
2020-02-19 13:18:40 +02:00
094f72dd26
The Future Tech can't be picked as a free technology until requirements are met ( #1967 )
2020-02-19 08:25:35 +02:00
8f757e9ab4
Fixes Issue #1697 by adding information to the special production con… ( #1965 )
...
* Fixes Issue #1697 by adding information to the special production constructions.
* Get rid of extra $ sign in the SpecialConstruction tooltips
2020-02-18 22:38:14 +02:00
65e1c90e28
Resolved #1963 - can now unautomate embarked workers
2020-02-18 17:25:59 +02:00
0b7a64db16
Switched persistent turn notification to false for pre-Oreo Android phones, as they may display an annoying icon in status bar. ( #1957 )
...
Fixed potential hanging notifier service due to not resetting error counter.
https://github.com/yairm210/Unciv/issues/1680
2020-02-17 20:57:04 +02:00
4004c6ff76
Translation ( #1951 )
...
* Update Polish.properties (#1931 )
* Update Russian.properties (#1932 )
* Update Italian.properties (#1933 )
Also added Research Agreement
* Update Japanese.properties (#1942 )
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Translations update (#1943 )
* Translations update
* Render some missing characters in the Ukrainian translations
* More translations
* Fixed typo: Otto von Bismark -> Otto von Bismarck (#1954 )
* Translation updates, added test to assure that translations in template file end with a space
* Disabled Maven - hopefully Travis check will not take 10 minutes and will pass
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com >
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com >
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com >
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com >
Co-authored-by: schnippl0r <58435847+schnippl0r@users.noreply.github.com >
2020-02-17 19:38:14 +02:00
80997d157b
Reworked Multiplayer Screen ( #1952 )
...
* Added MultiplayerScreen
Added MultiplayerScreen Class to replace openMultiplayerPopup()
Added Sessionbrowser UI elements
* Added Session Browser functionality
* Added ResponsePopup
is used for "copy UserID" among others to be more responsive
* Added "Edit Session" and Help Button
Changed saving Multiplayer Session to seperate Folder
-TODO? Help Button chould be in every pickerscreen
* removed function for Turn Check
heard tobo is working on a Turn checker so no need for the function
* Added delete to editScreen + Cleanup and Comments
delete should be a "give up" instead
* creating new game as multiplayer now saves to multiplayer folder
+ gameId gets copied to clipboard
* Delete unintended save file
delete a save file which got falsely commited
* Added helpPopup Text and refresh Button
* Cleanup + Translation
* More Cleanup
Refresh List doesn't flicker anymore
Response PopUp time for new Game reduced
* Fixed Game crashing on reload
* Added Add Current Game
Games you don't know the gameID of can now be saved when running
* Added Translations entry
* adding requested changes
+ added addCurrentGameButton() for readability and to reduce indentation
- removed unnecessary returns
+ sequentialised try catch for better readability
+ added comments to responsePopup for better unstanding
* Adding requested indent changes
- removed all unnecessary indents
2020-02-17 18:37:15 +02:00
bc15d97de7
Added Multiplayer Turn Notification Service ( #1947 )
...
* Added Multiplayer Turn Notification Service
https://github.com/yairm210/Unciv/issues/1680
* Minor update on Credits.md (#1949 )
# Nations
- Fix typo on word "crescent"
- Fix link that flew off on word "sword"
* 3.5.14-patch1
* Edit startgame screen. (#1950 )
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com >
* Small improvements suggested in pull request review
https://github.com/yairm210/Unciv/pull/1947
* Removed potential concurrency hazzards caused by access to non-final variables. Added option to turn off persistent notification (may be necessary on pre-Oreo phones.)
Added suggested comments. https://github.com/yairm210/Unciv/pull/1947
* Fixed miscommited debug code. https://github.com/yairm210/Unciv/pull/1947
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com >
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com >
2020-02-17 18:34:46 +02:00
9d1e45de08
Edit startgame screen. ( #1950 )
...
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com >
2020-02-16 22:03:39 +02:00
a6765c0b72
Enable Polinesia worker to build regular improvements ( #1945 )
...
* Enable Polinesia worker to build regular improvements
* More short notation, similar to next line
* Revert "More short notation, similar to next line"
This reverts commit f97cc59fac
2020-02-15 21:54:09 +02:00
eb0f00dc72
The civilization whose area is nuked must declear a war ( #1941 )
2020-02-15 19:06:47 +02:00
cd3004fedb
Barbarians can be never defeated ( #1940 )
2020-02-15 19:05:57 +02:00
19cac1f7bf
Resolved #1930 - national wonders no longer require built buildings in puppeted cities
2020-02-14 14:32:13 +02:00
fa31704217
Resolved #1918 - added missing translations
2020-02-14 13:38:05 +02:00
99111df5c6
Resolved #1818 - Marble bonus now displayed in Civilopedia
2020-02-14 13:23:10 +02:00
efe200442a
Resolved #1927- changing new game parameters and exiting the new game screen doesn't change the current game's parameters
2020-02-14 13:15:30 +02:00
5117a9faa4
Resolved #1926 - fixed unique improvements
2020-02-14 13:01:10 +02:00
0143f6702d
Preview tile improvements ( #1711 ) ( #1919 )
...
* Refactoring: extracted "getImprovementStats" method
* Display the icons for added/removed resources
2020-02-13 09:21:36 +02:00
b6e2b72b5c
The size of minimap will change with resolution changing. ( #1922 )
2020-02-13 09:20:04 +02:00
3bfb2a29b7
Merge pull request #1903 from JackRainy/ForgeAndSpacePart
...
Forge increases production of the space parts (#1902 )
2020-02-12 23:17:39 +02:00
4ab084feeb
Forge increases production of spaceparts
2020-02-12 23:11:28 +02:00
5b845abc04
This reverts previous commit cb0a87681e.
2020-02-12 21:25:21 +02:00
aec539f77f
Fix tile yields in city screen
2020-02-12 19:39:32 +01:00
3402065e3c
Captured Khans now automate properly
2020-02-12 20:34:32 +02:00
d9d6f4eeb8
Minimap can show the whole worldscreen ( #1872 )
...
Saw the images you sent by email =)
2020-02-12 20:22:19 +02:00
ac1e5bb417
Minimap can show the whole worldscreen
2020-02-13 00:33:11 +08:00
b9e3ca5fd4
Legalism grants enqueued buildings ( #1906 )
2020-02-11 10:36:58 +02:00
cb0a87681e
Forge increases production of the space parts
2020-02-10 22:06:41 +02:00
942092e33e
Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource
2020-02-10 20:35:14 +02:00
a514e462cc
Cleaned up Unit Actions
2020-02-10 18:43:18 +02:00
14f89b6799
Fix: Moai being buildable on forests, etc. ( #1896 )
...
* Moved terrain.unbuildable check above moai coastal tile check
* Refactor
2020-02-10 11:32:59 +02:00
6d2cf860a7
Reset advanced settings to default ( #1894 )
...
* Reset to default
* Translations
2020-02-10 10:25:48 +02:00
86cd158d83
3.5.12
2020-02-09 20:44:52 +02:00
26affe7943
Translation ( #1878 )
...
* Update Nations_Italian.json (#1864 )
* Update Japanese.properties (#1867 )
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Thai.properties (#1871 )
I'm back!!
* Update German.properties (#1873 )
Revised promotions
* Update German.properties (#1874 )
added missing unit translations
* Update Italian.properties (#1875 )
Typo fix
* Update Nations_Russian.json (#1877 )
* rfe
* Update Nations_Russian.json
* Update Nations_Russian.json
* Update Russian.properties (#1876 )
* Translation roundup + added Mongolian civ translations
* Update Russian.properties (#1879 )
Mongolia update
* Additional translation strings related to the custom map settings (#1881 )
* Diplomacy screen: Secondary relationships line is added (#1880 )
* Additional translation strings
* Update Japanese.properties (#1883 )
* Update Japanese.properties
* Update Japanese.properties
* Update to Ukrainian translations + fix of the translation call (#1888 )
* Final touches before version
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com >
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com >
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com >
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com >
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com >
2020-02-09 20:29:34 +02:00
66ac364045
Center the research screen ( #1887 )
...
* Correct list of the researchable techs
* Center on the researchable technology
2020-02-09 20:16:34 +02:00
3f27bdb19e
Diplomacy screen: Secondary relationships line is added ( #1880 )
2020-02-08 21:58:03 +02:00
e2c435d36f
Fixed bug where air units in transports couldn't upgrade
2020-02-08 21:13:03 +02:00
096e1c2beb
Tied the unit upkeep scaling to game speed ( #1870 )
...
* Tied the unit upkeep scaling to game speed
* Refactor: Modifier and TurnLimit are now fields
* Turn limit will be derived from the GameSpeed.modifier and base game duration
2020-02-08 20:51:45 +02:00
edf0294dfd
Mongolia ( #1855 )
...
* Mongolia
* Translation & Atlas
* Remove debug option
* Remove erroneous import
* Promotions.addXP
* Khan heals 15 HP
* XP bonus fix
* Added 'Mongol Terror' which is the term used for the mongolian combat bonus
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
2020-02-08 20:51:21 +02:00
33de01961d
Improvements to the Diplomacy screen ( #1851 )
...
* Diplomacy overview window: Using full screen
* Different shades of friendship
* Show/hide the relations for the picked civilization
* Minor refactoring
* Optimized handling of lines visibility
2020-02-08 20:46:42 +02:00
f8f44320ae
Resolved #1859 - skip defeated players' turns in multiplayer
2020-02-06 22:51:26 +02:00
3d18a2aa0a
Automated workers now build unique improvements
2020-02-06 22:21:58 +02:00
