wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3250 commits 7 branches 304 tags 288 MiB
Commit graph

3250 commits

This branch
This branch
All branches
Author SHA1 Message Date
JackRainy
7577655264
Nuclear missile is able to target any tile within the range (#1801) 
* Minor refactoring

* Refactoring: special function Battle.nuke() for missiles

* Special BattleTable.simulateNuke() function for missiles

* Refactoring: BugReport popup moved into a separate function

* Refactoring: call defaults().pad once in the init()

* Refactoring: not using "syntax sugar"
 2020-01-31 14:09:55 +02:00
lyrjie
0888e0a24d
Rewritten the MapUnit.rankTileForHealing() (#1811) 2020-01-31 14:04:44 +02:00
lyrjie
3362c2128c
Fix: notification when city-states advance to a new era (#1813) 
* Fix: notification when city-states advance to a new era

* Replaced forEach with for, according with code standards
 2020-01-31 14:03:21 +02:00
JackRainy
a728da6a2a
Fix: do not trim the text in the statistics screen (#1810) 2020-01-31 07:50:51 +02:00
Yair Morgenstern
e69f092d3a 3.5.8 2020-01-30 21:03:03 +02:00
Yair Morgenstern
3214bfbbfa
Translations update (#1809) 
* Update Turkish.properties (#1799)

* Update German.properties (#1807)

* Improved translations for Ukrainian and russian languages (#1802)

* Chinese translation update. delete some old code about "Scientific Revolution" because its effort has changed. (#1805)

Co-authored-by: lyrjie <lyrjie@gmail.com>

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: lyrjie <lyrjie@gmail.com>
 2020-01-30 20:33:19 +02:00
Yair Morgenstern
1119968f59 Resolved #1808 - Disabled declaration of friendship 2020-01-30 20:16:05 +02:00
Yair Morgenstern
c2eac14b3a Solved ANR when waiting for the list of maps 2020-01-30 19:40:01 +02:00
Yair Morgenstern
375c39c61e Fixed crash in city-state influence notification 2020-01-30 19:17:12 +02:00
Yair Morgenstern
b29813b389 Improved queue functionality readability 2020-01-29 22:25:21 +02:00
Yair Morgenstern
267c98be55 Resolved #1757 - Can now see version when running from a desktop Jar 2020-01-29 21:45:44 +02:00
lyrjie
5e264a7e62 City state influence lower limit (#1798) 2020-01-28 13:01:11 +02:00
Federico Luongo
ea29f91519 Fix buy current construction (#1794) 2020-01-27 23:59:40 +02:00
Yair Morgenstern
d22b3acbb3 3.5.7 2020-01-27 22:59:39 +02:00
stoupa007
12780afde4 Update Czech.properties (#1793) 
Translated missing texts (production queue, spain, natural wonders, diplomacy, events), some typo fixes and improvements.
 2020-01-27 22:55:45 +02:00
Smashfanful
f4727bf02b Update Italian.properties (#1790) 
Also preparing for the Mongolian units
 2020-01-27 22:08:38 +02:00
rayray61
4861f499b8 Update Turkish.properties (#1791) 2020-01-27 22:08:10 +02:00
Freshy
057e933114 Small corrects (#1792) 2020-01-27 22:07:56 +02:00
Teague Lander
ac8a1f144b Add specialist slot tooltip for buildings that provide them (#1776) 
* Add specialist slot tooltip for buildings that provide them
 - #1762

* Remove duplicate translations
 2020-01-27 08:33:10 +02:00
Timo T
d3d8933bbf Fix popups (#1784) 
* Fix community popup not opening

Fixes a regression in b95844d2f4. This commit refactored popups and it was thought that the "screen has popup -> don't show popup" was correct for all popups. That assumption was incorrect, the community popup was not opening anymore as well as the game menu popups (editor and normal game) could not be opened over other popups anymore.

This commit fixes that by introducing a queue for popups. When you try to open a popup and one is already open, the popup you tried to open only gets shown when the popup that was already open is closed. This can be manually overridden with a calling the `open` method with a `(force = true)` argument.

Also, all popups are now and should be opened and closed only with their `open()` and `close()` methods to ensure this behavior works.

* Refactor: Remove all open() methods from popup constructors

While it may be a little less to type, it should be up to the caller to decide to open a popup over other popups (via the `force = true` parameter) or not. This is not possible if a popup is opened automatically within its constructor, which is why that is the wrong place to open the popup-
 2020-01-27 08:32:16 +02:00
Yair Morgenstern
de1be0f6ee Forgot to test run =/ welp 2020-01-27 00:19:52 +02:00
Yair Morgenstern
cc764426e5 Added Marathon speed per user request 2020-01-27 00:11:28 +02:00
Yair Morgenstern
f1fb8aea18 Added Marathon speed per user request 2020-01-27 00:11:01 +02:00
Yair Morgenstern
daa3c8fcec Resolved #1782 - air units are no longer sent to join non-transporting units exiting the city 
Transportation logic cleanup
 2020-01-27 00:04:45 +02:00
stoupa007
7b5e1e3cbf Update Czech.properties (#1783) 
Fixed some most glaring typos.
 2020-01-26 22:55:49 +02:00
ltrcao
563e1f2527 Added quick access to diplomacy screen with other civilizations by tapping on their city buttons. (#1774) 
Implemented with @Azzurite's suggestions to match the button's behavior with the player's own city buttons:
* First tap slides the city button down so that the underlying tile is visible.
* Second tap on the button presents the diplomacy screen focused on the city's owner civ.
 2020-01-26 21:40:38 +02:00
Freshy
24520aa00c Completed translation (#1780) 2020-01-26 21:29:31 +02:00
rayray61
7c441e8e48 Update Turkish.properties (#1777) 2020-01-26 21:29:17 +02:00
The Bucketeer
9dded56813 Trad. Chinese Translation update (#1778) 
Added all current missing translations, as well, some edits on some translations. (•ω•)

(by GeneralWadaling/ The Bucketeer)
 2020-01-26 21:29:02 +02:00
Smashfanful
84b822aaac Update Nations.json (#1770) 
* Update Nations.json

Added Lhasa, Vancouver, M'Banza-Kongo and Mogadishu

* Update Nations.json
 2020-01-26 21:26:47 +02:00
Yair Morgenstern
7339c43c0d CivilizationInfo.getUnits is now a sequence, for better performance throughout 2020-01-26 21:22:58 +02:00
Federico Luongo
66b5263509 Fix Latitude (#1781) 
* Fix Latitude

* Code de-duplication
 2020-01-26 21:00:39 +02:00
Yair Morgenstern
67bc2231b9 Fixed anti air units intercept range 2020-01-26 20:59:16 +02:00
Teague Lander
30a50a8c6b Add missing Forge and Seaport production bonus uniques (#1773) 
* Add missing Forge and Seaport production bonus uniques
 Parital fix for #1762
 - Forge gets "+15% production of land units"
 - Seaport gets "+15% production of naval units"

* Adds missing translation "+15% production of land units"
 2020-01-26 20:17:26 +02:00
Yair Morgenstern
5a6b5e5db3 Simplified research agreement logic 2020-01-25 21:21:06 +02:00
Federico Luongo
925f3267ad Discrete rendering (#1768) 
* Re-introduced Discrete Rendering as an opt-in feature

* Persistent settings change
 2020-01-25 20:56:48 +02:00
Yair Morgenstern
ae8fdb3b7d "Must be within 2 spaces of mountain" for Neuschwanstein and Macchu Pichu - #1762 2020-01-25 20:35:33 +02:00
Yair Morgenstern
ed222a7839 Translation template fixes 2020-01-25 20:31:35 +02:00
Yair Morgenstern
f0372ea9ec 3.5.6 2020-01-25 20:28:30 +02:00
CaptainKlutz
a2ee0ca4e1 Rework existing ship sprites, and add a sprite for Carrier (#1771) 
* Upload carrier FH sprite

* Update Battleship and Destroyer FH sprites

* Make unfarmed wheat look wilder
 2020-01-25 19:58:57 +02:00
Coruna
0bcd213c3f Update German.properties (#1772) 2020-01-25 19:52:17 +02:00
Smashfanful
cbc92a753c Update Italian.properties (#1769) 2020-01-25 19:52:04 +02:00
rayray61
4bbc8fe08f Update Turkish.properties (#1765) 2020-01-25 19:51:51 +02:00
Federico Luongo
59e815c30e Fix turns to construction (#1767) 
Fix #1759: the stored production is used only for the first construction of its kind in the construction queue
 2020-01-25 19:50:43 +02:00
Marerjh
8469956f91 Update Ukrainian.properties (#1761) 
* Update Ukrainian.properties

* Update template.properties

* Update Ukrainian.properties

* Update ConstructionsTable.kt

* Update CityInfoTable.kt

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-25 19:47:38 +02:00
armandberger
d39b255b54 new french translations (#1760) 2020-01-25 19:46:06 +02:00
tianshidoubi
b3e95cb115 Update Simplified_Chinese.properties (#1756) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-25 19:45:47 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754) 
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
 2020-01-25 19:43:53 +02:00
lyrjie
b21fdc6c37 Fix: being able to acquire another player's tiles in multiplayer (#1766) 2020-01-25 19:40:47 +02:00
Yair Morgenstern
e9a6fd86f9 Added 'mountain within 2 tiles' restriction to Machu Picchu as per #1762 2020-01-23 23:44:25 +02:00