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

3434 commits

This branch
This branch
All branches
Author SHA1 Message Date
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909) 
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
 2020-03-11 11:39:37 +02:00
Jack Rainy
15098d877c
Translations refactoring (#2096) 
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
 2020-03-10 10:17:05 +02:00
Yair Morgenstern
c0414db381 Several users have stated that the Unciv standalone doesn't really work in Windows 32 bt, so I'm removing it from the releases to reflect that 2020-03-10 10:06:40 +02:00
Yair Morgenstern
30a2eda15f UnitTable no longer scrolls when unnecessary 2020-03-09 22:13:47 +02:00
Jack Rainy
13def8739e
Corrections according to #2101 (#2105) 
* College requires Phylosophy

* "Police State" influences the courthouses, not culture borders

* "Autocracy complete" has +20 attack effect

* Translations updates
 2020-03-09 00:00:32 +02:00
Jack Rainy
f769d60826
Do not recreate the window (#2107) 2020-03-08 23:58:32 +02:00
Federico Luongo
0cf27789e9
Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00
Yair Morgenstern
61565c0ee6 Reverted the UnitActions to the old setup (the new sequence yield was unnecesarily confusing), 
but kept the merge of canAct and the null action and taking specific actions when necessary and not the entire list
 2020-03-08 00:24:19 +02:00
Yair Morgenstern
db6031da82 Starting locations work again =) 2020-03-07 23:06:34 +02:00
Nico
58f7e06b72
Moving unique abilities to an Enum (#2095) 
* Unique abilities moved to enums

* remove diplomatic victory type WIP

* Address review comments. Translations for unique abilities names aren't used anywhere as far as I can tell, but added them to relevant translation files just in case.

Co-authored-by: nmeze <nicolas.mezeret@gmail.com>
 2020-03-07 22:22:20 +02:00
Yair Morgenstern
2bc590d5b5 Fixed number of strategic resources 2020-03-07 22:07:42 +02:00
Federico Luongo
296936ae53
Fix/city buy sell exploits (#2094) 
* Fix erroneous removal from queue

* Buy/Sell popups disable respective button and force closure of other popups
 2020-03-07 20:04:27 +02:00
Yair Morgenstern
ccc5c5ee84 3.6.6 2020-03-06 16:18:00 +02:00
Yair Morgenstern
54a29e28bc
Translations (#2091) 
* 2 new french translations (#2078)

* Update German.properties (#2079)

Refined a few translations I stumbled upon in-game

* Update Japanese.properties (#2082)

* Added german translations (#2084)

Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>

* Updates

Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Marmo <5788516+Marmo@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>
 2020-03-06 16:14:09 +02:00
GGGuenni
80ca06afbe
ResponsePopup is now working like intended (#2089) 2020-03-06 16:05:42 +02:00
JackRainy
73e8b718ab
Keshiks are ranged units (#2087) 2020-03-06 10:33:08 +02:00
JackRainy
0df1907383
Distinct color for Korea (#2085) 2020-03-06 10:31:48 +02:00
JackRainy
e12f35660f
Revert close buttons + usability improvement (#2088) 
* Revert changes to the Close buttons from PR #2069

* Better sensivity of diplomacy buttons
 2020-03-06 10:31:23 +02:00
Yair Morgenstern
585ec2b723 Water units can no longer see over hills etc. 2020-03-05 23:37:58 +02:00
Yair Morgenstern
5117a498f9 Resolved #2040 - Moved the turn counter on the top bar to the second level, to even out both levels 2020-03-05 23:29:42 +02:00
Yair Morgenstern
8ab7f7ae50 Adding the unsigned apk (which doesn't seem to work out-of-the-box for most players) was causing confusion and more harm than good 2020-03-05 23:12:54 +02:00
Yair Morgenstern
978f5bda53 Resolved #2074 - Fixed domination victory 2020-03-05 23:01:39 +02:00
Yair Morgenstern
7bd0365a8e
Issue#2019 (#2051) 
* Issue#2019
Player should not be able to nuke a civilsation that it has a peace treaty with

* wordlscreen is updated when notification shown (#2019)

* Fixed PR comments #2019

* issue #2019

* Fixed PR comments #2019

* Fixed PR comments #2019

* Fixed PR comments #2019
refactoring

* Fixed PR comments #2019
removed unnecessary line
 2020-03-05 22:50:23 +02:00
Yair Morgenstern
82ab66ad05 Ranking by culture is by number of adopted policies 2020-03-05 22:28:51 +02:00
Yair Morgenstern
955dff89b9
fix research agreement button. (#2080) 2020-03-04 20:13:15 +02:00
Yair Morgenstern
97a07d3530 Resolved #2071 - AI will wait 20 turns between proposing research agreements if declined 2020-03-03 23:05:56 +02:00
Yair Morgenstern
2cf5645629 3.6.5 2020-03-03 22:04:38 +02:00
Yair Morgenstern
14853547dc
Translations (#2073) 
* Update Italian.properties (#2050)

* Update Polish.properties (#2058)

* Update Russian.properties (#2061)

* Update Czech.properties (#2068)

* Updates

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: l3sy <61739053+l3sy@users.noreply.github.com>
 2020-03-03 22:02:05 +02:00
Yair Morgenstern
86576e25ae Fixed crash when diplomacy values change while ending the turn 2020-03-03 21:45:39 +02:00
Yair Morgenstern
163d4ad347 Ah welp 
Good thing the tests caught it =)
 2020-03-03 20:34:54 +02:00
Yair Morgenstern
1acf337d55 Resolved #2055 - cities bombard melee units once again 
Basically undid the change from #1993 and prettified a bit
@Kentalot
 2020-03-03 20:18:38 +02:00
Yair Morgenstern
a493661aad Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-03 20:09:52 +02:00
Yair Morgenstern
27b9c93d6f Resolved #2035 - Strategic resources are affected by map generation parameters 2020-03-03 20:09:40 +02:00
lishaoxia1985
95354964ba
some UI update. (#2069) 2020-03-03 19:54:20 +02:00
Yair Morgenstern
8a9bbf4154 City state diplomacy screen cleanup 2020-03-03 17:43:07 +02:00
Yair Morgenstern
9721fb66c0 Resolved #2033 - happiness from tiles is always considered correctly in regards to food consumption 2020-03-03 17:25:30 +02:00
Vladimir Tanakov
78dab67257
[2065] Fix issue when unit can sleep while fortification (#2067) 2020-03-03 14:23:01 +02:00
Yair Morgenstern
f7a010f10e 3.6.4-patch1 2020-03-02 22:30:07 +02:00
Yair Morgenstern
14516a3f90 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-02 22:18:51 +02:00
lishaoxia1985
fc9de6f7fb
Fix that when great person creates great improvement great person doesn't disappear. (#2062) 2020-03-02 18:12:17 +02:00
wrov
1df0c408aa
Fixed Multiplayer Turn Notifier periodically failing with error notification. (#2054) 2020-03-02 06:44:53 +02:00
Yair Morgenstern
7b5e59292e 3.6.4 2020-03-01 23:46:11 +02:00
Yair Morgenstern
10b95c6c1c
Translations (#2049) 
* Holy crswd (#2031)

HAHAA

* Update Japanese.properties (#2034)

* Translation updates

Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2020-03-01 23:30:54 +02:00
JackRainy
eb9d2b1178
Translations update (#2047) 2020-03-01 23:17:24 +02:00
JackRainy
8cae2fb125
Include Nations in the calculation of a translation`s percentage (#2044) 
* Include Nations in the calculation of a translation`s percentage

* Refactoring: Parameter renaming

* Check for empty originals
 2020-03-01 23:10:43 +02:00
lishaoxia1985
47065e0384
modify Eiffel Tower effect. translation update. (#1955) 2020-03-01 22:25:59 +02:00
JackRainy
24e4d77453
Civilization rankings (Richest, Strongest, Most Fertile, Largest, etc.) (#2036) 
* Initial preparations

* Moving to the separate package

* Calculation and visualization

* Translations

* Using a local function instead of additional class

* Using a local function instead of additional class (part 2)

* Rankings French.properties

* Fixup of the leftover

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
 2020-02-29 20:48:55 +02:00
Giuseppe D'Addio
b9682b0c80
Update Nations.json (#2028) 2020-02-29 20:11:55 +02:00
JackRainy
241ce8b4f6
Make the test actually works (#2043) 
* Make the test actually works

* Fix of Nations_German.json file
 2020-02-29 20:10:55 +02:00
JackRainy
9fbd569e1f
Allow to buy buildings from the queue (#2032) 
* Allow to buy buildings from the queue

* Minor refactoring
 2020-02-29 20:10:24 +02:00