AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,555 Commits 6 Branches 1,117 Tags
Commit Graph

5555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
2e34253a1e Resolved #4484 - civs with no cities can no longer pick policies 2021-07-12 21:25:52 +03:00
Xander Lenstra
4ee0ef4e1f
Fixed crashes on loading save games with religion (#4479) 2021-07-12 21:12:46 +03:00
Xander Lenstra
f97e64e54e
Fixed bug where submarines could not attack embarked units (#4459) 
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
 2021-07-12 19:37:56 +03:00
Yair Morgenstern
30082c8254 Resolved #4453 - Spectator no longer appears on Diplomacy overview 2021-07-11 21:51:35 +03:00
lishaoxia1985
ab89768894
Fix worldSizeModifier in TechManager (#4473) 2021-07-11 19:11:50 +03:00
freddyhayward
1fe8c566ee
Fix Hun city names (#4469) (#4476) 2021-07-11 19:10:03 +03:00
Xander Lenstra
63d98c4692
Fixed bug where tile construction time was increased instead of decreased (#4475) 2021-07-11 19:09:17 +03:00
lishaoxia1985
4c9e15c0ea
Make map symmetrical if it's not wrapped (#4461) 2021-07-11 10:51:57 +03:00
Yair Morgenstern
5a0eb11bd0 3.15.10 3.15.10 2021-07-10 23:56:06 +03:00
Yair Morgenstern
0cc3b6f550 Resolved #4457 - spelling mistakes 2021-07-10 23:22:44 +03:00
Yair Morgenstern
56111fa24c
Translations update (#4465) 
* Update Simplified_Chinese.properties (#4456)

* Update Indonesian.properties (#4455)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4445)

* Laid some groundwork for implementing further religions (#4444)

* Laid some groundwork for implementing further religions

* Fixed duplication of Religion object

* Update Korean.properties (#4443)

* Update Korean.properties

* Update Korean.properties

* Update Spanish translations fase 1 (#4440)

* Update Spanish translations fase 1

DO NOT merge this until I have finnished it. I run out of time today.

* Update Spanish.properties

* Update Czech.properties (#4437)

* Update Czech.properties

many new (and old) strings translated

* Update Czech.properties

tweaked some newly translated strings

* huns and netherlands strings

* Update Swedish.properties (#4436)

Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?

* Update German translation (#4434)

* Adjusting the accent (#4426)

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@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: batatasmor <75855494+batatasmor@users.noreply.github.com>
 2021-07-10 23:02:23 +03:00
Xander Lenstra
b650b95356
Add missing pantheons, fix minor bugs (#4419) 
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
 2021-07-10 22:50:50 +03:00
freddyhayward
77b4bcd26a
Fixed spurious notifications of revealed resources too far away or in foreign territory (#4464) 
Co-authored-by: Frederick Hayward <frederick.hayward@student.unimelb.edu.au>
 2021-07-10 21:59:46 +03:00
Xander Lenstra
253e62de72
City states give gold when met; updates to city state gold gifts (#4435) 
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
 2021-07-10 21:51:11 +03:00
Xander Lenstra
5925489c0b
Fixed bug (#4449) 2021-07-10 21:18:45 +03:00
Xander Lenstra
02bacac8e7
Fixed nullptrexception (#4458) 2021-07-10 21:10:04 +03:00
Xander Lenstra
74b3db5927
Fixed bug where gold from rivers wasn't doubled during golden ages (#4462) 2021-07-10 21:09:21 +03:00
Xander Lenstra
0c916e85fb
Fixed _very_ old inconsitency that broke my game :( (#4442) 2021-07-09 19:15:16 +03:00
Yair Morgenstern
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
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 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