Commit graph

4005 commits

Author SHA1 Message Date
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
proteus-anguinus
d15abd66b6
Scroll panes get scrollfocus automatically (#2358)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* ScrollPanes steal and release focus automatically

* ScrollPanes steal and release focus automatically: Commented & param names
2020-04-08 16:30:10 +03:00
proteus-anguinus
9f46ceea24
Fix Back=Leave game on Android, ESC=Back, both in Popups (#2356)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Back button fix, ESC, and behaviour of them in popups

* ESC/Back now work if there's no exitEvent

* ESC/Back: JackRainy is right, exit prompt now cancellable with same key
2020-04-08 15:55:00 +03:00
Yair Morgenstern
c3f038ee36 3.7.1 2020-04-08 15:36:17 +03:00
uncivbot[bot]
28f69acc1c
Translations update (#2362)
* Update Italian.properties (#2338)

* Update German.properties until line 2433 (#2351)

* Update German.properties until line 2433

line 2306, i add in german like carefully consider this proposalt "and agree" , if you dont want that, delete "und ihn anzunehmen."
line 2310, context is probably need, so I added in brackets the english version

i think there is another line in which I added the english version in brackets.

ends in line 2433

* Done most of the requested Changes.

* \n for newline, source for poem, requested changes

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
2020-04-08 15:26:03 +03:00
Yair Morgenstern
1ebe618761 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-08 15:15:16 +03:00
Yair Morgenstern
eabf17186c Hopefully resolved #2361 - added libdiscord-rpc.so for 32-bit linux 2020-04-08 15:15:04 +03:00
Jack Rainy
bd5daee9a8
Better colors for Katmandu and Almaty (#2355) 2020-04-08 15:06:25 +03:00
Jack Rainy
73aeaf6ad7
Autosize of the tech buttons (#2346)
* Autosize of the tech buttons

* Using minWidth parameter
2020-04-07 20:53:05 +03:00
Jack Rainy
e4fab26b43
Display the crosshair in alternate color for distant targets (#2347) 2020-04-07 11:37:14 +03:00
proteus-anguinus
5cd75188b3
Fortify until healed: Disable if no more movement points (#2350)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Fix: Fortify until healed shouldn't be enabled when Fortify isn't
2020-04-07 11:36:32 +03:00
Jack Rainy
d7f5664efd
Using objects when classes are not needed (#2329)
* Using objects when classes are not needed

* Not used code cleanup

* Using objects when classes are not needed (part 2)
2020-04-06 20:29:41 +03:00
Jack Rainy
e869eb26f7
Display price for temporary unavailable purchases (#2344) 2020-04-06 20:06:24 +03:00
Yair Morgenstern
4bb92e2ffe Resolved #2340 - cannot open multiple 'disband unit' popups for hash hack 2020-04-06 13:57:49 +03:00
proteus-anguinus
cee794b29c
Discord thread shutdown, last Autosave singlethreaded (#2318)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Discord thread is now a timer and gets notified to shut down
Solved truncated Autosaves: Made it singlethreaded within shutdown.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-06 13:43:40 +03:00
Yair Morgenstern
adb52acd24 Tutorial tests fixed, this is becoming tedious fast. 2020-04-06 11:57:45 +03:00
Yair Morgenstern
8aeb2ede78 Resolved #2305 - Added city-states and influence tutorial 2020-04-05 18:53:02 +03:00
Yair Morgenstern
b63d56277d 3.7.0 2020-04-05 12:19:33 +03:00
Yair Morgenstern
e8e58bdb54 Translation updates 2020-04-05 11:21:02 +03:00
uncivbot[bot]
a4f4191956
Translations update (#2337)
* Update Czech.properties (#2321)

inca diplomacy, germany cities, few fixes and other minor translations

* Update Simplified_Chinese.properties (#2315)

Translated known entries

* Update French.properties (#2324)

* Update Korean.properties (#2336)

**Note: it isn't my native language. Proposal by 동민 on Discord**

* Translations (#2330)

* Update Italian.properties (#2327)

* Update Russian.properties (#2334)

* Перевод Вересаева! (#2335)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: woone8 <63055987+woone8@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SandrBAS <63113020+SandrBAS@users.noreply.github.com>
Co-authored-by: piggiz <63164001+piggiz@users.noreply.github.com>
2020-04-05 11:18:44 +03:00
Yair Morgenstern
c8c2bbb00a Policy screen does not auto-open when you have a free policy, instead coming from clicking the 'next turn' button - should help us solve the "screen unresponsive when I have a free policy" problem, if not eliminate it entirely 2020-04-05 10:54:16 +03:00
u-ndefine
bb98bee733
Missed Unciv new icon credits, whoops (#2331)
* New Unciv icon credits by u-ndefined
2020-04-05 00:20:26 +03:00
Jack Rainy
29a077a803
Forts and citadels (with AI) (#2325)
* Enabled Forts & Citadels

* Friendly territory checks

* Citadel damage & notifications

* Sprites, Icons, Translation & Atlas

* Obsolete tests are removed

* NullReferenceException code is fixed

* Refactoring: using the static object

* AI for the forts and citadels

* Display defence stats

* Exclude enemies tiles as candidates

Co-authored-by: r3versi <fluo392@gmail.com>
2020-04-03 11:22:27 +03:00
proteus-anguinus
10762a3873
Desktop window size restore (#2319)
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Small version: remember window size only, and leave positioning to Gdx
2020-04-03 10:33:46 +03:00
Yair Morgenstern
8f583732aa Not being able to read the settings file shouldn't make you crash
Happened to 2 users out of almost 400K, but it's an easy fix so why not help the 0.005%
2020-04-03 10:28:49 +03:00
proteus-anguinus
0289af28ce
Update GameSettings.kt (#2320)
__This__ nuclearWeaponEnabled is now a zombie.
2020-04-03 09:59:20 +03:00
Jack Rainy
ec0f41d015
NullReferenceException code is fixed (#2326) 2020-04-03 09:58:49 +03:00
Yair Morgenstern
b94d624319 3.6.15 2020-04-02 14:52:25 +03:00
Yair Morgenstern
2a23d1db6c Uncivbot moved to its own repo, for future hosting reasons 2020-04-02 14:50:56 +03:00
Yair Morgenstern
98ab25e41b
Update feature_request.md 2020-04-02 12:29:26 +03:00
uncivbot[bot]
d5695fdbd3
Translations update (#2312)
* Update Indonesian.properties

Not Completed.

* Update French.properties

* Update Romanian.properties

* Czech translation (#2308)

* no message

* no message

* no message

Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>

Co-authored-by: Bima-Kentang <62836197+Bima-Kentang@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: DarkerBogg <57591431+DarkerBogg@users.noreply.github.com>
Co-authored-by: uncivbot[bot] <63019250+uncivbot[bot]@users.noreply.github.com>
Co-authored-by: Iver88 <tomas.iver.triska@gmail.com>
Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>
2020-04-02 12:25:14 +03:00
Yair Morgenstern
a7548cd1e6 First version of Uncivbot, which deals with translation merging
When commenting "merge translations" in a PR, it:
- Creates a new 'translations' branch if it doesn't exist
- Creates a PR for the 'translations' branch if it doesn't exist
- Changes the PR's base to 'translations'
- Merges the PR, if it's mergable
2020-04-02 12:20:17 +03:00
Yair Morgenstern
5c32e6f2cb Tutorial typo fix 2020-04-01 20:22:39 +03:00
Jack Rainy
dde01738de
New wonders: Mausoleum of Halicarnassus, Statue of Zeus (#2301)
* New wonder: Mausoleum of Halicarnassus

* New wonder: Statue of Zeus

* Obsolete tests are removed
2020-04-01 20:12:25 +03:00
Yair Morgenstern
4ab154ea99 I forgot that tutorials have an Enum, kudos to Travis 2020-04-01 16:52:44 +03:00