AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,425 Commits 7 Branches 1,117 Tags
Commit Graph

6425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Md. Touhidur Rahman
237016d3d6
Fixes warnings in desktop-file-validate (#5822) 
Trying to validate this desktop entry with `desktop-file-validate` (default tool for desktop entry validation) shows the following warnings.
```bash
~$ desktop-file-validate unciv.desktop
unciv.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
unciv.desktop: warning: boolean key "Terminal" in group "Desktop Entry" has value "0", which is deprecated: boolean values should be "false" or "true"
```
Thus deprecated lines were removed or edited.
 2021-12-18 20:06:27 +02:00
Xander Lenstra
b30576d115
Added an option to unlock all techs to the debug menu (#5820) 2021-12-18 20:05:34 +02:00
Xander Lenstra
75ef6f6c8d
Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
will-ca
1ab3041536
Refactor MiniMapHolder's little green map overlay toggle icons. (#5814) 
* Refactor MiniMapHolder's little green map overlay toggle icons.

* Remove comment.

* Actually, don't hide those properties.
 2021-12-18 17:56:50 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819) 
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
 2021-12-18 17:53:21 +02:00
Yair Morgenstern
7aa7b8a4b2
Resolved #5790 - kudos to @xlenstra for finding the problem and providing reproduction! (#5812) 2021-12-17 08:47:07 +02:00
yairm210
12404a6ba6 3.18.10-patch1 3.18.10-patch1 2021-12-16 22:56:46 +02:00
yairm210
8a93511a6a Merge remote-tracking branch 'origin/master' 2021-12-16 22:54:56 +02:00
yairm210
9d38ce75c4 @Interdice even after all that there was still a bug - we didn't check if the tiles we were sending the missionary/inquisitor to was actually reachable :) 2021-12-16 22:54:46 +02:00
Xander Lenstra
58cc3b517e
Fixed an infinite loop where foreign legion upgraded to the unit it replaced (#5808) 
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced

* Changed the wrong variable

* Maybe it is useful to also change its unlock tech

* Whoops, should only be for non-null values
 2021-12-16 17:50:10 +02:00
yairm210
a7b880c033 3.18.10 3.18.10 2021-12-15 23:12:28 +02:00
Yair Morgenstern
7830eda9a1
Translations update (#5800) 
* Update German translation (#5797)

* Update Russian.properties (#5788)

* Update Russian.properties

* Fix translation

* Update indonesian.properties (#5787)

* Update French.properties (#5786)

* Update Swedish.properties (#5783)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@users.noreply.github.com>
Co-authored-by: RONDEAU Felix <79422543+xil-f-dev@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
 2021-12-15 23:02:53 +02:00
Giuseppe D'Addio
408bea9fe8
Update Nations.json (#5778) 
Took out two unecessary spaces
 2021-12-15 23:01:09 +02:00
itanasi
4fe7315478
Sort Maintenace Using Fixed Point (#5764) 
* Add new UniqueType.NoMaintenance to support Guided Missile

* revert gradle
Add UnitMaintenanceDiscount
Rename UnitMaintenanceDiscount->UnitMaintenanceDiscountGlobal
Rework maintenance equation to account for overlapping reductions
Add maintenance variable to MapUnit

* Add square brackets in string (apparently didn't check in?)
More robust uniques check code so not assuming only one matching unique
Use toPercent()

* Proper toPercent() math

* Use fixed point Long to help in sorting to avoid float bug?

* Use fixed point Long to help in sorting to avoid float bug?

Co-authored-by: temurakami <spellman23@gmail.com>
 2021-12-15 22:59:10 +02:00
Xander Lenstra
b1390cd6db
Moved Coal discovery back to industrialization (#5799) 2021-12-15 14:30:12 +02:00
yairm210
c655d69c78 Order unique docs by target type so we don't get reorderings all the time 2021-12-14 19:02:58 +02:00
GGGuenni
28d3c12142
Improvements to TurnChecker data usage (#5789) 
* Added necessary utils

Added the FileNotFoundException which is also part of #5593

* Added preview download to MultiplayerScreen

* Added preview download to TurnChecker

* Fixed uncomplete commit

* Removed debug print in MultiplayerScreen
 2021-12-13 21:14:30 +02:00
will-ca
270c26c850
Raise minSdk to 21. (#5792) 2021-12-13 20:12:53 +02:00
Interdice
3f6fe234b3
AI for Inquisitor and Missionary (#5590) 
* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* Ai choice

* some fixes

* some fixes

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* finally done

* finally done

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes
 2021-12-12 12:27:09 +02:00
yairm210
0c1509bfe8 Resolved problem in new uniques with multiple parameters of the same name 
Relevant to #5783 and #5781
 2021-12-11 20:23:31 +02:00
yairm210
2889d1c24f Merge remote-tracking branch 'origin/master' 2021-12-11 19:49:13 +02:00
yairm210
72d16dbcd4 3.18.9-patch1 3.18.9-patch1 2021-12-11 19:48:34 +02:00
SimonCeder
1c01cd27da
Add a couple missing template strings (#5784) 
* missing templates

* Update template.properties
 2021-12-11 19:30:35 +02:00
yairm210
48bc79c256 Oh my bad, that's why the Discord messages aren't appearing :) 2021-12-10 15:48:53 +02:00
yairm210
e9da000485 3.18.9 3.18.9 2021-12-10 15:37:17 +02:00
yairm210
b537f9e386 Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes 2021-12-10 15:34:17 +02:00
yairm210
23bad8d961 Resolved #4921 - can gift improvements to city states also on water tiles and when other improvements have been built on top of the resource 2021-12-09 21:58:57 +02:00
yairm210
3872a46519 Resolved #5691 - enabled code minify, if we see that this ruins stuff we can always turn it back off again with an appropriate comment 2021-12-09 20:47:33 +02:00
yairm210
ed3a4accdd Resolved #5775 - don't try and set resource amounts for "image" tiles, like in map editor or civilopedia 2021-12-09 20:43:19 +02:00
yairm210
f3378f4ced 3.18.8-patch1 
Resolved #5774 - removed demanded resource from city when resource is not in ruleset
3.18.8-patch1 		2021-12-09 20:37:37 +02:00
yairm210
3dfb0aec70 3.18.8 3.18.8 2021-12-07 22:12:05 +02:00
yairm210
31e0f36ff3 Merge remote-tracking branch 'origin/master' 2021-12-07 22:03:08 +02:00
yairm210
7896e70a87 3.18.7-patch1 3.18.7-patch1 2021-12-07 21:52:28 +02:00
yairm210
e205190e1d Merge branch 'temp' 
# Conflicts:
#	buildSrc/src/main/kotlin/BuildConfig.kt
 2021-12-07 21:50:21 +02:00
yairm210
41c328286b 3.18.7-patch1 2021-12-07 21:49:36 +02:00
Yair Morgenstern
312bc3d405
Translations update (#5769) 
* Update Indonesian.properties (#5763)

* Update Turkish.properties (#5759)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
 2021-12-07 21:45:49 +02:00
yairm210
1782f27e9b 3.18.7-patch1 2021-12-07 21:43:17 +02:00
yairm210
e3d86db66d 3.18.7-patch1 2021-12-07 21:39:48 +02:00
Xander Lenstra
099b180a07 Band-aided a bug where players in multiplayer games were waiting for themselves. (#5768) 
(cherry picked from commit 22b3997c28da4eb75c1b633625d5c006b17934d8)
 2021-12-07 21:39:01 +02:00
Xander Lenstra
22b3997c28
Band-aided a bug where players in multiplayer games were waiting for themselves. (#5768) 2021-12-07 21:38:45 +02:00
SimonCeder
24bd2b66b0
Regions part 3 - resource placement, resource settings (#5690) 
* placeLuxuries

* map resource settings

* strategic and bonus resources

* terrain fixes

* slight optimizations

* vanilla jsons

* fix luxury terrain distribution

* also for vanilla

* fix ruleset bug

* terrainfilter
 2021-12-07 07:25:16 +02:00
yairm210
4bc8c83555 Merge remote-tracking branch 'origin/master' 2021-12-06 19:20:28 +02:00
yairm210
0088ddd18b Solved bug that made civilian units uncapturable 2021-12-06 19:19:37 +02:00
Xander Lenstra
2fa3228148
Fixed a crash that occasionally happened when liberating a city to a dead civ (#5762) 
* Fixed a crash that occasionally happened when liberating a city to a dead civ

* Added descriptive comment
 2021-12-06 11:54:10 +02:00
Xander Lenstra
10be481524
Added an icon for the telegraph tech (#5765) 2021-12-06 11:53:29 +02:00
Xander Lenstra
40cb651433
Fixed the unique for giving sight to units no longer working (#5760) 2021-12-06 07:10:52 +02:00
Xander Lenstra
a46f638ef1
Fixed a bug where protected city states would have a red line to their protector in the diplomacy overview screen (#5761) 2021-12-06 07:10:05 +02:00
yairm210
31639aac9f Resolved #5752 - don't show 'fortify until healed' if the unit won't actually heal in this tile 2021-12-05 21:38:27 +02:00
yairm210
144d2738a4 Trying to find the cause of #5729 2021-12-05 21:33:04 +02:00
yairm210
0d4da03b7c 3.18.7 3.18.7 2021-12-05 21:23:04 +02:00