Commit Graph

5273 Commits

Author SHA1 Message Date
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
GGGuenni
387693512c
Fixed roads not getting wrapped correctly (#3752) 2021-04-01 14:36:05 +03:00
Yair Morgenstern
50e3f62018 3.13.12-patch1 2021-04-01 13:05:49 +03:00
Yair Morgenstern
6e31750b55 3.13.12 2021-03-31 23:13:04 +03:00
Yair Morgenstern
f3e0867817 Resolved #3746 - background picture recentered, but also not scaled down so that the image covers most of the screen 2021-03-31 23:12:11 +03:00
Yair Morgenstern
dbd682fbbe
Translations update (#3751)
* Update Dutch.properties (#3750)

* Update bulgarian.properties (#3745)

* Update bulgarian.properties

Translated some of the #Required translation! rows

* Fixed error

* Update Indonesian.properties (#3744)

* Update German.properties (#3738)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3737)

Co-authored-by: Aron de Jong <adj00@protonmail.com>
Co-authored-by: Tony <63195157+antonpetrov145@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@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-31 22:50:31 +03:00
GGGuenni
bf32bd5400
Readd smooth transition for wrapped maps (#3749) 2021-03-31 18:01:56 +03:00
GGGuenni
5d6bfbfb31
Fixed can't press nextTurn in multiplayer game (#3748)
* Fixed game crashes on create multiplayer game

* Update isPlayersTurn on update()
2021-03-30 18:14:07 +03:00
Yair Morgenstern
cb50732ec4 'Years of peace' modifier reset when war is declared 2021-03-29 20:18:03 +03:00
lishaoxia1985
807444d2c5
Replace padding with leftAndRightPadding & topAndBottomPadding in TileGroupMap (#3742)
* Replace padding with leftAndRightPadding & topAndBottomPadding in class TileGroupMap, edit MainMenuScreen

* Remove TableBackground.png
2021-03-29 18:21:31 +03:00
Yair Morgenstern
bf9954a042 Un-blurred the tile images 2021-03-29 18:18:23 +03:00
Yair Morgenstern
46e845d6ff Resolved #3568 - text buttons are less grainy 2021-03-29 17:50:04 +03:00
Yair Morgenstern
bc5cc4e28d Added Bulgarian, by antonpetrov145! 2021-03-29 17:32:42 +03:00
Tony
751624bf41
Create Bulgarian.properties (#2365)
* Create Bulgarian.properties

This is WIP on the Bulgarian translation

* Update Bulgarian.properties

Edited with the '='

* Update Bulgarian.properties

* Update

Updated  some move values. Sorry for the long delay.

* Update Bulgarian.properties

With the help of PresleyBG

* Renamed several variables
2021-03-29 17:28:27 +03:00
Yair Morgenstern
29c9f3b3e4 HUGE memory savings (120MB -> 75MB) By saving atlases between ruleset resets! 2021-03-29 17:07:59 +03:00
Yair Morgenstern
12147e0a67 Merge branch 'temp' 2021-03-29 14:26:19 +03:00
Yair Morgenstern
3ed701508e 3.13.11-patch2 2021-03-29 14:25:54 +03:00
Yair Morgenstern
4647928f29 Start of work on Religion!
Added Beliefs, faith accumulation, and Pantheon founding. Still missing a Faith image though.
2021-03-29 11:07:43 +03:00
Yair Morgenstern
30c1861788 Added mod pagination - even when we exceed 100 mods, we'll be able to download them all 2021-03-29 10:02:51 +03:00
Yair Morgenstern
fd9a1537b0 3.13.11-patch1 2021-03-28 22:07:24 +03:00
Yair Morgenstern
b7d07ca2da Button for current civilopedia entry is now marked 2021-03-28 22:07:05 +03:00
Yair Morgenstern
63e10dde71 Modded "Remove" commands to nonexistant features no longer crashes the game 2021-03-28 21:59:57 +03:00
Yair Morgenstern
1f057831d8 AI no longer tries to attack with carriers, crashing the game. 2021-03-28 21:59:29 +03:00
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
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
Yair Morgenstern
b8f1f092d6
Translations update (#3736)
* Update German.properties (#3725)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3724)

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-23 22:54:58 +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
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