Commit Graph

2248 Commits

Author SHA1 Message Date
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
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
b59cc8ab4f Fixed resource display bug in tile table in multiplayer 2020-04-22 16:25:42 +03:00
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
0321aed309 Solved a concurrent modification bug, a second before publish 2020-04-21 20:34:02 +03:00
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
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
6bfe7ea9c7 Map editor now works with functions on the selected tiles - much cleaner! 2020-04-21 15:18:28 +03:00
081f8cb4a6 Getting to map editor from the main screen is much nicer 2020-04-21 14:53:34 +03:00
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
4c3b9e0c14 Map editor leaves to main menu 2020-04-21 12:40:38 +03:00
0ed283f5e3 Can enter map editor directly, without loading a game 2020-04-21 00:35:10 +03:00
661ac08e5c Moved the map editor into the main menu as well 2020-04-21 00:07:05 +03:00
bb3a84fbe7 Removed may references to UncivGame.Current 2020-04-20 23:35:38 +03:00
eaf7c0a150 New players are correctly send to the language screen 2020-04-20 23:21:52 +03:00
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
458caa8bbb Map height normalized to feasable amounts of mountains 2020-04-20 19:47:26 +03:00
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00
09bdaeb7a8 Resolved #2360 - can now change the current user ID for multiplayer when changing devices 2020-04-20 17:35:05 +03:00
1a0d808b65 More toTextButton() changes 2020-04-20 17:33:46 +03:00
fea202dbd6 Much more turn-efficient exploration! 2020-04-20 15:46:49 +03:00
b6f75f0583 Better exploration - units explore to tiles adjacent to those they don't know, which solved the "I can't see the coastline" effect
This may have a performance impact, so reduced the radius of the search significantly - beyond that, people can send them manually to explore and then automate whe they're close enough
2020-04-20 14:31:42 +03:00
cbeb9a96a6 replaceAll appears to be a Java 8 feature, so rewrote the queue updating when obsoleting units
Also added sequence changes as per @SomeTroglodyte
2020-04-20 13:31:21 +03:00
bc7ee18141 More sequencing, it can only help 2020-04-20 09:24:38 +03:00
81097fdde9 City tiles are always contiguous, otherwise loads of wierd bugs happen
Also, better calculation of the number of claimed tiles
In retrospect this has been plaguing us for a long time
2020-04-20 01:46:21 +03:00
1564502fc2 Fixed unassigning extra specialists, and activate that at the end of each turn 2020-04-20 01:44:25 +03:00
3f97daf1da 3.7.6 2020-04-19 23:55:11 +03:00
e3b9e73c50 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-19 22:57:04 +03:00
122b815fc0 small minimap fix 2020-04-19 22:55:48 +03:00
f99b3f574a Minimap size may be a matter of taste (or screen size) (#2468) 2020-04-19 22:52:55 +03:00
c449e68ba7 Highlight unique offer suggestions (#2469) 2020-04-19 20:52:51 +03:00
e06c0f47a7 We can now support mods with no techs whatsoever! 2020-04-19 20:26:55 +03:00
c5abfc5066 Minor UI fix: city-state dropdown list has sufficient width (#2467) 2020-04-19 19:18:10 +03:00
5d95356e0f Can build mods without workers 2020-04-19 18:11:19 +03:00
95fd51acc5 Removed city center icon from Civ VI - it's not legally ours! 2020-04-19 17:17:57 +03:00