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

4261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
0c1e318334 Resolved #2979 - Display countdown to negotiate peace in diplomacy screen 2020-08-25 10:18:05 +03:00
Yair Morgenstern
6d7903eb93 Resolved #2844 - Can now immediately move units in Desktop with right-click 2020-08-25 00:24:09 +03:00
Yair Morgenstern
a6b89b9885 More minor emoji changes 
They do make the whole setup seem much more professional
 2020-08-24 23:17:34 +03:00
Yair Morgenstern
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
Yair Morgenstern
b85506a7d5 Resolved #2937 - can add large increments of gold in trades 2020-08-24 21:29:00 +03:00
Yair Morgenstern
6c3faec6ac Keep the perpetual construciton going, if the user set it manually. 2020-08-24 20:39:46 +03:00
Yair Morgenstern
1f3b77d038 All 'Turn' and 'Turns' texts changed to a turns icon, much cleaner! 2020-08-24 19:45:53 +03:00
HadeanLake
879c416e30
Few translation and unique fixes (#3020) 
* Few translation and unique fixes
Fixed:
* translation of "vs original Unit name" in nation description
e.g. Lost ability(vs Knight): Penalty vs City 33%
* translations of some button texts and labels from map editor

* Fixed "[+X Happiness] in all cities" and "[+X Happiness] in capital" national unique
 2020-08-24 15:19:07 +03:00
Yair Morgenstern
8d3b0b09e9 Tech picker screen auto-handles eras of different lengths 2020-08-24 14:54:27 +03:00
Yair Morgenstern
45d90c0458 Unified construction filtering for civ- and city-wide uniques 2020-08-24 14:30:26 +03:00
Yair Morgenstern
cdde27d74d Can remove tile features outside your borders 2020-08-24 11:01:15 +03:00
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
d4b8aae84a Finally changed unit uniques to Unique! 2020-08-23 22:53:38 +03:00
Yair Morgenstern
8203549aea Removed UniqueAbility from Nations 2020-08-23 22:33:31 +03:00
Yair Morgenstern
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
9ef7d8770d Added a new test that ensures no two placeholders are the same 
Fixed double 'param' parameter in existing translations
 2020-08-23 21:20:17 +03:00
uncivbot[bot]
6185312fd9
Translations update (#3022) 
* Update Italian.properties (#3013)

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

* Update Simplified_Chinese.properties and Traditional_Chinese.properties (#3019)

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#3014)

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

* Update German.properties (#3015)

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

* Update Russian.properties and Ukrainian.properties (#3018)

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties

* update Ukrainian.properties

* Update Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* update Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
 2020-08-23 20:29:37 +03:00
Yair Morgenstern
002d0cc7f6 Settler 'by name' recognition changed to 'by unique' recognition, allowing for modded settler-like units 2020-08-23 00:28:55 +03:00
Yair Morgenstern
a930ad6360 MapGen doesn't place ancient ruins if they're not defined in the current ruleset 2020-08-21 14:16:05 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
9e7b6ca90d Borders consist of both civ colors, making some borders (esp. Germany) much clearer 2020-08-21 00:12:37 +03:00
Yair Morgenstern
02c2da9347 generified []# of food is carried over 2020-08-20 23:45:44 +03:00
Yair Morgenstern
408077cd5f Roads and railoads can be removed outside your borders 2020-08-20 23:21:12 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
Yair Morgenstern
42b5b3f16c Can now disable diplomatic relationship changes in a mod 2020-08-20 16:38:14 +03:00
Yair Morgenstern
acf803de28 Merged Building and Policy unique activations 
Added Tech link checks for loaded mods
 2020-08-20 15:00:10 +03:00
Yair Morgenstern
e7c0710042 3.10.2 2020-08-20 12:30:46 +03:00
uncivbot[bot]
2492c17216
Translations update (#3012) 
* Update Italian.properties (#3002)

* Update Czech.properties (#3003)

lot of new strings translated

* Update German.properties (#3005)

* Update Indonesian.properties (#3004)

* Update Simplified_Chinese.properties (#3010)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#3011)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
 2020-08-20 12:09:06 +03:00
Yair Morgenstern
4d6478cf05 Added link checks when loading mods, so you'll know if you messed something up 2020-08-20 11:55:28 +03:00
Yair Morgenstern
9ca7e7ac5b Dealt with some game assumptions about what exists, which may not be true in mods 2020-08-20 11:18:53 +03:00
Yair Morgenstern
67ce953c62 TechPickerScreen centers small tech trees nicely 2020-08-20 10:44:22 +03:00
HadeanLake
cd72926a60
Bugfixes (#3007) 
* Fixed "Can move immediately once bought" unique

* Spectators no longer can adopt policies
Close button is no longer disabled when player has free policy but has no adoptable policies
FreePolicies are being spent properly in scenario editor mode

* redundant
 2020-08-19 15:25:17 +03:00
HadeanLake
a12c1ada26
Fixed AI being stuck doing science or gold per turn (#3006) 
* AI will no longer get stuck doing science or gold per turn

* added missing commas in jsons
 2020-08-18 20:53:16 +03:00
Yair Morgenstern
bd8592f48c Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-18 20:23:39 +03:00
Yair Morgenstern
4d9485ce03 3.10.1 2020-08-18 20:23:28 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999) 
* scenario editing mode improvements and new uniques

* Fixed Russian nation unique - it is civ-wide bonus

* genericized "+[]% Production when building [] in this city"

* genericized "All newly-trained [] units in this city receive the [] promotion"

* changed some uniques to be able to have list of filters separated by comma as unique param

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

* fix crash in scenario editing mode due to PerpetualConstruction not having a GoldCost

* undo comma separation

* implement All newly-trained [relevant] units in this city receive the [] promotion
relevant as in 'units that can receive'

* upadte template.properties

* unnecessary parentheses

* Not being annoyed by this vs less chance of forgetting to set gold before releasing scenario

* update template.properties

* add missing spaces
 2020-08-18 19:20:59 +03:00
ravignir
18834d94ae
Update Polish.properties (#2998) 
Fixed (hopefully) all typos
 2020-08-17 23:40:54 +03:00
Yair Morgenstern
1abbd1520c Game can handle the situation where there are no more techs that can be researched (in mods with limited techs) 2020-08-17 23:17:49 +03:00
Yair Morgenstern
2c8074bfe4 Converted the "special power" of the Future Tech to a unique than can be applied to any tech 2020-08-17 23:07:58 +03:00
HadeanLake
44744fd17b
Fix #3000 (#3001) 2020-08-17 14:46:38 +03:00
Yair Morgenstern
41615909df Translation tests are fixed - translators beware 2020-08-16 22:01:55 +03:00
Yair Morgenstern
7cdad3c882 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-16 20:43:41 +03:00
Yair Morgenstern
574e588711 City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses 2020-08-16 20:43:19 +03:00
uncivbot[bot]
da4852d954
Translations update (#2996) 
* Finnish translation update (#2993)

* Add Finnish.properties

* Move Finnish.properties to right folder

* Delete Finnish.properties

* Add translations to Finnish

* Add translations to Finnish

* Translate more stuff in Finnish

* More translation to Finnish

* Update Brazilian_Portuguese.properties (#2994)

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

* Update Italian.properties (#2992)

* Create PolishNew (#2995)

New polish translation, should be 100% complete.

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ravignir <RAVIGNIRFORATT@GMAIL.COM>
 2020-08-16 20:41:51 +03:00
Yair Morgenstern
f2f14b6570 Revert "Changed all "[] from [] tiles" to "[] from every []"" 
This reverts commit c89041e2d4.
 2020-08-16 20:16:01 +03:00
Yair Morgenstern
1937e3f3c9 3.10.0 2020-08-15 23:31:52 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
c89041e2d4 Changed all "[] from [] tiles" to "[] from every []" 2020-08-15 21:58:26 +03:00
Yair Morgenstern
be216d8e6b Game no longer crashes on new game screen when no scenarios are available 2020-08-15 21:58:02 +03:00