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

3770 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
1adb19787a Removed the crutches for unit attack bugs - we want to figure them out! 2020-05-11 20:33:53 +03:00
Yair Morgenstern
3a2b8453d5 Solved ANR when loading game to display its metadata 2020-05-11 20:20:24 +03:00
Yair Morgenstern
c756014fec Added helper class GameSetupInfo - this will help us when setting up multiplayer games for transferring data from/to the server 2020-05-10 22:28:35 +03:00
Yair Morgenstern
b64391d767 Population assigned to tiles of other cities do not auto-unassign 2020-05-10 20:32:34 +03:00
Yair Morgenstern
f605a0c00f Settler automation takes into account which tiles already belong to other civs 2020-05-10 10:55:38 +03:00
Yair Morgenstern
b012fd0df8 Fixed "isWorked" not registering for tiles worked not by the owning city 2020-05-09 22:01:15 +03:00
Yair Morgenstern
6a7773730b New FantasyHex jungle and lake tiles 2020-05-08 17:48:09 +03:00
Yair Morgenstern
78b0b17e60 3.8.7 2020-05-08 14:37:15 +03:00
Yair Morgenstern
efb823c67d Optimized imports 2020-05-08 11:43:44 +03:00
uncivbot[bot]
a9f9685dc2
Translations update (#2600) 
* Update Romanian.properties (#2589)

* Translation/romanian (#2590)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Romanian translations

* Romanian translations

* Finalized Nations translations for Romanian

* romanian translations

Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>

* Update Brazilian_Portuguese.properties (#2591)

* Update Brazilian_Portuguese.properties

> Some fixes

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* German translations 2020-05-06 (#2593)

* German translations 2020-05-06

* Fix two missing tr() calls for User-ID-from-clipboard responses

* add translation to China , USA and Japan city (#2594)

* Update Italian.properties (#2597)

* UPDATE SPANISH (#2599)

I hope this could be useful. Regards.

Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: HI_OuO <45450852+zvn2060@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Rakyat02 <63031405+Rakyat02@users.noreply.github.com>
 2020-05-08 11:39:05 +03:00
Väinö Mäkelä
bba289627c
Remove gdx-box2d from build files because it isn't used (#2595) 
* Remove box2d from build files because it isn't used

* Remove some unused includes to make the build work
 2020-05-08 08:05:26 +03:00
Yair Morgenstern
b309cac67b Fadeout for potentially workable tiles currently being worked by another city 
Mint icon looks much nicer
 2020-05-07 13:04:25 +03:00
Yair Morgenstern
0eb79fff82 Resolved #2588 - instead of tile ownershp being transferrable between cities, cities can now work tiles belonging to other cities. 2020-05-06 23:37:02 +03:00
Yair Morgenstern
e0406ac708 3.8.6 2020-05-05 21:40:20 +03:00
Yair Morgenstern
c24b028c99 Differentiated between Portuguese and Brazilian Portuguese translations 2020-05-05 20:56:24 +03:00
uncivbot[bot]
7ebcdcda9b
Translations update (#2587) 
* Update Italian.properties (#2568)

* Update Portuguese.properties (#2569)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Korean.properties (#2571)

Huge translation update

Fix typo, Translate all but Tutorials.json, Terrains.json and some country information .

* Turkish translations (#2578)

Added many translations. Changed some of them with more accurate ones and corrected a couple of typos.

* 100% for French Translation (#2582)

1. Didn't changed nothing on the topic of "Should we use Capital Letter to highlight Games Variables or should we stick to regular grammar?". If an official statement comes in, will try to spend some time on this topic. It means that, right now, in some part of the game a word will be with capital letter, and sometimes not.
2. AFAIK, finished every translation. Even found some strings that were translated into English...
3. Question : I assumed the "NUKE" string is about sending a nuclear missile on a tile, correct ?
4. Lot more of typos and mistakes fixes (including lot of my owns, sorry guys).
5. IMHO, the description, even in English, for Burial Tomb makes no sense ("Doubles Gold given to enemy if city is captured = Double l'Or donné à un ennemi si une cité est capturée"). I guess it's "Doubles gold received when capturing enemy city" ? Nothing changed for the moment.
6. At some point, we could make this file more coherent, i.e. by applying always the same template ("+1 production" every time ; and not sometimes this, sometimes "Production increased by one", sometimes "Increasing production +1", etc.)
7. English and French are literally saying the opposite for Windmill : "Must not be on hill = Doit être sur une colline". I think French is right, you do need a hill. Correct ?

* Translations of new sentences in Polish. (#2583)

Co-authored-by: Adam Stańczak <astanczak@bbk.com.pl>

* Translations (#2581)

* Update Russian.properties (#2584)

Minor update

* Translation/romanian (#2585)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Romanian translations

Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: heogeon <akffod2525@gmail.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: snipe2004 <snipe2004@hotmail.com>
Co-authored-by: astan00 <astan00@gmail.com>
Co-authored-by: Adam Stańczak <astanczak@bbk.com.pl>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>
 2020-05-05 20:23:14 +03:00
Väinö Mäkelä
91c1e0ae6d
Fix the missing overlays caused by commit 0ffb038129 (#2586) 2020-05-05 20:15:13 +03:00
Jack Rainy
647a0c9ff7
Wait for autosave thread while closing (#2580) 2020-05-05 08:51:41 +03:00
SomeTroglodyte
9a5afced0d
One part of the options screen sticks out when using a near-100% non-English language :) (#2579) 2020-05-04 22:19:45 +03:00
SomeTroglodyte
a940eda4a9
Better Resource order in empire overview screen (#2577) 2020-05-04 22:10:24 +03:00
Yair Morgenstern
2b3a9c14bf Resolved #2576 - Clicking on "Encountering" notifications now move the map to the encounter location 2020-05-04 20:22:23 +03:00
Yair Morgenstern
7484d2c2cf
Update README.md 2020-05-04 17:25:45 +03:00
Yair Morgenstern
be34597810 Typo fixes: Ellis -> Elis, dependant -> dependent, agreeent -> agreement, recieve -> receive 
Kudos @SomeTroglodyte
 2020-05-04 17:06:55 +03:00
Väinö Mäkelä
0ffb038129
Don't call canReach on the main thread when selecting a tile to move to (#2575) 2020-05-04 17:01:53 +03:00
Yair Morgenstern
12c5b08b64 3.8.5 2020-05-03 22:07:17 +03:00
uncivbot[bot]
2bc52e756f
Translations update (#2567) 
* Translation/romanian (#2563)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Update Portuguese.properties (#2565)

* Civilopedia missing strings  (#2564)

* Civilopedia missing strings

* Lost translations from #2539

* Add some polish translations, fix typos (#2566)

Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Michał Iwańczuk <miwanczuk7@gmail.com>
 2020-05-03 22:01:14 +03:00
Yair Morgenstern
d828fdaeca Maps no longer spawn ancient ruins in immediate vicinity of civ spawns 2020-05-03 21:45:23 +03:00
Yair Morgenstern
ad7d7fba60 Added missing Romanian characters 2020-05-03 20:39:08 +03:00
Yair Morgenstern
9397f3608c Fixed thread crashes due to concurrent actor changes in multiplayer update popups 2020-05-03 19:11:07 +03:00
uncivbot[bot]
b42c8672e1
Translations update (#2562) 
* Update Simplified_Chinese.properties (#2545)

* Update Romanian.properties (#2546)

* Update Russian.properties (#2547)

* Update Russian.properties

Tutorial error correction

* Update Russian.properties

Небольшие правки в Tutorial и Tutorial tasks.

* Update Russian.properties

Nations, City-states, minor translations

* Update Russian.properties

Cities

* German translations 2020-04-30 (#2548)

* Update French.properties (#2560)

* Translation/romanian (#2557)

* romanian translations

* romabian translation

* romanian translatiobs

* Update Portuguese.properties (#2558)

* Corrections to the translations (#2559)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: snipe2004 <snipe2004@hotmail.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-05-02 21:42:53 +03:00
Yair Morgenstern
f5968e678d Players has to be an ArrayList, or else it's not guaranteed to be initializable when starting mods... 2020-05-01 00:03:07 +03:00
Yair Morgenstern
af8e217e18 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-30 15:58:02 +03:00
Yair Morgenstern
cc206494df 3.8.4-patch1 
Fixed regexes broken for Android by #2538
 2020-04-30 15:57:08 +03:00
SomeTroglodyte
3808c006ae
Translation code cleanup - purely decorative changes (#2544) 2020-04-30 14:08:08 +03:00
Yair Morgenstern
ba2e6d26e5 3.8.4 2020-04-29 19:39:38 +03:00
uncivbot[bot]
392fb4135a
Translations update (#2543) 
* Update Italian.properties (#2531)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* German translations 2020 04 27 (#2532)

* German xlt 2020-04-27

* German xlt 2020-04-27-b

* German xlt 2020-04-27-c

* Update Korean.properties (#2535)

튜토리얼 번역 (35줄 까지)
Translate Tutorial Part (until line 35)

* Final translations (#2539)

* Update Portuguese.properties (#2533)

* Update Portuguese.properties (#2537)

* Update Portuguese.properties (#2542)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: heogeon <akffod2525@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
 2020-04-29 19:34:45 +03:00
SomeTroglodyte
4ff1e96892
Make tr() a little faster (#2538) 
* Make tr() a little faster

* Make tr() a little faster - more consistent whitespace

* Make tr() a little faster - fix translation file generator

* Make tr() a little faster - adapted unit tests
 2020-04-29 19:02:48 +03:00
Yair Morgenstern
cee834b062 AI war motivation taked relationship level into account 2020-04-29 19:02:18 +03:00
SomeTroglodyte
44239e9e7a
TranslationFileWriter: patch to duplicate less stuff into mods (#2541) 2020-04-29 19:01:36 +03:00
Yair Morgenstern
6e3de37950 Minimap now looks good for both rectangular and hexagonal maps 2020-04-29 11:14:52 +03:00
Yair Morgenstern
8bcca39f07 WILL YOU SHUT UP ABOUT THE STUPID MINIMAP NOW 2020-04-29 10:56:31 +03:00
Yair Morgenstern
3865972737 Better declare war and city battle decisions (hopefully) for AI 2020-04-29 10:42:35 +03:00
Yair Morgenstern
38333c2600 Resolved #2536 - cities correctly expand to the last available tile 2020-04-28 12:52:18 +03:00
Yair Morgenstern
206686a4d4 Game always resume previous screen on resume(), and autosaves on pause (in case the user / Android decides later that it's closing the app completely) 2020-04-28 00:05:58 +03:00
Yair Morgenstern
e59776f443 3.8.3 2020-04-27 23:26:16 +03:00
Yair Morgenstern
e11feaea2f Fixed 'auto assign production' not working when changing from manual to auto assign 2020-04-27 23:21:14 +03:00
uncivbot[bot]
ef29ea4df6
Translations update (#2530) 
* Patch 1 (#2528)

* Update Russian.properties

* Update Russian.properties

* Update Ukrainian.properties (#2520)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Напевно, перекладено ВСЕ!

* Стилістичні правки.

Поставив лапки та довге тире де треба.

* Показувати/візуалізувати -> Показувати

* Поставив апостроф усюди.

* Так

Так і знав буде щось не так з цими рядками.

* Забув виправити пустий рядок.

* Мультиплеєр->багатокористувацька гра

* Виправлення помилок знайдених JackRainy

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

Co-authored-by: Trema28 <54084262+Trema28@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-27 23:20:40 +03:00
Väinö Mäkelä
c4f1e0f15d
Use ArrayDeque for BFS implementation (#2529) 2020-04-27 22:57:32 +03:00
Yair Morgenstern
6e03910097 Fixed crashing error when loading mods 
Load game now shows user ShowableUncivExceptions
 2020-04-27 19:23:59 +03:00
uncivbot[bot]
cee8b58e5a
Translations update (#2527) 
* Update Indonesian.properties (#2519)

Minor updates

* Update Simplified_Chinese.properties (#2526)

* Update Russian.properties (#2521)

Lines from Tutorials are translated.
Entered Pericles quote for Mausoleum of Halicarnassus.

* Update Russian.properties (#2523)

* German translations 2020 04 24 (#2511)

* Still more german readability improvements and nation text

* More german translations

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

* Update German.properties (#2515)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
 2020-04-27 10:53:17 +03:00