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

3476 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
cb6ca058f3 Solved the 'infinite warmongering penalty' bug 2020-02-05 20:40:05 +02:00
Yair Morgenstern
c4a2a3055e Resolved #1844 - improved worker automation 2020-02-05 00:01:53 +02:00
Yair Morgenstern
1a2e69f4ae Resolved #1847 - Civs defeated by a nuke are now properly destroyed 2020-02-04 23:47:02 +02:00
Federico Luongo
d43afe38e6
Rectangular maps, maps generator, bugfixes (part 1) (#1843) 
* TileMap Rectangular constructor

* HexMath utilities

* Perlin gradients changed & utility function to combine octaves

* NewGame & MapParameters UI

* MapParameters & MapGenerator refactor

* Advanced Map Parameters UI

* Fix Hide advanced settings
 2020-02-04 23:30:35 +02:00
Yair Morgenstern
49086086ee 3.5.10 2020-02-04 23:28:32 +02:00
Yair Morgenstern
44777b8b30
Translations (#1848) 
* added some translations (#1832)

* new french translations (#1833)

* Completed translation (#1834)

* Update Italian.properties (#1840)

Also added a new translation line

* Update Ukrainian.properties (#1845)

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>

* rewrite

Co-authored-by: LeMoonStar <webmaster@unitcore.de>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-02-04 23:12:31 +02:00
Yair Morgenstern
eb1ce0f6cb Resolved #1457 - no AI trades are 'automatically accepted', they all require an active decision of the proposed side and will only happen on their turn 2020-02-04 16:13:37 +02:00
Yair Morgenstern
f6b8afc952 When disbanding carriers, transported air units move to nearby tiles if they can. If thy can't then they're disbanded. 2020-02-04 09:23:36 +02:00
Yair Morgenstern
7ac515ad6e If you're at war with someone, then 'please don't settle cities near us' is irrelevant 2020-02-04 09:20:45 +02:00
Yair Morgenstern
748168398e Resolved #1839 - Civs no longer declare war and offer things in the same turn 2020-02-04 09:10:17 +02:00
Yair Morgenstern
df68ff75f8 Resolved #1827 - can no longer see other (current) player's city production in multiplayer 2020-02-04 09:06:41 +02:00
Yair Morgenstern
0ace2e1c7a forgot this little thing 2020-02-03 16:48:32 +02:00
Yair Morgenstern
848637c78c Better top-down trickling of information instead of relying on UncivGame.Current info 2020-02-03 16:41:42 +02:00
Yair Morgenstern
76bda5bceb 3.5.9-patch1 2020-02-03 16:34:17 +02:00
Yair Morgenstern
0f26671bcf Resolved #1835 - game no longer crashes when losing alliance with a city-state due to it being captured 2020-02-03 16:24:10 +02:00
Yair Morgenstern
24c3bdc564 Fixed crashes caused by 'healing on friendly tile' checks to unmet civs for barbarians 2020-02-03 16:13:32 +02:00
Yair Morgenstern
a73fe3d9de Tile update by The Bucketeer 2020-02-02 18:31:45 +02:00
Yair Morgenstern
259321fe22 3.5.9 2020-02-02 18:04:38 +02:00
Yair Morgenstern
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
Yair Morgenstern
352e4e8939
Translation (#1829) 
* Update German.properties (#1819)

Added city states, some notifications and revised translations

* Update Czech.properties (#1824)

translated missing strings (carriers, settings, some miscellaneous items)
fixed naming of promotions to correct terminology (military) and synced with descriptions

* Update Italian.properties (#1815)

* Create Japanese.properties (#1803)

* Create Japanese.properties

* Update Japanese

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update

* 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 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

* Added Japanese flag icon

Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2020-02-02 16:23:20 +02:00
JackRainy
6df11f0a7f
Fix: Capturing the cities must not improve relations (#1828) 2020-02-02 16:07:15 +02:00
JackRainy
db5cc82ec7
"Sleep until healed" functionality (#1821) 
* "Sleep until healed" functionality

* Unit test for actions translations is added

* "Fortify until healed" functionality

* Refactoring
 2020-02-02 09:55:10 +02:00
ltrcao
0914750489
Show name when icon is tapped in resource overview in a label above the icon. (#1817) 2020-02-01 20:31:12 +02:00
Yair Morgenstern
261c3d6ced Resolved #1820 - Fixed a crashing bug with the AI trying to ally with defeated city states, as well as many other minor bugs 
All caused by the fact that getKnownCivs didn't filter out defeated civs
Also some minor code cleanup
 2020-02-01 20:26:27 +02:00
Yair Morgenstern
d7310aa90a typo fix withing -> within 2020-01-31 14:17:38 +02:00
lyrjie
58fa5d6dd5
Debug option: simulate game until certain turn (#1812) 2020-01-31 14:10:32 +02:00
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