Commit graph

3819 commits

Author SHA1 Message Date
Yair Morgenstern
ba2d6fe405 Performance improvements for .nextTurn() 2020-04-26 23:09:06 +03:00
Yair Morgenstern
f0adc40e81 Fixed modification exception when destroying transported units 2020-04-26 20:50:09 +03:00
SomeTroglodyte
5e5a175f06
Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
SomeTroglodyte
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
Yair Morgenstern
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
Yair Morgenstern
04cd1978fa Resource bonus from Fascism effective immediately 2020-04-26 09:58:24 +03:00
Yair Morgenstern
e50e2ad5d2 3.8.2
Translations writer updated to handle new older structure
2020-04-26 00:26:14 +03:00
uncivbot[bot]
28aae7b9e8
Translations update (#2516)
* Update Portuguese.properties (#2501)

* Update Italian.properties (#2506)

* Added translations for Danish/Scandinavian towns (#2509)

* Update Portuguese.properties (#2512)

* Update Indonesian.properties (#2505)

Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Elizabeth Sherrock <lizzyd710@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-04-25 23:56:50 +03:00
Yair Morgenstern
0627f981b9 Decapitalized Terrace farm image so it would register on Android 2020-04-25 23:43:52 +03:00
Yair Morgenstern
e8fc5b32a7 Resolved #2514 - returned to grade 5.6.4 2020-04-25 23:36:55 +03:00
SomeTroglodyte
20f37d25f1
Character set reorganized, added portuguese vowels (#2513) 2020-04-25 23:14:03 +03:00
Jack Rainy
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
Yair Morgenstern
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
Yair Morgenstern
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
Yair Morgenstern
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
Yair Morgenstern
e3ed241b9d Iroquois movement unique only applies to friendly territory 2020-04-24 11:29:24 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
Yair Morgenstern
5a8b6fdb19 Resolved #2503 - Resizing the game no longer returns you to the main menu 2020-04-24 11:04:11 +03:00
SomeTroglodyte
289bf62e99
Typos in json and translations: Suzdal, Edinburgh defeat (#2504) 2020-04-24 00:40:56 +03:00
Yair Morgenstern
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
Yair Morgenstern
33ee29bbb2 Saving a map from the map editor screen no longer changes the screen 2020-04-23 23:03:29 +03:00
Yair Morgenstern
f51c3b7b1e 3.8.1-patch1 2020-04-23 22:46:52 +03:00
Jack Rainy
813ba5b83c
Hotfix: Do not reset the screen to the capital in the multiplayer game (#2502) 2020-04-23 22:46:07 +03:00
Yair Morgenstern
6c5eed4dd9 3.8.1 2020-04-23 20:17:58 +03:00
Yair Morgenstern
c0b1788d96 Changed main menu buttons to the default color scheme, renamed MenuScreen to MainMenuScreen 2020-04-23 20:16:14 +03:00
uncivbot[bot]
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
Yair Morgenstern
f2c8c04106 More concurrency problems solved 2020-04-23 20:00:08 +03:00
Yair Morgenstern
07b4dcd8ba Fixed #2492 - trading cities with units in them no longer crashes the game 2020-04-23 19:53:06 +03:00
Yair Morgenstern
4e53bb77d1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-23 19:39:42 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Jack Rainy
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
Yair Morgenstern
286ef707c2 Can start a new game from within a game, to copy over the game's parameters 2020-04-22 17:16:24 +03:00
Yair Morgenstern
b59cc8ab4f Fixed resource display bug in tile table in multiplayer 2020-04-22 16:25:42 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
0321aed309 Solved a concurrent modification bug, a second before publish 2020-04-21 20:34:02 +03:00
Yair Morgenstern
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
uncivbot[bot]
a84131d550
Translations update (#2483)
* A lot of cities are translated (#2472)

* Update Indonesian.properties (#2475)

* Update Indonesian.properties

Added most of the Lines from Nations.json

* Update Indonesian.properties

Added all if not most of the quotes translations (phew it's exhausting to translate it all)
Finished the cities and policies translation
Plus some other corrections
This should be it (99%)
Thanks for all your support, especially yairm210 for keeping this game updated with my translation work <3

* Update Italian.properties (#2477)

* Update Italian.properties

* Update Italian.properties

* Some more german translations (#2480)

Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>

* fixed a spelling mistake (#2476)

* fixe a spelling mistake

* Update German.properties

* Update Czech.properties (#2473)

- new texts (tutorials mostly)

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

Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
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: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-21 20:19:01 +03:00
SomeTroglodyte
f774b715ab
Allow scandinavian lowercase vowels (capitalized are very rare) (#2479)
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
2020-04-21 20:01:18 +03:00
Yair Morgenstern
6bfe7ea9c7 Map editor now works with functions on the selected tiles - much cleaner! 2020-04-21 15:18:28 +03:00
Yair Morgenstern
081f8cb4a6 Getting to map editor from the main screen is much nicer 2020-04-21 14:53:34 +03:00
Yair Morgenstern
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
Yair Morgenstern
4c3b9e0c14 Map editor leaves to main menu 2020-04-21 12:40:38 +03:00
Yair Morgenstern
0ed283f5e3 Can enter map editor directly, without loading a game 2020-04-21 00:35:10 +03:00
Yair Morgenstern
227f7327c5 Fixed the build 2020-04-21 00:24:36 +03:00
Yair Morgenstern
661ac08e5c Moved the map editor into the main menu as well 2020-04-21 00:07:05 +03:00
Yair Morgenstern
bb3a84fbe7 Removed may references to UncivGame.Current 2020-04-20 23:35:38 +03:00
Yair Morgenstern
eaf7c0a150 New players are correctly send to the language screen 2020-04-20 23:21:52 +03:00
Yair Morgenstern
a3a9bd142e Added a main menu - and it only took 3 years before I felt it was needed
This should allow players whose game generation is crashing to be able to send us games, and a lot more besides!
2020-04-20 23:16:58 +03:00
Yair Morgenstern
458caa8bbb Map height normalized to feasable amounts of mountains 2020-04-20 19:47:26 +03:00
Yair Morgenstern
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00