mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 17:32:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,977 Commits 6 Branches 1,039 Tags 1.2 GiB
0425e1d711
Commit Graph

4977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
0425e1d711 Resolved #3722 - fixed resistance icon display in notifications 2021-03-21 20:43:09 +02:00
Yair Morgenstern
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
Yair Morgenstern
049744c9bb
Translations update (#3723) 
* Update German.properties (#3717)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Indonesian.properties (#3715)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2021-03-21 19:19:09 +02:00
Yair Morgenstern
5a5d0a980f Removed ALL color-based notifications! 2021-03-21 00:28:58 +02:00
Yair Morgenstern
d4b19a7bb3 Many notification conversions 2021-03-20 23:49:33 +02:00
Yair Morgenstern
36131cb7c1 Extended battle notifications 2021-03-19 15:52:50 +02:00
Yair Morgenstern
d515955b30 Better icons for notifications (there's a lot of work to do here) 2021-03-19 15:38:14 +02:00
Yair Morgenstern
4c260ca954 Changed notification to accept multiple icons, like in Civ VI - this allows for more informative iconography 2021-03-19 15:11:47 +02:00
Yair Morgenstern
50d5b0d7ce Added specific icons to certain notification types 2021-03-19 11:26:54 +02:00
Yair Morgenstern
ba51222841 Barbarians only heal by pillaging, simplified barbarian automation 2021-03-19 10:39:55 +02:00
Yair Morgenstern
a08a5a7435 Resolved #3713 - Fixed misspelled "fresh water" in farm unique check 2021-03-18 23:01:47 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
a49c2cc289
Translations update (#3712) 
* Update Czech.properties (#3708)

- new strings
- space ship related terminology shortened and synced
- few city states transation

* Update German.properties (#3704)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3701)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-03-18 19:48:05 +02:00
Yair Morgenstern
fa709d2944 Can now add leader portrait images to mods! 2021-03-18 18:37:27 +02:00
Yair Morgenstern
c98100f1a7 Added "permanent visual mods" option to mod management 2021-03-18 18:36:05 +02:00
GGGuenni
7ba12ad5c6
Adding fallout again (#3711) 2021-03-18 15:36:24 +02:00
GGGuenni
b12c5df28e
last refactoring of terrain feature (#3702) 
* last terrainFeature refactorings

* cut down terrainFeature as much as possible

* aerialDistanceTo fixed

wrapped distance should only be considered on wrapped worlds

* Adding spaces

* fixed tests not compiling

* prevent floodplains from spawning on oasis

* Check if terrain feature can be placed on tile in editor

* Adding reviewed changes
 2021-03-18 13:54:52 +02:00
GGGuenni
25ef92f3eb
fixed baseTerrain can differ from getBaseTerrain (#3710) 2021-03-18 13:19:02 +02:00
Yair Morgenstern
8472715509 Resolved #3614 - tileFilter works with natural wonders 2021-03-18 13:13:31 +02:00
Yair Morgenstern
37903435f5 Trade overview now more uniform 
"Gold" and "Gold per turn" are now correctly translated
 2021-03-18 13:08:59 +02:00
GGGuenni
1a4051fa3f
toast popup not screen blocking again (#3709) 2021-03-18 12:47:40 +02:00
Yair Morgenstern
57b1a01e2c Resolved #3705 - loading game popup stays until the game is loaded 2021-03-18 10:57:02 +02:00
Yair Morgenstern
dd4778495e Added "Provides yield without assigned population" uniques to tile improvements 2021-03-17 23:10:21 +02:00
Yair Morgenstern
755586eecd Added TileInfo.providsYield() - this will help us later 2021-03-17 22:47:21 +02:00
GGGuenni
cdc7739784
overlaying existing terrainFeatures now (#3706) 2021-03-17 21:58:48 +02:00
GGGuenni
5fa14b9533
More terrainFeature refactoring (#3695) 
* call convertTerrainFeature on setTerrainTransients

setTransients doesn't get called on deserialization only setTerrainTransients and setUnitTransients...

* refactored terrainFeature in TileGroup

* rulesetIncompatibility support for multiple terrain features

+fixed typo IncompatAbility -> IncompatIbility

* Make use of TileSetStrings optimization

* Seperate multiple terrain features with "+"
 2021-03-16 16:14:04 +02:00
Yair Morgenstern
cde1b150d3 Unit name is translated when unit has a unique name 2021-03-15 23:18:00 +02:00
Yair Morgenstern
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +02:00
Yair Morgenstern
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
Yair Morgenstern
c7bd528052 Shortened initial loading time by removing double loading of atlas 2021-03-15 22:13:55 +02:00
Yair Morgenstern
996f54367d
Translations update (#3698) 
* Update Czech.properties (#3693)

Translated some city states' diplomacy.
P.S. What is the definition of 'radger'? I can't find it anywhere.

* Update Czech.properties (#3690)

diplomacy and cities: polynesia, siam, spain, songhai, mongolia, aztecs, inka, denmark

* Update German.properties (#3684)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
 2021-03-15 22:02:12 +02:00
Yair Morgenstern
4fa0a2b4b8 Resolved #3401, Resolved #3598, possibly resolved #3643 - game can be instantly closed and reopened on Android 
From a practical standpoint - Reset all GL objects upon create(), since they lose all relevance when we have a new GL context
 2021-03-15 21:56:16 +02:00
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