Commit graph

3533 commits

Author SHA1 Message Date
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
Yair Morgenstern
8965074cc3 Resolved #2135 - added tutorials for Research Agreements, Combat and Experience
The Pillaging tutorial is now available in Civilopedia
Updated translations to reflect new tutorials
2020-04-01 16:40:07 +03:00
Yair Morgenstern
dffd377510 Nuclear weapons setting moved to a per-game parameter 2020-04-01 16:09:13 +03:00
Yair Morgenstern
567a9446ad Removed pre-3.0 deprecated fields - there's a limit to how long you can reasonably stay backwards-compatible to older saves 2020-03-31 23:10:48 +03:00
Yair Morgenstern
235143751c Railroad is now just a black line - much clearer than the old, "nicer" image 2020-03-31 20:50:21 +03:00
Yair Morgenstern
4e365acd6b 3.6.14-patch1
Fixed crash when non-resource trades are made
2020-03-31 14:15:13 +03:00
Yair Morgenstern
93e4888191 AI will not constantly bug you about research agreements 2020-03-30 23:25:35 +03:00
Jack Rainy
b212f2bfd0
UI bugfixes: city info and aircrafts (#2289)
* Display aircraft icon even for full carriers

* Do not reveal strategic city information like aircrafts or units near by
2020-03-30 23:06:18 +03:00
Yair Morgenstern
62e78dec1c 3.6.14 2020-03-30 22:54:40 +03:00
Yair Morgenstern
a05dc1806b
Translations (#2292)
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

* Update Italian.properties (#2290)

* Translations (#2288)

* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Ukrainian.properties (#2291)

* Translations (#2288)

* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-30 22:46:38 +03:00
Yair Morgenstern
c04b450a70
Translations (#2288)
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-30 22:14:49 +03:00
Jack Rainy
fcd25978c9
Display the hidden units indicators (#2274) 2020-03-30 09:19:39 +03:00
proteus-anguinus
4064f2c2cf
Fix: Unit Range in Civilopedia Nation Unique Units (#2286)
unit range when shown as difference to base unit for a unique unit is placed twice.
I haven't checked the impact on translations or playtested.
2020-03-30 09:17:37 +03:00
Jack Rainy
0290051aa0
Ability to place the resources over the terrain features (#2270)
* Ability to place the resources over the terrain features

* Fossils can be found under the forest

* Revert previous commit "Fossils can be found under the forest"

This reverts commit 4e1fcd8c45ffd08090ce4b808d228636bfccfc6b.

* Ignore the vegetation and spawn the resource right under it
2020-03-29 22:41:27 +03:00
Jack Rainy
f79d01162b
Better handling of WSAD without CPU burden (#2284) 2020-03-29 21:24:09 +03:00
Yair Morgenstern
f6da5342ee More contrast between Inca colors, for readability 2020-03-29 17:58:28 +03:00
Jack Rainy
37e322a631
Decrease of the battery usage (#2281)
* Decrease battery usage: no animation of damage in the health bar

* Decrease battery usage: no WSAD support for Android

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-29 16:31:24 +03:00
Yair Morgenstern
0db473e5bc Constructions requiring missing resources once again shown in city construction choices 2020-03-29 16:19:07 +03:00
Yair Morgenstern
b0a74dfa86 Resolved #1964 - Construction resource consumption is explicitly stated in construction picking and queue 2020-03-29 14:50:40 +03:00
Yair Morgenstern
806a0e2269 Resources in Civilopedia state unit and buildings that consume the resource - #1964 2020-03-29 14:29:19 +03:00
u-ndefine
3ec27ec6c3
Add missing images (#2277)
* Add missing images

* Add missing files

* Update Credits.md
2020-03-29 13:39:19 +03:00
Yair Morgenstern
378f56207c Resolved #1779 - Can now lock worked tiles to prevent them from being unassigned 2020-03-29 12:42:58 +03:00
Yair Morgenstern
9785cafa54 Resoved #1869 - added WASD support for map panning 2020-03-29 11:37:20 +03:00