mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-06 07:31:26 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,945 Commits 6 Branches 1,056 Tags 1.1 GiB
d7214b7a46
Commit Graph

4945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lishaoxia1985
d7214b7a46
Method getImprovementIcon can Setsize for all icon (#3685) 
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
 2021-03-15 21:00:09 +02:00
Yair Morgenstern
dc55d31a58 Remove tile improvements not in the current ruleset on normalizeTile 
Mitigated mysterious crash in WorldMapHolder.updateTiles()
 2021-03-15 20:54:41 +02:00
GGGuenni
57f6c99d86
More terrainFeature refactors (#3694) 2021-03-13 23:38:11 +02:00
Yair Morgenstern
20f5672337 Resolved #3686 - world wrapped 'continents' map now separates continents properly 2021-03-13 23:02:57 +02:00
Yair Morgenstern
aab037b409 Resolved #3691 - 'new map' from map editor copies existing map parameters 2021-03-13 22:39:57 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
309e29b922 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-13 22:38:25 +02:00
Yair Morgenstern
5564d4db7e Game no longer crashes due to incorrect building-improvement modding combinations 2021-03-13 22:35:24 +02:00
GGGuenni
aa61fd0f40
multiple terrain features (TileInfo) (#3689) 
* Changed getTerrainFeature to getTerrainFeatures

* Changed equals to contains

for getHeight and forestOrJungleIsRoads

* Changed equal to contains

for matchesUniqueFilter

* Last changes in TileInfo for now

* make sure terrainFeature field is null

we cant be certain if setTransients got called so we have make sure we set field = null inside the getter
 2021-03-13 22:23:29 +02:00
absolutebull
b658e04048
Fix the Military Caste policy (#3692) 2021-03-13 22:16:54 +02:00
Yair Morgenstern
67bf1e838d 3.13.7-patch2 2021-03-12 13:44:10 +02:00
GGGuenni
fd177b1200
remove transient (#3688) 
since it not only blocks serialization it also blocks deserialization
 2021-03-12 13:43:14 +02:00
Yair Morgenstern
870bf9fc32 3.13.7-patch1 2021-03-12 12:26:00 +02:00
GGGuenni
d1df2fd128
Adding convert Function (#3687) 
* Adding convert Function

* field = null to be safe
 2021-03-12 12:20:55 +02:00
Yair Morgenstern
8780107ae4 3.13.7 2021-03-11 23:49:49 +02:00
Yair Morgenstern
02cd1a2ef3 More multiple terrain feature changes 2021-03-11 23:09:05 +02:00
Yair Morgenstern
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
Yair Morgenstern
9eaf4f4826 Copy all terrain features on clone(), not just first 
Use terrainFeatures in naturalWonderGenerator
 2021-03-11 21:58:24 +02:00
Yair Morgenstern
c7e424d661 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:58:19 +02:00
lishaoxia1985
b3a62f4b1a
Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
Yair Morgenstern
05a36580ba Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:22:16 +02:00
Yair Morgenstern
f6e188144e
Translations update (#3683) 
* Update German.properties (#3680)

* Update German.properties

* Update German.properties

* Update German.properties

* Updated Spanish translations (#3677)

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Revert "UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information"

This reverts commit d970632b

* Improved Spanish translations

* Update German.properties (#3676)

* Replaced ß with ss in some words.

* Update German.properties

* Update TileImprovements.json

Fixed typo

* Update German.properties

* Update German.properties

* Update German.properties (#3673)

* Update German.properties (#3672)

* Update Czech.properties (#3670)

new strings, few typos
translated ottoman, kroean, iroquois and persian diplomacy and cities

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
 2021-03-11 21:09:58 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
Martin Pechstein
daa6eec283
Update TileImprovements.json (#3679) 
Fixed typo
 2021-03-11 21:01:17 +02:00
GGGuenni
1286fc1dff
Support for multiple terrain features Part 1 (#3678) 
* Adding terrainFeatures ArrayList

* fixed existing save loses all terrainFeatures
 2021-03-11 19:07:44 +02:00
Yair Morgenstern
7bb2c70245 Mods with no techs should work again 2021-03-10 20:27:37 +02:00
GGGuenni
7d3e2a4e78
Adding world wrap support to map editor (#3667) 
* Adding world wrap support to MapEditor

* better readability
 2021-03-08 22:19:55 +02:00
Yair Morgenstern
4324fb5a7a 3.13.6-patch1 2021-03-08 22:11:09 +02:00
Yair Morgenstern
1682c8d371 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-08 22:10:16 +02:00
Yair Morgenstern
4c5d8645d6
Translations update (#3669) 
* Update Czech.properties (#3666)

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: mehmetkazim0 <69713944+mehmetkazim0@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@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>
 2021-03-08 22:10:03 +02:00
Yair Morgenstern
87c9729e52 Resolved #3663 - fixed settler automation bug 2021-03-08 22:05:59 +02:00
Yair Morgenstern
7eab616352 Added titles to mod management screen 2021-03-07 17:49:53 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
Yair Morgenstern
e2cf60d028
Translations update (#3656) 
* update German.properties (#3650)

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
 2021-03-07 12:57:59 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
Yair Morgenstern
7ddcc58955 Can convert maps between different rulesets! 2021-03-07 10:02:19 +02:00
Yair Morgenstern
a654937ad3 ImageGetter.reload() is private, you should use ImageGetter.setRuleset() from outside 2021-03-07 10:01:51 +02:00
Yair Morgenstern
d15456baa8 Fixed hurry cost modifiers, and unit gold costs scaling according to game speed 2021-03-06 23:45:50 +02:00
Yair Morgenstern
43be37a3b8 Resolved #3651 - "Free great person" unique is compatible with techs even for Spectator 2021-03-06 23:10:48 +02:00
Yair Morgenstern
b9c6874a3f Removed deprecated "kotlin-android-extensions" reference 2021-03-06 23:02:13 +02:00
Yair Morgenstern
3bdff7dec3 Merge branch 'temp' 2021-03-06 22:30:46 +02:00
Yair Morgenstern
fd207d55c6 Game can handle resources "disappearing" between versions (esp. for mods) 2021-03-06 22:30:29 +02:00
Yair Morgenstern
de9ecbed59 We need the debug keystore to check the Android package locally 2021-03-06 21:44:37 +02:00
Yair Morgenstern
9cdba66fd5 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-06 20:52:00 +02:00
Yair Morgenstern
d8093eb282 Resolved #3653 - Settler AI no longer aims for 'really far' tiles 2021-03-06 20:51:00 +02:00
GGGuenni
d161e8393e
Fixed wrapped tiles costing way to much gold (#3648) 2021-03-06 19:49:59 +02:00
Yair Morgenstern
ee05bc28ec 3.13.5-patch1 2021-03-04 22:57:47 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
GGGuenni
d3ae6d600c
World Wrap Fixes (#3644) 
* Citys Screen gets unwrapped now

When a city got build on the worlds edge the city screen displayed a non wrapped world

* Fixed CityBorder getting shifted

when city gets build on on the world's edge
 2021-03-04 18:54:39 +02:00
GGGuenni
0bf7c2e07e
Fixed rectangular maps center point (#3646) 2021-03-04 18:50:34 +02:00