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
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
Yair Morgenstern
e2c435d36f Fixed bug where air units in transports couldn't upgrade 2020-02-08 21:13:03 +02:00
lyrjie
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
Federico Luongo
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
JackRainy
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
Yair Morgenstern
f8f44320ae Resolved #1859 - skip defeated players' turns in multiplayer 2020-02-06 22:51:26 +02:00
Yair Morgenstern
61471683fc 3.5.11 2020-02-06 22:38:25 +02:00
Yair Morgenstern
5ee882c20d
Translations (#1863) 
* Add japanese translations (#1854)

* Terrains, Resources, Units japanese translate.

* Add some translate.

* Add technology translation.

* Update Japanese.properties (#1860)

* Update Japanese.properties

Second half

* Update Japanese.properties

* Update Japanese.properties

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

* Create Nations_Japanese.json, and add translation a little (#1861)

* Update German.properties (#1862)

Added technology quotes and revised translation

* Autocleanup

Co-authored-by: pekomiya <hongu.yk@gmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
 2020-02-06 22:35:13 +02:00
Yair Morgenstern
3d18a2aa0a Automated workers now build unique improvements 2020-02-06 22:21:58 +02:00
Yair Morgenstern
20a7ff7c76 Organized 'explore' actions 2020-02-05 23:30:37 +02:00
Federico Luongo
6fc3b2fd0e
Bugfix: Request rendering on New Game creation and Game Save (#1857) 
* Request rendering on New Game creation and Game Save

* setWorldScreen issues a rendering request
 2020-02-05 23:04:52 +02:00
Yair Morgenstern
193ebe0ccd Resolved #1852 - buildings requiring an improved resource now accept resources with great improvements 2020-02-05 22:21:57 +02:00
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