Commit Graph

2382 Commits

Author SHA1 Message Date
647a0c9ff7 Wait for autosave thread while closing (#2580) 2020-05-05 08:51:41 +03:00
a940eda4a9 Better Resource order in empire overview screen (#2577) 2020-05-04 22:10:24 +03:00
2b3a9c14bf Resolved #2576 - Clicking on "Encountering" notifications now move the map to the encounter location 2020-05-04 20:22:23 +03:00
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
d828fdaeca Maps no longer spawn ancient ruins in immediate vicinity of civ spawns 2020-05-03 21:45:23 +03:00
ad7d7fba60 Added missing Romanian characters 2020-05-03 20:39:08 +03:00
9397f3608c Fixed thread crashes due to concurrent actor changes in multiplayer update popups 2020-05-03 19:11:07 +03:00
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
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
af8e217e18 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-30 15:58:02 +03:00
cc206494df 3.8.4-patch1
Fixed regexes broken for Android by #2538
2020-04-30 15:57:08 +03:00
3808c006ae Translation code cleanup - purely decorative changes (#2544) 2020-04-30 14:08:08 +03:00
ba2e6d26e5 3.8.4 2020-04-29 19:39:38 +03:00
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
cee834b062 AI war motivation taked relationship level into account 2020-04-29 19:02:18 +03:00
44239e9e7a TranslationFileWriter: patch to duplicate less stuff into mods (#2541) 2020-04-29 19:01:36 +03:00
6e3de37950 Minimap now looks good for both rectangular and hexagonal maps 2020-04-29 11:14:52 +03:00
8bcca39f07 WILL YOU SHUT UP ABOUT THE STUPID MINIMAP NOW 2020-04-29 10:56:31 +03:00
3865972737 Better declare war and city battle decisions (hopefully) for AI 2020-04-29 10:42:35 +03:00
38333c2600 Resolved #2536 - cities correctly expand to the last available tile 2020-04-28 12:52:18 +03:00
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
e11feaea2f Fixed 'auto assign production' not working when changing from manual to auto assign 2020-04-27 23:21:14 +03:00
c4f1e0f15d Use ArrayDeque for BFS implementation (#2529) 2020-04-27 22:57:32 +03:00
6e03910097 Fixed crashing error when loading mods
Load game now shows user ShowableUncivExceptions
2020-04-27 19:23:59 +03:00
6fed455d76 Happiness is now a saved transient - saves about 10% of all runtime! Can't believe I hadn't thought of that before! 0_0 2020-04-27 00:01:40 +03:00
ba2d6fe405 Performance improvements for .nextTurn() 2020-04-26 23:09:06 +03:00
f0adc40e81 Fixed modification exception when destroying transported units 2020-04-26 20:50:09 +03:00
5e5a175f06 Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
818adbd1a3 Map editor: Placed improvement check updated: Potentially resolves #2489 (#2518)
* Map editor: Placed improvement check updated: Potentially resolves #2489

* Map editor: Placed improvement check updated: Code readability
2020-04-26 19:39:29 +03:00
f9d5cf60f8 Performance - Great general automation was taking 40% (!) of nextTurn time - decreased to 6%, which is still A LOT but much, much less 2020-04-26 11:23:09 +03:00
04cd1978fa Resource bonus from Fascism effective immediately 2020-04-26 09:58:24 +03:00
e50e2ad5d2 3.8.2
Translations writer updated to handle new older structure
2020-04-26 00:26:14 +03:00
20f37d25f1 Character set reorganized, added portuguese vowels (#2513) 2020-04-25 23:14:03 +03:00
99f4b612ec Dynamical width of the buttons (#2496)
* Dynamical width of the buttons

* Better alignment of icons

* Using the same style as in the game

* Compilation fix after merging
2020-04-24 15:17:43 +03:00
4d75f30fd2 Can now add units in map editor!
Support for loading maps with units added, support for starting gams with maps with preadded units added
Not supported: Starting games with maps of civ A when that civ isn't in the game
This needs a lot of work before it can be released publicly
2020-04-24 15:04:19 +03:00
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
5ec9cc5f67 AI great people will no longer try to raise great improvements on tiles with existing great improvements 2020-04-24 13:47:10 +03:00
e3ed241b9d Iroquois movement unique only applies to friendly territory 2020-04-24 11:29:24 +03:00
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
5a8b6fdb19 Resolved #2503 - Resizing the game no longer returns you to the main menu 2020-04-24 11:04:11 +03:00
9ec721f93b New game screen adjusts to base rulesets with small amounts of civs, including barbarians
Unknown eras no longer cause the screen to go black
2020-04-23 23:21:25 +03:00
33ee29bbb2 Saving a map from the map editor screen no longer changes the screen 2020-04-23 23:03:29 +03:00
813ba5b83c Hotfix: Do not reset the screen to the capital in the multiplayer game (#2502) 2020-04-23 22:46:07 +03:00
c0b1788d96 Changed main menu buttons to the default color scheme, renamed MenuScreen to MainMenuScreen 2020-04-23 20:16:14 +03:00
c890895f39 Translations update (#2500)
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-04-23 20:09:31 +03:00
f2c8c04106 More concurrency problems solved 2020-04-23 20:00:08 +03:00
07b4dcd8ba Fixed #2492 - trading cities with units in them no longer crashes the game 2020-04-23 19:53:06 +03:00
4e53bb77d1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-23 19:39:42 +03:00
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
73ffe4f44f Decrease CPU load for multiplayer game (#2495)
* Decrease CPU load for multiplayer game

* Misprint is corrected
2020-04-23 19:33:14 +03:00