mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 07:16:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,372 Commits 7 Branches 1,036 Tags 1.1 GiB
a3f511efd2
Commit Graph

8372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
11a0ef52d1 Resolved #8461, Resolved #8462 - Fixed 'infinite stat' from city-states 2023-01-25 20:34:15 +02:00
Yair Morgenstern
ff696a9272 Resolved #8463 - tutorial task mistake 2023-01-25 20:30:08 +02:00
Yair Morgenstern
a4fde1ae3c Resolved #8158 - Fallback images for all major objects 2023-01-24 23:52:34 +02:00
AlatarTheYoung
dcdcc3bc8c
Modification of the random part of Prize Ship to avoid save scumming (#8448) 
* Modification of the random part of Prize Ship to avoid save scumming

* Update core/src/com/unciv/logic/battle/Battle.kt

Code modification for readability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Added conversion to Long

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2023-01-23 23:56:14 +02:00
Yair Morgenstern
04cb4bd2a9 Resolved #7177 - Android custom location save 2023-01-23 23:55:21 +02:00
Ouaz
dd9f946de9
Fix missing ' = ' (#8459) 2023-01-23 22:39:46 +02:00
Yair Morgenstern
c9a10bccb3 Population icon before unit image in city tiles 2023-01-23 22:12:03 +02:00
Yair Morgenstern
cbf989ce91 Fade units and improvements in city 2023-01-23 21:39:13 +02:00
Yair Morgenstern
b76cd34513 Do not allow placing of 'repair' in map editor 2023-01-23 21:25:29 +02:00
Yair Morgenstern
37c656fcb4 "Extension mods:" -> "Extension mods" 2023-01-23 21:10:16 +02:00
Yair Morgenstern
291237a2eb Better main menu map 2023-01-23 20:14:54 +02:00
Yair Morgenstern
5bec368452 chore: moved cost and description functions out of BaseUnit 2023-01-23 19:52:14 +02:00
Yair Morgenstern
3ef18a696e Mods without unittype for a unit will trigger correct warnings 2023-01-23 15:01:17 +02:00
Yair Morgenstern
52c3f14bde 4.4.5 2023-01-23 11:35:17 +02:00
Yair Morgenstern
a3799d9ec7
Version rollout (#8449) 
* Bump version and create initial changelog entry

* Update Czech.properties (#8445)

* Update Portuguese.properties (#8442)

Did translation for half the properties (roughly 4000 lines). Some may need verification from another portuguese person since they are hard to translate directly.
Will try to translate the rest when I have time.

* Update Polish.properties (#8440)

* Update Simplified_Chinese.properties (#8439)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Hungarian translation (#8437)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8436)

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: bernardoamorim7 <106557598+bernardoamorim7@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-01-23 11:31:57 +02:00
alexban011
c9a4f59566
Added option to allow players to choose randomly selected civs (#8430) 
* Added UI

* random nations are now chosen from the specified random pool

* refactoring

* translations

* compareBy(getCollatorFromLocale) instead of just sorting by english names

* fixed nation popup not remembering the selected nations

* added blacklist feature

fixed bug which made the feature not work if random civilization nr was disabled

* addCheckbox function

* blacklist translation

* added function for textButton

* changed if in gameStarter

* moved button and checkboxes to the GameParameters
 2023-01-23 11:10:14 +02:00
OptimizedForDensity
c5667d1685
Fix crash in Tactical Analysis Map (#8441) 
* Fix crash due to out of looking at index == array length

* Fix dimension and swap x and y

* Some more cleanup

* Rewrite loop

* Even more cleanup

* Set function back to private

* Half total number of iterations needed
 2023-01-23 11:09:54 +02:00
letstalkaboutdune
2167f65c1b
AbsoluteUnits - Mohawk Warrior, Swordsman_v2 (#8447) 2023-01-23 11:05:04 +02:00
Yair Morgenstern
d565bf8f64 Fixed tests 2023-01-23 11:04:32 +02:00
Yair Morgenstern
b9299ac50d Pangaea maps are always largely land connected 2023-01-23 00:52:40 +02:00
Yair Morgenstern
783a469da5 chore: separated unit actions into several files 2023-01-23 00:42:45 +02:00
Yair Morgenstern
35399eb74c Resolved #8444 - rulesets without modern strategic resources no longer fail on city-state generation 2023-01-22 23:53:28 +02:00
Yair Morgenstern
2e5d1bf591 Resolved #8435 - rivers remain visible after founding city 2023-01-22 19:33:27 +02:00
Yair Morgenstern
2a3e707f24 When exchanging peace for cities, units no longer teleport out of cities you traded for 2023-01-22 19:22:17 +02:00
Yair Morgenstern
39e88d3a1a Added "upon discovering a Natural Wonder" trigger - @letstalkaboutdune 2023-01-22 19:05:17 +02:00
Yair Morgenstern
2b879e14d4 Added "upon founding a city" trigger 2023-01-22 18:59:23 +02:00
Yair Morgenstern
83ff2d12d9 Trigger notifications can go in either direction, for better translations 2023-01-22 16:06:42 +02:00
Yair Morgenstern
87dfe2e2bf Notifications for stat gain unique 2023-01-22 12:31:07 +02:00
Yair Morgenstern
587b1f40f1 Notifications for triggered uniques 2023-01-22 12:19:34 +02:00
vegeta1k95
7382da5bdf
Merge fix (#8393) 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
 2023-01-22 01:39:37 +02:00
Yair Morgenstern
d662df9e2f chore: Rename CivilizationInfo -> Civilization 2023-01-22 00:28:15 +02:00
Yair Morgenstern
81a5e15413 chore: Rename CityInfo -> City 2023-01-22 00:24:02 +02:00
Yair Morgenstern
82010e8564 chore: Rename TileInfo -> Tile 2023-01-22 00:19:25 +02:00
Yair Morgenstern
1d84238dc9 chore: move unit upgrade functions to separate class 2023-01-22 00:12:51 +02:00
Yair Morgenstern
af24a03cc9 chore: Moved mapunit turn functions to separate class 2023-01-22 00:05:20 +02:00
Yair Morgenstern
4beaaadfc8 Added conditionals for above and below resource amounts 2023-01-21 23:36:53 +02:00
Yair Morgenstern
1276036c64 Great general unique accepts conditionals - @SpacedOutChicken #3242 2023-01-21 23:10:37 +02:00
Yair Morgenstern
bb62f245c7 Resolved #8422 - Allow placing Barbarian encampments in map editor 2023-01-21 22:59:06 +02:00
Yair Morgenstern
efcf91dd19 Resolved #8431 - Do not load updated multiplayer if the user has already gone somewhere else 2023-01-21 22:12:52 +02:00
Yair Morgenstern
fbdf980365 4.4.4 2023-01-21 19:52:30 +02:00
Yair Morgenstern
0f4642e033
Version rollout (#8434) 
* Bump version and create initial changelog entry

* Update Russian.properties (#8433)

corrected spelling mistakes

* Added new translations, several minor corrections (#8429)

* Added new translations, several minor corrections

* Update android/assets/jsons/translations/Dutch.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Korean.properties (#8425)

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8424)

* Update French.properties (#8423)

* Update Simplified_Chinese.properties (#8420)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#8419)

* Update Hungarian.properties (#8418)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#8417)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: hotorcelexo <IgorPolyakov@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2023-01-21 19:49:09 +02:00
Philip Keiter
f201799a0f
Include forked repos in github search. (#8426) 
* Include forked repos in github search.

* Include forked repos in github search, the right way.
 2023-01-21 19:35:31 +02:00
Yair Morgenstern
29decb5f67 AI doesn't declare war until it's sufficiently built up 2023-01-21 19:30:04 +02:00
alexban011
35a60d4903
fixed even more warnings (#8428) 
* unused parameter `tile`

* unchecked cast KMutableProperty0

* replaced Enum.declaringClass with declaringJavaClass to avoid errors in Kotlin 1.9

* removed unused parameter 'previousScreen'

* removed usages of deprecated `religionEnabled`
 2023-01-21 19:22:50 +02:00
alexban011
e8fde017fe
version bump (#8427) 2023-01-21 19:22:05 +02:00
Yair Morgenstern
be995b3c3e Deprecated 'religion enabled' 2023-01-20 11:14:31 +02:00
Yair Morgenstern
63d40e3f8a Better 4-corner maps 2023-01-19 23:39:02 +02:00
Yair Morgenstern
e38521f5a9 Chore: Moved map normalization functions from TileInfo into MapEditor where they belong 2023-01-19 22:22:03 +02:00
Yair Morgenstern
84fd29b294 Chore: Move map editor tabs to separate folder 2023-01-19 22:13:47 +02:00
Yair Morgenstern
801116551b Chore: Moved tile stat functions to separate class 2023-01-19 21:56:44 +02:00