mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-28 08:30:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,936 Commits 6 Branches 1,043 Tags 1.2 GiB
cbd3c2910e
Commit Graph

5936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yairm210
5f0afffe5a Resolved #4344 - can no longer enter city-screen that is not yours 2021-09-05 14:04:49 +03:00
yairm210
194c69a633 Deprecation 2021-09-05 13:18:51 +03:00
yairm210
daaab81e28 Resolved #5044 - reverted target Android SDK to 30 2021-09-05 12:55:19 +03:00
yairm210
194eb5299e Readability improvements 2021-09-05 12:53:12 +03:00
SimonCeder
ad50e9d2fc
implement locale for proper sorting on certain screens (#5082) 
* implement locale for sorting

* persian, centralize Collator.getInstance

* fall back to default instead of english

* fix failing build
 2021-09-05 12:12:18 +03:00
Xander Lenstra
a20baca7c2
You can now input distinct numbers when trading gold (#5072) 
* Type amount of gold in trade requests

* Remove extraneous spaces in template.properties

* Implemented proposed changes

* Fixed tests
 2021-09-05 12:10:57 +03:00
Xander Lenstra
980f0f4611
Fixed crash when viewing the name of a religion (#5092) 2021-09-05 12:05:54 +03:00
Yair Morgenstern
54583844fc
Removed Travis badge from readme 2021-09-05 00:29:17 +03:00
Yair Morgenstern
f3a8188cb1
Kotlin 1.5.30 test (#5089) 
* Kotlin bump to 1.5.30

* Needed change due to (correct!) new compile error
 2021-09-05 00:28:21 +03:00
yairm210
a1fdb612a9 Merge remote-tracking branch 'origin/master' 2021-09-04 21:40:41 +03:00
yairm210
48092b09b1 Resolved #4478 - spectator cannot take over player diplomacy options 2021-09-04 21:40:30 +03:00
SomeTroglodyte
6bc58ab5a3
Tabbed options (#5081) 
* Tabbed Options Screen

* Tabbed Options Screen - atlas
 2021-09-04 21:30:39 +03:00
SomeTroglodyte
60500d17a6
A flag for Traditional_Chinese (#5083) 2021-09-04 21:29:28 +03:00
SomeTroglodyte
84f7d4f56b
Fix map setTransients throwing exception from map generator on some map sizes (#5084) 2021-09-04 21:27:13 +03:00
yairm210
60abae5d1a Better check for units with no unitType defined 2021-09-04 21:13:01 +03:00
SomeTroglodyte
2069f227c4
Newgame Mod incompatibility toast (#5076) 2021-09-03 12:26:38 +03:00
SomeTroglodyte
5e8ecff397
Remove nonsignificant whitespace from templates (#5073) 2021-09-03 09:35:03 +03:00
SimonCeder
8cb464c9f7
Correct year shown when starting in later eras (#5070) 
* json, getEquivalentTurn

* WorldScreenTopBar.kt

* affects shown year only
 2021-09-03 00:13:58 +03:00
Xander Lenstra
2993ffb272
Fixed holy site sprite not showing up (#5067) 2021-09-03 00:12:54 +03:00
yairm210
0389945ab1 Fixed APk sign (hopefully) 2021-09-02 21:21:05 +03:00
yairm210
7c3f8ce661 3.16.11 2021-09-02 21:03:18 +03:00
Yair Morgenstern
4dae73bbfe
Translations update (#5065) 
* Update Czech.properties (#5064)

- new strings

* Update Spanish.properties (#5059)

* Update Indonesian.properties (#5056)

* Update French.properties (#5054)

* Update Italian.properties (#5035)

* Update Italian.properties

* Update Italian.properties

* Update Swedish.properties (#5034)

* Update Swedish.properties

* Update Swedish.properties

* German language updated (#5027)

* German language updated

* Anmerkungen korrigiert.

Habe alle berechtigten Anmerkungen korrigiert. Manchmal sieht man den Wald vor Bäumen nicht mehr... :D

* Update Japanese translation (#5005)

* update

* main-policies

* fix

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Fireboss_05 <47520445+Fireboss05@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Lordsem <62795018+Lordsem@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2021-09-02 20:54:22 +03:00
Xander Lenstra
df853504ae
Great Prophets now always have your religion as their religion (#5052) 
* Great Prophets now always have your religion as their religion

* Reworded unique for clarity
 2021-09-02 20:52:24 +03:00
SimonCeder
34eb4758ff
Rework City State functions into separate file (#5043) 
* cut+paste new file

* rewrite functions

* wrapper functions

* rewrite function calls

* influenceGainedByGift

* keep instantiated CityStateFunctions as Transient

* use setter functions for influence
 2021-09-02 20:50:18 +03:00
yairm210
c116b9ba94 Linting 2021-09-02 20:48:29 +03:00
yairm210
e418f1b8ca Merge remote-tracking branch 'origin/master' 2021-09-02 20:38:16 +03:00
Xander Lenstra
9575b5bf66
Implemented renaming of religions (#5057) 
* Implemented renaming of religions

* Made AskForText display error on invalid input, implemented recommended changes

* Almost forgot the translatable strings in the new popup
 2021-09-02 17:40:10 +03:00
yairm210
15335f3f7c Made city-state bonuses immutable to avoid future problems a la #5050 2021-09-02 17:37:52 +03:00
yairm210
d0dbb27e00 Resolved crash due to evaluating distance to city state when we have no cities 2021-09-02 17:21:46 +03:00
Xander Lenstra
fcc335b78a
Refactor more code, hopefully increasing maintainability (#5062) 
* Fixed great person gift formula, confusing boolean, "great person" filter

* Refactored getRejectionReason to return a hashSet of reasons instead of a random one
 2021-09-02 16:37:40 +03:00
Xander Lenstra
2e43637144
Fixed a bug where cities founding after creating a pantheon would not have that pantheon (#5053) 2021-09-01 19:21:41 +03:00
Xander Lenstra
186d06faf0
When spreading a religion with a great prophet, other religions are now removed (#5055) 2021-09-01 19:21:09 +03:00
Xander Lenstra
b347366d50
Refactored some code and uniques (#5051) 
* Refactored some code and uniques

* Fixed compilation errors, tests and crashes

* Moved influence bounds check from add to set
 2021-09-01 19:20:04 +03:00
Xander Lenstra
cffe8e441e
Finishing the later five policy trees now allows you to buy great people with faith (#5038) 2021-09-01 09:46:27 +03:00
Xander Lenstra
634f4a3533
Added Religious wonders (#5041) 
* Added Grand Temple and Great Mosque of Djenne buildings

* Added uniques for Grand Temple

* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
 2021-08-31 22:23:02 +03:00
SimonCeder
cd7bd8fcfd
fix duplicated city-state bonus bug (#5042) 
* fix city-state bug

* pt 2
 2021-08-31 22:18:58 +03:00
Xander Lenstra
248145cf8f
Fixed bug making enhancing religions impossible (#5040) 2021-08-31 18:22:39 +03:00
Xander Lenstra
9450fac423
Added UI to show what cities are holy cities to the player (#5039) 2021-08-31 16:55:29 +03:00
yairm210
a77e8015e1 3.16.10 2021-08-30 23:30:09 +03:00
Yair Morgenstern
75efe74226
Translations update (#5033) 
* work on dutch.properties (#5025)

* additions to dutch translation, some minor corrections

* fixes for dutch translation

* Update Swedish.properties (#5024)

* Update Swedish.properties

Translated the newly added lines.

* Improved translation

Improved translation

* Update Indonesian.properties (#5023)

* Update German translation (#5020)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5015)

Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-30 23:24:35 +03:00
SimonCeder
a7c4895985
Add Austrian civ (#5026) 
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
 2021-08-30 23:21:02 +03:00
Xander Lenstra
1771604a4a
AI will now found & enhance religions -- minor improvement to civilian AI (#5031) 
* AI will now found & enhance religions -- improvements to civilian AI

* This is a better order imo

* Implemented requested changes
 2021-08-30 21:41:18 +03:00
SomeTroglodyte
06c7f049b7
Diplomacy Screen Nation relation indicator (#5032) 2021-08-30 20:25:13 +03:00
yairm210
b0e3aa326b Mass deprecation 2021-08-30 19:52:57 +03:00
yairm210
b554a6db93 Deprecated Stats as viable values for Great Person points 2021-08-30 19:35:50 +03:00
SimonCeder
7e0b7f0007
units get promotions and xp bonuses from CS buildings (#5012) 
* units get promotions and xp bonuses from CS buildings

* fix siam
 2021-08-30 14:17:59 +03:00
SimonCeder
a01a6270fc
Demanding tribute from city states (#4976) 
* tribute willingness calculations

* implement demanding gold and workers

* Revisions

* unit power calculation

* show modifiers in the diplo screen

* template.properties

* G&K modifiers

* promotions start at 0

* notiifications, AI

* conflict

* conflict?

* template and translation, failing test?

* another missing string

* missing space

* afraid relationship status

* missing space 2

* Slight optimization

* optimization pt 2

* reviews
 2021-08-30 14:17:20 +03:00
SomeTroglodyte
f3a53516da
Update .gitignore (#5028) 
Follow-up to #5017 ? Better?
- That GameSettingsOld.json was from my predecessor account 17 months ago, an unwitting inclusion of a change meant for local use only.
- Maybe inform Collaborators that `.git/info/exclude` is the correct place for 'personal' exclusions...
 2021-08-30 14:12:07 +03:00
SomeTroglodyte
9c3e621b15
Atlas reorg - packer to loader via json (#5014) 2021-08-29 23:29:24 +03:00
SomeTroglodyte
3b5489a3b4
Persistent new game setup (#5016) 
* Persistent new game setup

* Persistent new game setup - comments
 2021-08-29 20:40:13 +03:00