mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 15:27:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,852 Commits 7 Branches 1,036 Tags 1.1 GiB
634f4a3533
Commit Graph

5852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xander Lenstra
5094a068fe
Fixed ambush bonus amount (#5021) 2021-08-29 20:37:59 +03:00
SomeTroglodyte
5403f28c77
Remove inactive server code and music (#5017) 2021-08-29 11:33:46 +03:00
SomeTroglodyte
5a6a9c9759
Anti-Armor, negative tile yield, LoadScreen (#5018) 
* Harden against negative yields, Anti-Armor

* Anti-Armor bad unitType, LoadScreen
 2021-08-29 11:33:20 +03:00
yairm210
6a3fddc757 3.16.9 2021-08-29 01:43:22 +03:00
Yair Morgenstern
342eae4060
Translations update (#5013) 
* Update Dutch.properties (#5008)

* work on dutch translation: new translations and some corrections

* fixes for dutch translation

* Update Italian.properties (#5006)

* Update Indonesian.properties (#5004)

* Update German translation (#4999)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#4997)

* Update Swedish.properties

Translated the newly added lines.

* Fixed misplaced space

* Update Spanish.properties (#4992)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@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: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2021-08-29 01:37:59 +03:00
Xander Lenstra
1cc90a3953
Implemented the enhancing of religions (#4965) 
* Generalize the concept of founding religions in preparation of enhancing

* Implemented enhancing religions

* Added all enhancer beliefs (mostly correctly, mostly tested)

* You can now found a religion without a pantheon, requiring you to choose a pantheon as well

* Parameterized 'enhance religion' action, fixed tests

* Implemented requested changes & simplified beliefContainer a lot

* Fixed rename

* Updated code to include features added in the meantime

* Merge branch 'master' into enhanceReligions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-28 22:36:11 +03:00
SomeTroglodyte
3e22a36bbf
Fix Civilopedia resource to Wonder links (#5011) 2021-08-28 22:27:25 +03:00
SomeTroglodyte
ef7fc36c80
Harden automateImprovementPlacer and detect Mod problems with these (#5010) 2021-08-28 22:26:00 +03:00
yairm210
8779ca7147 Mass deprecation 2021-08-28 22:21:35 +03:00
Xander Lenstra
85e4a68ea1
Submarines are now visible to adjacent units, and once turned visible, can be attacked by all enemy units (#5001) 
* Submarines are now visible to adjacent units, and once turned visible, can attack be all enemy units

* Deprecation & translation of unique saving
 2021-08-27 17:00:12 +03:00
Xander Lenstra
7dd7e0b278
Fixed a unique & better credits (#4998) 2021-08-27 16:27:17 +03:00
SomeTroglodyte
7085ea95cc
Fix: Legacy maps with starting locations not playable (#5000) 
* Fix: legacy maps with starting locations not playable

* Fix: legacy maps with starting locations not playable - ruleset
 2021-08-27 16:26:45 +03:00
SomeTroglodyte
bf2ee91b67
Civilopedia Phase X (#5003) 
* Civilopedia Phase X - Show Policies

* Civilopedia Phase X - Show City States

* Civilopedia - Loop-driven init and Cleanup

* Civilopedia - City States

* Civilopedia Phase X - Remove spurious comments
 2021-08-27 16:24:23 +03:00
yairm210
30e5ac3665 3.16.8 2021-08-26 17:45:17 +03:00
yairm210
d2cd65dd6a changelog+buildconfig for next version 2021-08-26 17:45:17 +03:00
SomeTroglodyte
448b04fab8
Civilopedia - Tweaks (#4990) 
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
 2021-08-26 17:29:55 +03:00
Yair Morgenstern
e442c4dcf1
Translations update (#4996) 
* Update Simplified_Chinese.properties (#4991)

* Update Russian.properties (#4989)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

Mostly corrected mistakes of the previous translator and translated some of the new strings

* Update Swedish.properties (#4988)

* Update Italian.properties (#4979)

* Update German translation (#4974)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Portuguese.properties (#4957)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@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-08-26 17:10:18 +03:00
Xander Lenstra
86d1f143d9
Conquering a city destroys buildings inside the city (#4995) 
* When conquering a city, some buildings are now destroyed

* Added missing translation for uniques
 2021-08-26 17:09:55 +03:00
yairm210
59f8a0eebf Hardcoded image atlases for it to work from within a .jar - #4993 2021-08-26 16:51:38 +03:00
SomeTroglodyte
9df58ed240
Stats rework part 2 (#4983) 
- Nicer iterators
- Callers adapted to simpler syntax
- CityStats changed to non-serializable
 2021-08-25 19:02:42 +03:00
yairm210
935b5f8793 gradle deprecation warnings fixed 2021-08-25 00:12:19 +03:00
yairm210
e59010f52a Merge remote-tracking branch 'origin/master' 2021-08-24 23:10:27 +03:00
yairm210
73d8ef4452 Added folder creation so mv to deploy will work 2021-08-24 23:08:36 +03:00
SomeTroglodyte
5d95dd1c7b
Multiple Start Locations per tile nicer display (#4982) 2021-08-24 22:56:05 +03:00
yairm210
34c6fda990 Merge remote-tracking branch 'origin/master' 2021-08-24 22:50:58 +03:00
yairm210
5344dc0d15 Resolved #4980 - Upload APK files to Github release 2021-08-24 22:49:53 +03:00
SomeTroglodyte
cdc63f71e8
Multi-Atlas / Image packer redo (#4959) 
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
 2021-08-24 07:31:21 +03:00
SomeTroglodyte
b93f93ea9b
Stat Icons Redone (#4961) 
* Stat Icons Redone

* Stat Icons Redone - Sources

* Stat Icons Redone - Rebuild atlas
 2021-08-23 23:15:17 +03:00
SomeTroglodyte
a53cb82034
StartingLocation-Improvements-be-gone phase 2 (#4975) 2021-08-23 23:15:04 +03:00
yairm210
b157313bb9 Update city stats when finishing city-state quests - #4963 2021-08-23 22:31:41 +03:00
yairm210
6db92da52a Resolved #4960 - can now play as 2 separate civs with the same userId 2021-08-23 22:26:51 +03:00
yairm210
23cb4394a7 Converted all "1 + (value/100f)" to .toPercent() 2021-08-23 21:52:21 +03:00
yairm210
15a42dd8ea Resolved #4956 - fixed Krepost unique 2021-08-23 21:41:17 +03:00
yairm210
e62fdc2218 3.16.7 2021-08-23 21:11:21 +03:00