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

3287 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
7d72a0a789 3.5.14-patch1 2020-02-16 21:53:38 +02:00
JackRainy
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 f97cc59fac449dcddab7045761cfc1ceb8a900ce.
 2020-02-15 21:54:09 +02:00
JackRainy
eb0f00dc72
The civilization whose area is nuked must declear a war (#1941) 2020-02-15 19:06:47 +02:00
JackRainy
cd3004fedb
Barbarians can be never defeated (#1940) 2020-02-15 19:05:57 +02:00
Yair Morgenstern
19cac1f7bf Resolved #1930 - national wonders no longer require built buildings in puppeted cities 2020-02-14 14:32:13 +02:00
Yair Morgenstern
aa393c4eea 3.5.14 2020-02-14 14:04:11 +02:00
Yair Morgenstern
996010d662
Translations (#1929) 
* Trad. Chinese translation update! (#1910)

Adds all missing translation of v3.5.12 !

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Japanese.properties (#1920)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Polish.properties (#1921)

* update translation. (#1923)

* new french translation (#1928)

* Translation updates

Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
 2020-02-14 13:48:31 +02:00
Yair Morgenstern
fa31704217 Resolved #1918 - added missing translations 2020-02-14 13:38:05 +02:00
Yair Morgenstern
99111df5c6 Resolved #1818 - Marble bonus now displayed in Civilopedia 2020-02-14 13:23:10 +02:00
Yair Morgenstern
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
Yair Morgenstern
5117a9faa4 Resolved #1926 - fixed unique improvements 2020-02-14 13:01:10 +02:00
JackRainy
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
lishaoxia1985
b6e2b72b5c
The size of minimap will change with resolution changing. (#1922) 2020-02-13 09:20:04 +02:00
Yair Morgenstern
3bfb2a29b7
Merge pull request #1903 from JackRainy/ForgeAndSpacePart 
Forge increases production of the space parts (#1902)
 2020-02-12 23:17:39 +02:00
JackRainy
4ab084feeb
Forge increases production of spaceparts 2020-02-12 23:11:28 +02:00
JackRainy
5b845abc04
This reverts previous commit cb0a87681e. 2020-02-12 21:25:21 +02:00
Yair Morgenstern
acb9377d36
Merge pull request #1916 from r3versi/fix/city-screen-tile-yield 
Fix tile yields in city screen
 2020-02-12 21:19:36 +02:00
Yair Morgenstern
e2dfa7c04c 3.5.13 2020-02-12 21:05:44 +02:00
Yair Morgenstern
9d70a85ecc
Merge pull request #1917 from yairm210/translations 
Translations
 2020-02-12 21:03:54 +02:00
Yair Morgenstern
b898311032 Translation updates 2020-02-12 20:43:27 +02:00
r3versi
aec539f77f
Fix tile yields in city screen 2020-02-12 19:39:32 +01:00
Yair Morgenstern
3402065e3c Captured Khans now automate properly 2020-02-12 20:34:32 +02:00
Yair Morgenstern
d9d6f4eeb8
Minimap can show the whole worldscreen (#1872) 
Saw the images you sent by email =)
 2020-02-12 20:22:19 +02:00
Prosta4okua
d02b2214be
Update Nations_Ukrainian.json (#1915) 
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json
 2020-02-12 20:21:04 +02:00
TheLegend27
b09ad65dce
Update German.properties (#1914) 2020-02-12 20:20:52 +02:00
TheLegend27
32506f9b23
Update German.properties (#1913) 
* Cleaned up Unit Actions

* Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource

* Legalism grants enqueued buildings (#1906)

* Update German.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
 2020-02-12 20:20:34 +02:00
Yair Morgenstern
a0108a0c33 Merge remote-tracking branch 'origin/translations' into translations 2020-02-12 20:19:47 +02:00
Yair Morgenstern
4a51a3cbe0 Merge branch 'master' into translations 2020-02-12 20:19:03 +02:00
Smashfanful
e0d1109e77
Update Italian.properties (#1882) 
* Update Italian.properties

* Update Italian.properties
 2020-02-12 20:16:55 +02:00
YueR
ac1e5bb417 Minimap can show the whole worldscreen 2020-02-13 00:33:11 +08:00
Prosta4okua
6a1e70f100
Update Nations_Ukrainian.json (#1908) 
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Tutorials_Ukrainian.json

* Update Ukrainian.properties
 2020-02-11 21:43:38 +02:00
paontv
890c3aed29
Update Japanese.properties (#1904) 
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
 2020-02-11 15:31:57 +02:00
rayray61
9ee0c94bf5
Update Turkish.properties (#1907) 
* Cleaned up Unit Actions

* Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource

* Legalism grants enqueued buildings (#1906)

* Update Turkish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
 2020-02-11 15:31:25 +02:00
Federico Luongo
b9e3ca5fd4
Legalism grants enqueued buildings (#1906) 2020-02-11 10:36:58 +02:00
JackRainy
cb0a87681e
Forge increases production of the space parts 2020-02-10 22:06:41 +02:00
Yair Morgenstern
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
Yair Morgenstern
a514e462cc Cleaned up Unit Actions 2020-02-10 18:43:18 +02:00
IraqLobster34
b3824983a0
Update Russian.properties (#1899) 
* Update Russian.properties

Missing translations

* Update Russian.properties
 2020-02-10 18:28:22 +02:00
armandberger
9c3c7360d0
new french translation (#1898) 2020-02-10 18:27:53 +02:00
Prosta4okua
a5c9895ef5
Update Nations_Ukrainian.json (#1897) 
* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json
 2020-02-10 18:27:31 +02:00
Freshy
c2d29db09f
Completed and corrected translation (#1895) 2020-02-10 18:27:08 +02:00
paontv
7228d735c6
Update Japanese.properties (#1893) 
* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties
 2020-02-10 18:24:44 +02:00
Smashfanful
214730a71c
Update Italian.properties (#1890) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-02-10 18:24:17 +02:00
lyrjie
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
Federico Luongo
6d2cf860a7 Reset advanced settings to default (#1894) 
* Reset to default

* Translations
 2020-02-10 10:25:48 +02:00
Yair Morgenstern
86cd158d83 3.5.12 2020-02-09 20:44:52 +02:00
Yair Morgenstern
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
JackRainy
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
BeeWall
ddf86ecf2f
Add support for loading mods on Android (#1825) 
* Add support for loading mods

* Move mod folder copying into its own function

* Only request permission to read storage, not write

* Only allow mods on KK+ (removes storage permission)
 2020-02-09 10:28:31 +02:00
JackRainy
3f27bdb19e Diplomacy screen: Secondary relationships line is added (#1880) 2020-02-08 21:58:03 +02:00