mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-28 08:30:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,305 Commits 6 Branches 1,043 Tags 1.2 GiB
a8a458ab48
Commit Graph

8305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yair Morgenstern
98f64b1fd4 Chore: Moved tile improvement functions to separate class 2023-01-19 21:43:21 +02:00
Yair Morgenstern
69393eafce Chore: Moved tile improvement functions to separate class 2023-01-19 21:32:58 +02:00
Yair Morgenstern
504a15b9a5 map file reorg 2023-01-19 18:42:24 +02:00
Yair Morgenstern
508ce0681d Better generation for all map types 
Removed 'smoothed random'
 2023-01-19 18:33:32 +02:00
Yair Morgenstern
4a3ef08324 Better Pangaea generation, no Default map 2023-01-19 18:17:46 +02:00
Yair Morgenstern
e57831ff0b 4.4.3 2023-01-19 12:29:41 +02:00
Yair Morgenstern
8fb2d7363f
Version rollout (#8416) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8415)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Hungarian.properties (#8414)

Add few Hungarian translations, fix several existing ones

* Update French.properties (#8413)

* Update Italian.properties (#8411)

* Updated Brazilian_Portuguese.properties (#8409)

* Update German translation (#8406)

* Update German translation

* Update German translation

* Update Spanish.properties (#8402)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Zoltán Varga <1575861+vargazol@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2023-01-19 12:24:40 +02:00
Philip Keiter
2ba79d85db
Add options to use random number of players and city states. (#8394) 
* Add option to use random number of players and city states.

* Fix spaces after =

* Update clone() and toString() of GameParameters

* Make sure at least one AI player when using random players.

* Fix typo in random players initial values.

* Fix for if user chooses random of 0 or 1 city states.

* Move random player and city state toggles to advanced. Move random city state choice to where it will not cache and reveal on next game. Change random city states to use min and max sliders that can be used inverted.

* Add random players min and max sliders.

* Change random players option to use min and max sliders that can be used inverted.
 2023-01-19 12:21:39 +02:00
Yair Morgenstern
4267816880 Resolved #8378 - can pick a policy with enough culture even if you have no cities 2023-01-19 12:16:30 +02:00
Yair Morgenstern
32772c7f73 Korea's unique applies to Library 2023-01-19 12:01:12 +02:00
Yair Morgenstern
668fc04a67 Notifications scroll retains position 2023-01-18 22:03:45 +02:00
Yair Morgenstern
9caef68866 More cityinfo cleanup 2023-01-18 21:53:00 +02:00
Yair Morgenstern
6dd0bf51c7 Move more context-specific functions out of CityInfo 2023-01-18 21:41:56 +02:00
Yair Morgenstern
5ebfcc3a90 chore: Split CityInfo functions into CityTurnMAnager and CityFounder 2023-01-18 21:34:41 +02:00
Yair Morgenstern
211a637e31 Fixed Android build, hopefully 2023-01-18 19:28:16 +02:00
Yair Morgenstern
4b9ee165b3 chore: More cleanup 2023-01-18 18:24:05 +02:00
Yair Morgenstern
e56d53dcd9 chore: Moved diplomacy functions to DiplomacyFunctions 2023-01-18 18:11:18 +02:00