mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-05 08:28:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,048 Commits 6 Branches 1,048 Tags 1.1 GiB
83427fec85
Commit Graph

5048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +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
SomeTroglodyte
b6fe55778a
Making game data a little more JSON compliant (#3780) 2021-04-12 06:23:44 +03:00
Yair Morgenstern
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
Yair Morgenstern
c541252fd2 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-10 23:05:42 +03:00
Yair Morgenstern
d194dec477 3.14.0 2021-04-10 23:03:23 +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
bf596586c7
Translations update (#3759) 
* Update German.properties (#3758)

* Update Turkish.properties (#3754)

* Update Turkish.properties

* Update Turkish.properties

Typo fix in line 3934: amout > amount

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
 2021-04-04 19:30:30 +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
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