mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-21 01:37:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,159 Commits 6 Branches 1,039 Tags 1.2 GiB
619d02d2b6
Commit Graph

3276 Commits

Author SHA1 Message Date
SomeTroglodyte
3da02b18b6
Some visual improvements for the Mod Manager Screen (#3841) 2021-04-27 12:06:05 +03:00
Yair Morgenstern
8dc748f919 Resolved #3524 - Happiness in city overview now calculated correctly 
(also simplified sorting etc. and added option for Faith)
 2021-04-27 00:55:39 +03:00
Yair Morgenstern
4f802e813a Added Happiness (and Faith for Religion mods) to stats list - #3524 2021-04-27 00:37:51 +03:00
SomeTroglodyte
089a415da9
For issue 3838: Bigger target on "next city" button (#3840) 2021-04-27 00:05:59 +03:00
GGGuenni
29dfa338ba
Added fogOfWarColor and unexploredTileColor (#3833) 
* Added fogOfWarColor and unexploredTileColor

* update updateConfig function
 2021-04-26 21:16:18 +03:00
Yair Morgenstern
7ddbac1f07 Made datetime in modscreen parsable for Java 7 phones 
And now date display is localized too which is nice
 2021-04-23 15:57:39 +03:00
Yair Morgenstern
fb4a091635 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-23 15:29:01 +03:00
lishaoxia1985
adf32dcfe2
getResearchAgreementCost() don't need variable, make some method private (#3832) 2021-04-22 16:59:15 +03:00
GGGuenni
cb9507c76d
Fixed internal TileSetConfigs not getting loaded on android (#3831) 2021-04-22 11:00:35 +03:00
SomeTroglodyte
600f262cca
Fixes #3729 "Android crash on loading from custom location" (#3828) 2021-04-21 23:42:45 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
SomeTroglodyte
722772b08e
Solves #3802 Mod translations don't appear in new game screen (#3823) 
* Solves #3802 Mod translations don't appear in new game screen

* Rehomed translationActiveMods to Translations
 2021-04-21 21:45:58 +03:00
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
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
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
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
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
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
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