Xander Lenstra
c327b54b1b
City Centers can no longer be removed by nukes ( #4423 )
...
* City Centers can no longer be removed by nukes
* Implemented requested changes
* Implemented more requested changes
2021-07-09 12:13:45 +03:00
Yair Morgenstern
df7bba02a1
Merge branch 'master' of https://github.com/yairm210/Unciv
2021-07-09 11:01:40 +03:00
Yair Morgenstern
0d328ef99a
Stuffed some +/- uniques into the square brackets
2021-07-09 11:01:25 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI ( #4356 )
...
* Add a very simple display for the religion in a city
* Added missing credits for shrine
* Added Great Prophet unit
* Great prophets can now be generated using faith
* Great Prophets can now construct holy sites
* Great Prophets can now spread their religion to friendly cities
* Holy site can only be constructed if the great prophet hasn't spread religion yet
* Added missing translation string
* Fixed more translation problems
* Implemented requested changes
2021-07-09 10:48:33 +03:00
Yair Morgenstern
abd877dd1b
Resolved #4427
2021-07-09 10:19:21 +03:00
Yair Morgenstern
cc3146f92b
Actual translations
2021-07-09 10:17:22 +03:00
Yair Morgenstern
edad1e10a2
Fix for placeholder parameters changing names and becoming out of sync with existing translations.
...
Relevant to #4402
2021-07-09 10:16:39 +03:00
Yair Morgenstern
37942a1af6
Translations update ( #4433 )
...
* Update Ukrainian.properties (#4429 )
* Update Ukrainian.properties
* Update Ukrainian.properties
* Added Civilopedia Texts
* Add most of religion-related stuff and made some other edits
Also I haven't understood how to translate Goddess of Festivals and Religious Idols uniques
* Update Russian.properties (#4424 )
* Update Russian.properties
Translated some of new strings
* Update Russian.properties
* Update Russian.properties
Some more translation and improvements
* Update Indonesian.properties (#4421 )
* Update Indonesian.properties
* Update Indonesian.properties
* Update Korean.properties (#4420 )
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update German translation (#4413 )
* Update German translation
* Update German translation Iroquois
* Update German translation
* Update German translation
* Translation of The Netherlands
* Update Swedish.properties (#4414 )
* Update Swedish.properties
* Update Swedish.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-09 09:19:02 +03:00
Xander Lenstra
21eadb39ff
Updated TranslationFileWriter to include the new values that filters can have ( #4402 )
...
* Updated TranslationFileWriter to include the new values that filters can have
* Implemented requested changes
2021-07-09 09:14:24 +03:00
Xander Lenstra
ced85fafd1
Fixed a bug where one city challengers could capture enemy cities ( #4431 )
...
* Fixed a bug where one city challengres could capture enemy cities
* Actually, this is a cleaner implementation
2021-07-09 09:11:17 +03:00
SomeTroglodyte
5e01ce82b2
Quick salvage of some lost translations ( #4415 )
2021-07-07 23:08:20 +03:00
Xander Lenstra
fbd64b9520
Refactored the way cities determine what uniques should apply when ( #4393 )
...
* I'm so sorry for the size of this PR
* Uniques are better generalized
* Code now compiles
* Missed a line
* Some more cleaning up
2021-07-07 22:01:14 +03:00
Yair Morgenstern
ecd5ae5128
3.15.9
2021-07-07 20:54:19 +03:00
ArchDuque-Pancake
9b2460f166
Update Spanish Properties - ¡read my description! ( #4404 )
...
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
2021-07-07 20:01:28 +03:00
SomeTroglodyte
373b42bfcf
Update "World screen" tutorial text and Home key improved ( #4403 )
2021-07-07 20:00:12 +03:00
Yair Morgenstern
8eb97b2ea0
Translations update ( #4400 )
...
* Update Ukrainian.properties (#4398 )
* Update Simplified_Chinese.properties (#4397 )
* Update Russian.properties (#4384 )
* Update Russian.properties
Translated new strings
* Update Russian.properties
* Update Swedish.properties (#4383 )
* Update Swedish.properties
* Update Swedish.properties
* Update Swedish.properties
* Update Swedish.properties
* Update Indonesian.properties (#4382 )
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
* Update German translation (#4380 )
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation for railroad things
* Update Korean.properties (#4376 )
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Zkdc <Zkdc2345@qq.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
2021-07-07 19:59:14 +03:00
SomeTroglodyte
1d080ac54d
ExpanderTab revisited - move and apply to city screen ( #4401 )
2021-07-07 18:21:51 +03:00
Xander Lenstra
9e37cc8f16
Fixed crash when a city had negative population due to faster razing ( #4389 )
2021-07-06 19:41:23 +03:00
SomeTroglodyte
7875ec4896
Better mod download and error display ( #4396 )
...
* Better mod download and error display
* Fix Android Studio Insubordinations
2021-07-06 19:33:05 +03:00
Yair Morgenstern
3df83b1a75
Merge branch 'master' of https://github.com/yairm210/Unciv
2021-07-05 21:11:58 +03:00
Yair Morgenstern
a6041d670d
Obvious mistake
2021-07-05 21:11:47 +03:00
Xander Lenstra
7d8f8b981d
Fixed bug where logistics _still_ did not work ( #4388 )
2021-07-05 21:09:10 +03:00
Yair Morgenstern
c1ff2e4ba7
Fixed Denmark's unique including also embarking instead of just disembarking
2021-07-05 21:06:54 +03:00
SomeTroglodyte
c42561c545
Spruced up Civilopedia - phase 4 - Visual candy, Units ( #4350 )
...
* Spruced up Civilopedia - phase 4 - Visual candy, Units
* Unified separators, CheckBox helper - patch2
* Unified separators, CheckBox helper - atlas merge
* Spruced up Civilopedia - phase 4 - rebuild atlas
* Spruced up Civilopedia - phase 4 - rebuild atlas
* Spruced up Civilopedia - phase 4 - do separator to-do
2021-07-05 16:35:41 +03:00
Xander Lenstra
c2a43ffee0
Fixed bug where city-states would not share their science income even if the player had the right policy ( #4381 )
...
* Fixed bug where city-states would not share their science income even if the player had the right policy
* Implemented requested changes
2021-07-05 16:34:15 +03:00
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds ( #4379 )
2021-07-05 11:31:13 +03:00
Xander Lenstra
624fe33be1
Updated template.properties ( #4377 )
...
* Updated translation file
* Made tests happy
* Removed unused, athematic unit filter
* Added submarine unit translation
2021-07-05 11:20:12 +03:00
Yair Morgenstern
6215a5990d
More concurrency problem fixes in nuke effects
2021-07-05 11:12:36 +03:00
SomeTroglodyte
2c51f84bec
Unified separators, CheckBox helper ( #4349 )
...
* Unified separators, CheckBox helper
* Unified separators, CheckBox helper - patch1
* Unified separators, CheckBox helper - patch2
* Unified separators, CheckBox helper - patch3
2021-07-05 09:35:25 +03:00
Xander Lenstra
957c8697ac
Added the nation of the Netherlands ( #4372 )
...
* Added the nation of the Netherlands
* Added Sea Beggar, Dutch unique unit
* Added polder improvement, Dutch unique improvement
* Added national ability
2021-07-05 09:35:04 +03:00
SomeTroglodyte
8fb55e77a3
ExpanderTab revisited ( #4357 )
...
* ExpanderTab revisited
* ExpanderTab revisited - patch1
2021-07-04 21:25:58 +03:00
Yair Morgenstern
b748f92bb5
3.15.8
2021-07-04 21:09:17 +03:00
Yair Morgenstern
8a139e57b8
Translations update ( #4371 )
...
* Update Indonesian.properties (#4369 )
* Update Korean.properties (#4364 )
* Update German translation (#4363 )
* Update German.properties
* Update German translation
* Update German translation
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-07-04 19:19:35 +03:00
Xander Lenstra
0d26c69710
More bug fixes ( #4370 )
...
* Fixed Air Targetting not having icon
* Fixed the huns not having battering ram unique unit
* Plundering with multiple levels of coastal raider no longer creates multiple notifications
* Implemented requested changes
2021-07-04 19:18:15 +03:00
Xander Lenstra
2a4ca74e7b
Fixed more bugs I introduced myself ( #4368 )
...
* Fix bug where mobility doesn't work
* Fixed supply _still_ not working
2021-07-04 17:34:27 +03:00
Xander Lenstra
be5345477a
Fixed bug where heal instantly would not heal ( #4367 )
2021-07-04 17:32:50 +03:00
Xander Lenstra
b3498e6959
Fixed two more of my own bugs ( #4361 )
...
* Fixed bug were required science for tech did not match label
* Fixed a bug
2021-07-04 06:23:02 +03:00
Xander Lenstra
aa132c8bf8
Fixed more bugs ( #4360 )
...
* Fixed city states spawning with multiple settlers
* Renamed icon for the huns
2021-07-04 00:25:20 +03:00
Yair Morgenstern
c91e94ae03
Translations update
2021-07-03 23:02:41 +03:00
Yair Morgenstern
8ca6fc0a08
Translations update ( #4359 )
...
* Update Korean.properties (#4346 )
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Simplified_Chinese.properties (#4342 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Swedish.properties (#4339 )
* Update German.properties (#4338 )
* Update German.properties
* Update German.properties
* Russian Translation (#4337 )
Translated new strings and made slight improvements
* Update Italian.properties (#4333 )
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-07-03 22:57:58 +03:00
Yair Morgenstern
82fd24f12c
Fixed concurrent modification problem in Nuke attack
2021-07-03 22:38:48 +03:00
Xander Lenstra
6c221cd56b
Fix multiple bugs resulting from updating promotions and implementing missile cruisers ( #4355 )
...
* Fixed carriers in mods no longer working
* Fixed scouting prerequisites
* Fixed surivialism not having icon or prerequisites
* Fix logistics in mods not working
* Added image for supply promotion
2021-07-03 22:26:03 +03:00
SomeTroglodyte
d8340b9c1c
Fix mod custom maps unavailable when no local ones exist ( #4358 )
2021-07-03 22:24:23 +03:00
SomeTroglodyte
8fdb4f413e
Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial ( #4334 )
2021-07-02 19:22:38 +03:00
Yair Morgenstern
0776d9b36e
Discord Role mentions are different from User mentions
...
Which makes sense
2021-07-02 19:04:18 +03:00
Yair Morgenstern
f9d3c0403c
Added ping to @Game News role to Discord message
2021-07-02 18:50:31 +03:00
Yair Morgenstern
f88e2fa495
Multiline solution
...
As posted in https://trstringer.com/github-actions-multiline-strings/ by Thomas Stringer
2021-07-02 18:25:56 +03:00
Yair Morgenstern
aff396523d
Multiline test for release
2021-07-02 18:02:11 +03:00
Yair Morgenstern
25785fd949
Let's try this again
2021-07-02 17:46:04 +03:00
Yair Morgenstern
998f05af50
Test if Github actions on release are acting as expected
2021-07-02 17:29:18 +03:00
