mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-13 19:39:34 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,803 Commits 6 Branches 1,058 Tags 1.2 GiB
1ada5aff43
Commit Graph

4803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
Yair Morgenstern
95b7cd7a32 AI uses same calculation for declaring both war and peace - so it won't declare war only to immediately declare peace. 2021-02-05 10:15:49 +02:00
GGGuenni
679ca2ba6c
changed case sensitivity (#3577) 
somehow I forgot to change most of the texts
 2021-02-04 21:50:44 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
Yair Morgenstern
31ef5fdc77
Translations update (#3576) 
* Update Traditional_Chinese.properties (#3571)

* Update German.properties (#3569)

* Update Indonesian.properties (#3566)

* Update Russian.properties (#3564)

Co-authored-by: SiderealArt <30827929+SiderealArt@users.noreply.github.com>
Co-authored-by: Johannes <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2021-02-04 19:23:08 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572) 
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
 2021-02-04 19:13:01 +02:00
GGGuenni
9d109d4e05
Avoid overflow of the construction bar (#3573) 2021-02-04 16:22:05 +02:00
SpacedOutChicken
72b917ca1f
Add "Land" as possible input to tile-related uniques (#3574) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques

* Add "Land" as possible input to tile-related uniques
 2021-02-04 06:42:12 +02:00
Yair Morgenstern
c85137aaaf Added "Irremovable" unique to tile improvements 2021-02-03 21:18:38 +02:00
Yair Morgenstern
f05e0a6b25 Added Unsellable unique to buildings 2021-02-03 21:10:12 +02:00
Yair Morgenstern
9d647447bc Added improvement-constructing buildings 2021-02-03 21:09:29 +02:00
Yair Morgenstern
e56fa6559f
Update README.md 2021-02-03 13:23:38 +02:00
Yair Morgenstern
80d9e5e386
Update README.md 2021-02-03 13:20:43 +02:00
SpacedOutChicken
55b4298cec
New uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []" (#3565) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques
 2021-02-03 13:06:53 +02:00
GGGuenni
aa1bd3cd7e
Adding resign function for multiplayer (#3567) 
* Adding give up function for multiplayer

* Update template.properties

* Reviewed changes

- Changed "give up" to "resign"
- Removed unnecessary and harmful translations
- Using YesNoPopup now

* Add missing space

* fixed first AI turn getting skipped
 2021-02-02 16:43:51 +02:00
Yair Morgenstern
35ae2c749d 3.12.11-patch1 2021-01-31 21:57:28 +02:00
Yair Morgenstern
8016a64b97 Added mutually exclusive tech paths using "Incompatible with [otherTech]" unique for techs 2021-01-30 19:59:34 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
Yair Morgenstern
523bea1d17 3.12.11 2021-01-30 19:10:07 +02:00
Giuseppe D'Addio
449c5e1e2b
Update Italian.properties (#3562) 2021-01-29 12:31:57 +02:00
SpacedOutChicken
457588a2c9
Parameterize Civ Unique for increased XP gain (#3561) 
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain
 2021-01-29 12:31:52 +02:00
Yair Morgenstern
1b19413736 Solved mod incompatability with Legalism issues 2021-01-29 12:30:36 +02:00
Yair Morgenstern
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
Yair Morgenstern
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
Yair Morgenstern
4e2aaa76dc Started implementing Patronage branch. Parametrized some uniques, city-states can handle different resting points for different civs. 2021-01-29 11:54:23 +02:00
Yair Morgenstern
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00
Yair Morgenstern
8e8215b5c4 Added 'replacementTextForUniques' parameter to buildings and units for custom text 2021-01-28 22:05:38 +02:00
Yair Morgenstern
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
Yair Morgenstern
f11647d5fc Add a "Unlocked at [tech/era/policy]" unique to buildings and units 2021-01-28 15:11:05 +02:00
Yair Morgenstern
68498ec7ba "Save game" errors are now correctly caught and displayed to the user 2021-01-28 14:59:16 +02:00
Yair Morgenstern
852c06ae07 Not that the destination is not always reached, changed headTowards to return the actual tile the unit reached 2021-01-28 14:50:24 +02:00
Yair Morgenstern
0cba94dbcf Added mutually exclusive policy branches :) 2021-01-28 14:36:39 +02:00
Yair Morgenstern
18f4d4e53e Added city filter, and gerenicised several uniques to work with the city filter. 
Deleted some deprecated uniques
 2021-01-28 14:26:42 +02:00
Yair Morgenstern
6a266a6cac moveToTile can handle destinations that cannot be reached, for instance when exploring unknown areas 2021-01-28 11:58:53 +02:00
Yair Morgenstern
2cac1622c9 Deprecation of old uniques 2021-01-28 10:23:32 +02:00
Yair Morgenstern
30e5722c24 Added experimental movment which assumes unknown tiles are impassible - hopefully will resolve #3009 2021-01-27 17:59:07 +02:00
Yair Morgenstern
aa944bad87 3.12.10 2021-01-26 22:46:47 +02:00
Yair Morgenstern
894e520319 More concurrency problems avoided by creating a second cityStats to run the values on 
This should also help speed things up, since we don't need to run the update() again to revert it!
 2021-01-26 22:34:38 +02:00
Yair Morgenstern
3199098ae8 Solved ANRs when loading large maps in map editor 2021-01-26 22:20:36 +02:00
Yair Morgenstern
83ecc9ee42 Hopefully mitigated some concurrency related crashes 2021-01-26 22:20:03 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
48f68c6bd0 Smoother map panning 2021-01-25 19:23:48 +02:00
Yair Morgenstern
93bdb137f9
Translations update (#3559) 
* Update Italian.properties (#3544)

* Update Japanese.properties (#3545)

* Update Japanese.properties

* Update Japanese.properties

* Japanese translation update (#3550)

* Update Japanese.properties

* Update Japanese.properties

* Finished translating some missing sentences in spanish (#3554)

* Turkish translation update (#3551)

* Update Turkish.properties

* Update Turkish.properties

* Update Simplified_Chinese.properties (#3546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: hirmonik <76709219+hirmonik@users.noreply.github.com>
Co-authored-by: marcosbach <77796076+marcosbach@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: 洛颍川 <73578868+LuoYinChuan@users.noreply.github.com>
 2021-01-24 20:05:39 +02:00
Yair Morgenstern
f5293843fd
Update uncivbot.yml 2021-01-24 19:39:34 +02:00
Yair Morgenstern
bf75ca2ec8
Update uncivbot.yml 2021-01-24 19:36:48 +02:00
Yair Morgenstern
2f3914ff76
Update uncivbot.yml 2021-01-24 19:34:39 +02:00
Yair Morgenstern
09d6ecb246
Update uncivbot.yml 2021-01-24 19:31:58 +02:00
Yair Morgenstern
06240ba402
Update uncivbot.yml 2021-01-24 19:22:36 +02:00
Yair Morgenstern
66dee1ae0d
Update uncivbot.yml 2021-01-24 19:09:39 +02:00
GGGuenni
3037ce4141
multiple game support for TurnChecker (#3540) 
* TurnChecker now checks every multiplayer game

Not just the currently open game

* Adding game saving to turn checker

so multiplayerScreen stays up to date

* remove unused imports

* removing unused functions
 2021-01-24 16:12:44 +02:00