mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-04 14:44:10 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,992 Commits 6 Branches 1,056 Tags 1.1 GiB
24c0be2950
Commit Graph

3146 Commits

Author SHA1 Message Date
Yair Morgenstern
24c0be2950 Welp broke build with a silly mistake 2021-03-28 21:27:42 +03:00
Yair Morgenstern
d3f2027416 National wonder does not require building to be built in puppeted cities 2021-03-28 21:25:35 +03:00
Yair Morgenstern
51125b68a8 City attack notifications show icon 2021-03-28 21:22:45 +03:00
Yair Morgenstern
eda9ceb140 Custom improvements for water resources now moddable 2021-03-25 10:46:45 +02:00
Yair Morgenstern
5ac2ee19c7 Linting - removed about 40 lines, hopefully makes the file easier to parse 2021-03-25 10:28:21 +02:00
Yair Morgenstern
db75067b7c Resolved #3740 - units retain individual names when upgrading 2021-03-24 22:51:05 +02:00
Yair Morgenstern
20e5d56644 Resolved #3732 - Mark target tile while moving toward it 2021-03-23 22:44:56 +02:00
Yair Morgenstern
5e34d8d9c3 Resolved #3734 - "Loading" popup when loading game remains until game is fully loaded 2021-03-23 22:44:24 +02:00
Yair Morgenstern
1e25cc0db3 Resolved #3735 - The civ launching - not receiving - the nuke is considered the civ that declared war 2021-03-23 22:28:31 +02:00
lishaoxia1985
b5c12ec17c
Carrier cannot attack, AS update to 4.1.3 (#3700) 2021-03-23 20:20:38 +02:00
Yair Morgenstern
0aeee8d974 Removed some more static usages 2021-03-21 21:04:11 +02:00
Yair Morgenstern
d184a829a2 Removed usages of global UncivGame.gameInfo, where more local usage is possible 2021-03-21 20:58:18 +02:00
Yair Morgenstern
4c1f5bb097 Resolved #3721 - Fixed edge-case "images are temporarily applied from mods set in other places" 2021-03-21 20:46:19 +02:00
Yair Morgenstern
0425e1d711 Resolved #3722 - fixed resistance icon display in notifications 2021-03-21 20:43: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
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
c7bd528052 Shortened initial loading time by removing double loading of atlas 2021-03-15 22:13:55 +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