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

3559 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Yair Morgenstern
387e415fe9 Resolved #1885 - Both sides of per-turn trades end at the same time, resources offered in trade requests are not considered yours for that turn 2020-03-29 10:20:50 +03:00
Yair Morgenstern
c6d054431c Cities in unit overview are translated - #2242 2020-03-29 01:51:33 +03:00
Yair Morgenstern
29624bfa12 Revealed resources generate notifications even if they're outside of your current city borders (but close enough) 2020-03-29 01:48:15 +03:00
Yair Morgenstern
4331407398 Harbors immediately connect cities to the trade network 2020-03-29 01:37:52 +03:00
Yair Morgenstern
f5ee058ab5 3.6.13 2020-03-28 22:46:13 +03:00
Yair Morgenstern
cf79ac0db1 Inca fixes - added icon, fixed colors 2020-03-28 22:41:55 +03:00
Yair Morgenstern
0387ce4ff6
Translations (#2273) 
* Translations for unit ability withdraw before melee (#2255)

* update Chinese translation. (#2263)

* Update Czech.properties (#2262)

* Update Czech.properties

fixed typo, used better Iver88's translations lost due to conflict

* Update Czech.properties

correct "achaemenid" form

* Portuguese translations (#2271)

* Updated Portuguese translations

* Fixed typos and missing letters.

* Update Polish.properties (#2258)

* Update Polish.properties

* fix "x"

* hotfix v2

* Cities Translations

* Update Polish.properties

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

* Update Italian.properties (#2259)

* Translations (#2268)

* Translations

* Withdraw translations

* Translation file generation moved to game options,, so game modders can generate files in-game and not need to build Unciv from scratch

* Translation updates

Co-authored-by: proteus-anguinus <github2015@rheinig.de>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: W Gomes <42829628+w-gomes@users.noreply.github.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-03-28 22:32:32 +03:00
Yair Morgenstern
55ffd94af5 All cityinfo functions now work with same definition of 'food we'll get next turn', to avoid silly arithmetic errors 2020-03-28 21:51:09 +03:00
Yair Morgenstern
9f0ee0d578 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-28 21:42:32 +03:00
Yair Morgenstern
2c83bd0896 Errors from icorrect pathing were happening in another function, so got rid of all passing around of unitTilesToDistance, for good measure 2020-03-28 21:41:14 +03:00
Jack Rainy
c749fe6188
Carrier must be a water ranged unit (#2267) 2020-03-28 21:31:33 +03:00
Yair Morgenstern
882ca6f22b Removed translation tests that are no longer necessary - 'check' passes successfully 
'Wander' now gets its own distance to tiles, solving a really niche bug
 2020-03-28 21:29:52 +03:00
proteus-anguinus
a76147dc9e
Bring Incas into the main game (#2257) 
(also changes slinger withdraw ability to inheritable)
 2020-03-26 16:46:24 +02:00
Yair Morgenstern
a2a38e48ca Simplified MapParametersTable sliders 
More onChange{ } changes
 2020-03-26 15:45:59 +02:00
Yair Morgenstern
d64bd088c2 Added helper functions for onChange and selectboxes/checkboxes 2020-03-26 13:51:16 +02:00
Yair Morgenstern
ad2bf0f91b Resolved #2214 - Civilopedia entries are now left-aligned 2020-03-26 12:50:58 +02:00
Yair Morgenstern
136dac3582 Fixed Polish translations 
Removed unnecessary (and breaking) unit unique translation tests
 2020-03-26 11:09:00 +02:00
Yair Morgenstern
093ee0e3a9 City stats and resources updates after creating great improvement 2020-03-26 10:43:27 +02:00
Jack Rainy
2d33273c8d
Translation of the mod's name (#2260) 2020-03-26 10:21:00 +02:00
proteus-anguinus
7591d7f2c6
Add unit ability 'withdraw before melee' to Caravel and Destroyer (#2256) 2020-03-25 22:25:30 +02:00
proteus-anguinus
144d53b6df
Civilopedia: Improvement: show bonus for improvingTech (#2261) 
* Civilopedia improvement techupgrade

* Fixed overzealous cleanup

* 3 Languages for the new line
 2020-03-25 22:24:41 +02:00
Yair Morgenstern
4219776329 3.6.12 2020-03-25 16:23:59 +02:00
Yair Morgenstern
476632e57a
Translations (#2254) 
* Update French.properties (#2235)

* Update French.properties

* Germany

* Ottomans

* Korea

* Some more

* Some more about City-states

* Update Italian.properties (#2245)

* Update Polish.properties (#2247)

* Update Czech.properties (#2248)

typos, syncing terminology, new translations

* Czech translation (#2249)

* Civ uniques

* New mod system improvement texts

* Unification of "options"

* Options

* "nuclear" unification

* Options

* World screen UI

* "adjacent" unification

* Resources

* Unit types

* Buildings

* Nations

* "sousední" is better then "sousedící"

* "Zlatá věk" typo fix

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

* Translation updates

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Iver88 <tomas.iver.triska@gmail.com>
Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>
 2020-03-25 16:20:40 +02:00
Yair Morgenstern
5cdb84ca79 Wonders and national wonders cannot be enqueued/built when they are also enqueued in another city 2020-03-25 16:13:41 +02:00