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

3789 commits

This branch
This branch
All branches
Author SHA1 Message Date
SomeTroglodyte
9fb6ad29e5
Cultural expansion pauses when no more tiles available (#2414) 
* Cultural expansion pauses when no more tiles available

* Cultural expansion stops when city owns whole 5-tile radius
 2020-04-15 23:14:15 +03:00
Yair Morgenstern
096eb7935a Welp forgot I was on debug mode 
I should probably add in a pre-commit check
 2020-04-14 15:17:40 +03:00
Yair Morgenstern
9d24fc0ff5 Resolved #2146 - can no longer accept multiple offers in a row which invalidate each other 2020-04-14 10:52:16 +03:00
Yair Morgenstern
3174767634 Added description for continuous rendering - #2213 2020-04-14 10:46:23 +03:00
Yair Morgenstern
f5a8211574 Resolved #2322 - added city expansion tutorial 2020-04-13 23:51:27 +03:00
Yair Morgenstern
50f79f5a3a Resolved #2407 - reveal all civs when won or lost 2020-04-13 23:21:19 +03:00
Yair Morgenstern
b441d537a5 Resolved #2278 - various exploration-related improvements 2020-04-13 23:08:45 +03:00
Yair Morgenstern
dd8acda4c0 Resolved #2406 - land units prefer to be generated in land tiles 2020-04-13 23:01:20 +03:00
Yair Morgenstern
85e1476efb Moved removeImprovement up to the GameStarter, which is the only place it's needed 2020-04-13 22:52:15 +03:00
Yair Morgenstern
cefd92e7ce Tutorial cleanup 2020-04-13 22:15:15 +03:00
Yair Morgenstern
d936516468 Added helper function .toTextButton() an replaces a good amount of existing calls with it 2020-04-13 22:01:31 +03:00
SomeTroglodyte
72c1fa2d5c
Fix options screen leaving next turn button disabled (#2400) 
* Options Screen: Next Turn Button was left disabled if...
    any setting with 'update worldscreen' on was used

* Options Screen: Unit idle check has visible consequences
 2020-04-13 21:53:23 +03:00
Yair Morgenstern
f64b598d1b 3.7.3 2020-04-13 21:40:28 +03:00
uncivbot[bot]
9e24276b5d
Translations update (#2399) 
* Update Italian.properties (#2387)

* Translations (#2386)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-04-13 21:36:32 +03:00
Yair Morgenstern
9af3187835 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-13 21:21:05 +03:00
Yair Morgenstern
2c824532d8 Free policies no longer 'stuck' the game when you have no adoptable policies 2020-04-13 21:20:35 +03:00
SomeTroglodyte
4f15c94766
Date and time shown bottom-left in load game now ISO (#2398) 
Replaces #2391
 2020-04-13 20:39:26 +03:00
Yair Morgenstern
13bb1eb7c7 Resolved #2285 - workers no longer try to work tiles within range of an enemy city 2020-04-13 12:40:52 +03:00
Yair Morgenstern
941bc37c59 Resolved #2221 - By updating the building costs in the final ruleset, buildings in mods can now reference techs in the original ruleset 2020-04-13 12:28:18 +03:00
Yair Morgenstern
c5582257c9 Denmark's icon better centered 
Generated translations for Denmark
 2020-04-13 12:07:59 +03:00
Yair Morgenstern
fdb3d69869 Resolved #2381 - can now remove buildings and units as well, test'D, wiki'D and example'D 2020-04-13 11:57:49 +03:00
Yair Morgenstern
546345c353 Started solution for #2381 - added "ModOptions" file which can currently define techs to remove 
Mods correctly overrule base ruleset
 2020-04-13 11:31:52 +03:00
Yair Morgenstern
935071e206 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-13 11:09:21 +03:00
Yair Morgenstern
efc131c863 Preserve mod order in ruleset and game parameters 2020-04-13 11:08:59 +03:00
SomeTroglodyte
fb602d01eb
Civilopedia: Graphic decoration for terrain, fix movement/impassable (#2395) 2020-04-13 10:49:32 +03:00
Jack Rainy
bd5c8130d9
Speedup of canPassThrough() method (#2394) 
* Unit tests for "canPathThrough"

* Refactoring of canEnterTiles() and isAtWarWith()

* Do not check isEmpty() twice

* Using of the cached MapUnit uniques
 2020-04-13 10:46:28 +03:00
SomeTroglodyte
9b26ab1385
Civilopedia: Init logical order, changed geometry to make better use of screen (#2396) 2020-04-13 10:41:18 +03:00
SomeTroglodyte
d3d655fe47
Map name field adjusted, map saving exceptions shouldn't crash, threaded (#2393) 
* Map name field adjusted, map saving exceptions shouldn't crash, threaded

* Map save: Deal with empty map name, name defaults to blank
 2020-04-12 21:37:51 +03:00
Jack Rainy
23c6fad5db
Take map relief into account (#2389) 2020-04-12 16:39:53 +03:00
Jack Rainy
65b7927df6
Throw exceptions for better debugging of saved games with missing mods (#2388) 
* Throw exceptions for better debugging of saved games with missing mods

* Close buttons are added
 2020-04-12 14:40:17 +03:00
Yair Morgenstern
6fa22a92a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-11 22:35:28 +03:00
Yair Morgenstern
2336f4d794 Show experience tutorial on promotion screen - LOTS of people ask about "can't get more than 30 XP" 2020-04-11 22:34:52 +03:00
Jack Rainy
0624542fd8
New civilization: Denmark (#2370) 
* Enable the Denmark civilization

* Nation unique ability is implemented

* Units unique abilities are implemented

* Unit icons

* Misprint in the tech name is corrected
 2020-04-11 22:31:53 +03:00
Yair Morgenstern
2b120f0b2a 3.7.2 2020-04-11 22:28:27 +03:00
Yair Morgenstern
cc1ae034d3 Fixed "Trade is no longer valid" problem 2020-04-11 22:26:12 +03:00
Yair Morgenstern
d092e9b6a9 Resources immediately come back after declined trades 2020-04-11 22:23:32 +03:00
proteus-anguinus
7511fc52df
Cancel improvement (#2359) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* For @JoshDM - Improvement Picker offers "Cancel improvement order"

* Improvement Picker offers "Cancel improvement order" - cleanup

* Improvement Picker offers "Cancel improvement order" - cleanup 2

* Improvement Picker offers "Cancel improvement order" - cleanup 3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-11 22:02:00 +03:00
uncivbot[bot]
86de66eeba
Translations update (#2385) 
* Update Italian.properties (#2363)

* Update Spanish.properties (#2384)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
 2020-04-11 22:01:34 +03:00
Jack Rainy
bf823f5883
Display the "Natural Wonders" tutorial (#2371) 
* Update Tutorials.json

Added tutorial for Natural Wonders

* Enable displaying the Natural Wonders tutorial

* Display the tutorial when the wonder is found automatically

* Minor performance optimization

* Removing debug leftovers

See also 33da0e3a7f

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2020-04-11 21:44:34 +03:00
proteus-anguinus
c866d96707
Esc/Back and popups - closing all not best idea? (#2376) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* ESC/Back handling with multiple popups

* ESC/Back handling with multiple popups

* ESC/Back handling with multiple popups - clearer code
 2020-04-11 21:40:08 +03:00
Jack Rainy
4cc10aa38f
Do not wake up a general or a worker if they are protected (#2383) 2020-04-11 21:37:40 +03:00
Jack Rainy
84f41341f6
Do not allow to build great improvement, if it already exists here (#2382) 2020-04-11 21:37:06 +03:00
Jack Rainy
ccd81fe69c
Woodsman promotion works as expected now (#2368) 2020-04-10 10:33:53 +03:00
proteus-anguinus
d063c4cda1
Fix for #2358 crashing newgame choose nation (#2369) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Fix for #2358 JR's catch - crash after selection in nation picker
- events can fire after an actor has already been removed from its stage
 2020-04-10 10:26:08 +03:00
proteus-anguinus
226801bfbd
Texture packer conditionally (#2373) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Desktop debugging - skip unnecessary TexturePacker calls

* Desktop debugging - skip unnecessary TexturePacker calls patch 1
 2020-04-10 10:25:34 +03:00
proteus-anguinus
323613ba02
Rework options UI (#2367) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Reworked Options Menu: Clarity, No Scroll jump, less repaints

* Reworked Options Menu: Minor cosmetic change

* Reworked Options Menu: Removed test code
 2020-04-10 10:22:53 +03:00
SomeTroglodyte
25a5559969
Keyboard support for Next-button and Unit actions redone (#2372) 2020-04-10 10:16:22 +03:00
proteus-anguinus
33da0e3a7f
Optimize conditional tutorials (#2378) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Optimize-Tutorial-Conditions: Measure 'Before'

* Optimize-Tutorial-Conditions: Deferred tests

* Optimize-Tutorial-Conditions: Remove instrumentation
 2020-04-10 10:13:17 +03:00
proteus-anguinus
757fa7eeb7
Language picker and new installs (#2353) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Re-think of the New-Installs Language Picker

* Language picker and new installs - reworked how flag is cleared
 2020-04-10 10:11:34 +03:00
Yair Morgenstern
244d341566 Hopefully solved #2361 for real this time 2020-04-08 16:37:17 +03:00