Commit Graph

3214 Commits

Author SHA1 Message Date
Yair Morgenstern
6ffbce4ee1 Added "Updated!" next to updated mods in mod management screen 2021-04-21 21:22:55 +03:00
Yair Morgenstern
146a806b08 Added 'last updated time' to mod description 2021-04-21 20:53:14 +03:00
Yair Morgenstern
72f63b7ba1 Added "open Github page of mod" in mod management screen 2021-04-21 20:30:25 +03:00
Yair Morgenstern
0c80a31c9a Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-20 22:18:55 +03:00
Yair Morgenstern
d674be2234 Can no longer enter diplomacy screen for self, defeated and spectator civs through diplomacy overview screen 2021-04-20 22:18:11 +03:00
SomeTroglodyte
615fa78101
Modify choice of city to own the tiles acquired by a citadel - v2 (#3819) 2021-04-19 23:01:47 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
1eb3629c09 Resolved #3817 - don't display resource requirements from uniques twice 2021-04-19 19:29:21 +03:00
SpacedOutChicken
8d4aa955b3
Parameterize civ-wide sight bonus (#3809)
* Make science a possible reward for killing units

* no message

* Revert "Make science a possible reward for killing units"

This reverts commit 296b8fab54.
2021-04-18 22:12:47 +03:00
Yair Morgenstern
e0b1cce74f Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-18 21:31:01 +03:00
Yair Morgenstern
11f5937cdf Revert "World wrap is publicly released!"
This reverts commit 55659657aa.
2021-04-18 21:29:37 +03:00
SomeTroglodyte
5c6e55d9f1
ExpanderTab had only one use outside its package - moved (#3805) 2021-04-18 18:50:02 +03:00
Yair Morgenstern
f518c1944f Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve 2021-04-17 23:27:29 +03:00
Yair Morgenstern
fc5c3d578d Fixed - 'Water units' now can be capitalized, as they should be. 2021-04-17 21:40:50 +03:00
Yair Morgenstern
6045e0d5a4 "[] from every []" can accomodate specialist names 2021-04-15 12:50:30 +03:00
Yair Morgenstern
172508f22e Fixed natural wonder tile location in new layering 2021-04-14 19:51:13 +03:00
Yair Morgenstern
d825352bf4 Converted all "Bonus vs unitType" effects to "+[amount]% Strength vs [unitType]"
Open terrain and rough terrain bonuses are now generic and uniques
2021-04-14 18:52:10 +03:00
Yair Morgenstern
b312d24d4a Rough terrain specified through uniques 2021-04-14 18:32:39 +03:00
Yair Morgenstern
e424ec4a91 "+[]% combat bonus in []" -> "+[]% Strength in []" 2021-04-14 18:25:37 +03:00
Yair Morgenstern
e01859f6b9 Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses 2021-04-14 18:22:50 +03:00
Yair Morgenstern
5750476cac Added check for implicit prerequisites that are specified explicitly in mods, to remove clutter in tech trees 2021-04-14 16:33:00 +03:00
Yair Morgenstern
93f0b4ae42 Added building-maintenance-decreasing unique 2021-04-14 16:07:00 +03:00
SomeTroglodyte
83427fec85
Fix Citadel not quite buildable where it should be (#3788) 2021-04-14 11:28:13 +03:00
GGGuenni
3efbbc716e
Fixed Multiplayer bugs (#3781)
* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.
2021-04-13 22:57:39 +03:00
GGGuenni
00ec000d50
Preparation for hill as terrain feature (#3784)
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
2021-04-13 22:05:06 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
GGGuenni
b7d6bacc5b
Added TileSetConfigs (#3766)
* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem
2021-04-13 07:49:49 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
4bc77aece0 Can handle unique capital indicators in mods 2021-04-12 23:46:34 +03:00
Yair Morgenstern
25565f189d Natural wonders are standalone tiles in new layering 2021-04-12 23:31:54 +03:00
Yair Morgenstern
888d5e973c
Translations update (#3768)
* Update French.properties  (#3767)

* Create French.properties

* Update French.properties

* Update French.properties

* Update German.properties (#3764)

* Update Czech.properties (#3763)

Translated some new lines and city-states' diplomacy

* Hungarian.properties (#3761)

* Update Spanish.properties (#3774)

There were a few 'translation!' messages, I didn't check the already completed text. If any help is needed please let me know. My discord name is john2342#8925

* Deleted unnecessary space before colon, update czech.properties (#3773)

* Deleted space before colon

In VictoryScreen.kt was one extra space, looking like "Spain : 35" instead of "Spain: 35"

* Update Czech.properties

Co-authored-by: Loubard Kevin <70336598+subversive-eu@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: juan234248 <77988217+juan234248@users.noreply.github.com>
2021-04-10 22:59:55 +03:00
Yair Morgenstern
6d5cb00271 Revert "Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)"
This reverts commit faac24a2a5.
2021-04-07 19:26:17 +03:00
Yair Morgenstern
f4da05eb05 Added empty hexagon when none of the images exist - this fixes the default tileset for the new rendering method 2021-04-05 17:22:10 +03:00
Yair Morgenstern
39439f72a2 Manhattan project is not disabled for no-nuclear-weapon games 2021-04-05 16:21:57 +03:00
Yair Morgenstern
a2aab6f071 Added religion city counters and spread of religion between cities - none of this is yet user-visible 2021-04-05 15:54:37 +03:00
lishaoxia1985
faac24a2a5
Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)
* Redraw TechPickerScreen and PickerScreen

* Make map symmetrical if it's not wrapped
2021-04-05 14:13:34 +03:00
Yair Morgenstern
55659657aa World wrap is publicly released! 2021-04-04 21:03:45 +03:00
Yair Morgenstern
203695a967 3.13.13 2021-04-04 21:03:14 +03:00
Yair Morgenstern
8ff2a79e9b New fantasy hex layering works well with natural wonders 2021-04-04 19:32:16 +03:00
Yair Morgenstern
c1844fb58e Fixed water improvement unique crash for mods with non existent improvements 2021-04-04 19:31:49 +03:00
Yair Morgenstern
0233aa1bc5 Code reorg - moved all 'city moves between civs' functions to a separate class 2021-04-04 19:31:06 +03:00
Yair Morgenstern
187eea82a4 Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset') 2021-04-02 10:02:56 +03:00
lishaoxia1985
a95406055b
Redraw CivilopediaScreen (#3747) 2021-04-01 23:39:08 +03:00
Yair Morgenstern
8b4d82167b Resolved #3753 - Fallout is no longer added multiple times 2021-04-01 23:25:46 +03:00
Yair Morgenstern
bc1c9ad921 Tileset for new layering is now in base game
New layering now supports natural wonders
2021-04-01 23:19:07 +03:00
Yair Morgenstern
0c06237570 ALL tile images now support era-specific images! But only if the base tile exists as well. 2021-04-01 22:36:27 +03:00
Yair Morgenstern
8c7c0a0f91 Added new experimental tile layering - see #3716 2021-04-01 22:08:29 +03:00
Yair Morgenstern
2da49da716 Can now handle mods with any default branch name!
Pantheon choices now scroll
2021-04-01 21:14:22 +03:00
Yair Morgenstern
a26bf30c28 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-01 20:44:49 +03:00
Yair Morgenstern
9cb017c8a5 Added Faith icon and display for games with Religion 2021-04-01 20:44:27 +03:00