mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-07 05:51:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,194 Commits 6 Branches 1,034 Tags 1.1 GiB
244f9477df
Commit Graph

7194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
0f70d8360d 4.0.7 2022-04-17 13:45:59 +03:00
Yair Morgenstern
dedd19cff8
Version rollout (#6557) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#6550)

* Update Spanish.properties

* Update Spanish.properties

Maybe I have left some grammar mistakes. I have to go, hopefully I'll fix them before the update.

* fix typos

* Update Simplified_Chinese translation (#6545)

* 4.0.6 translation 1

* 4.0.6 translation 2

* Update Simplified_Chinese.properties

* Update Filipino.properties (#6539)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
 2022-04-17 13:41:22 +03:00
Yair Morgenstern
8b5665a73f Resolved #6445 - problems in hosting Unciv server 
Solution from https://stackoverflow.com/questions/56533497/how-to-replace-blocking-code-for-reading-bytes-in-kotlin
 2022-04-17 13:26:04 +03:00
Yair Morgenstern
6b99b11179 Resolved #6527 - replacementTextForUniques activates for units when picking nations 2022-04-17 13:22:57 +03:00
Xander Lenstra
0230575473
Tested and reworked the 'unit upgrades for free' unique till it worked (#6555) 2022-04-17 08:01:22 +03:00
Xander Lenstra
d3b17117da
Added a 'go to capital'-button in the diplomacy overview screen (#6546) 2022-04-16 23:31:13 +03:00
itanasi
7a89c84790
Air Units take damage in Combat (#6533) 
* Changes required
Add isAirUnit to iCombatant

* Updating XP Rewards to match Civ5
Add isAirUnit() Boolean for ICombatant

* Air Units can only Intercept if they haven't moved this turn

* Change Intercept to only have the highest chance unit take the chance

* Exempt the defending unit from being able to Intercept
Add back in tryInterceptAirAttack() for all units of a civ to attempt intercept

* Combine back to 1 function.
Add filtering for defender

* Fix logic bug

* Change base damage to be centered on 25f (instead of 30f) if City is attacking. addRandomDamage is a guess

* Revert dmanageModifier code

* XP fix

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-04-16 23:06:30 +03:00
Leonard Günther
8457c7ab1d
Fixed TurnChecker crash when using custom server (#6554) 2022-04-16 23:06:07 +03:00
Xander Lenstra
7ced78f6a2
Fixed vanilla policies regression (#6552) 
* Fixed the vanilla piety tree

* Fixed more regression errors

* Removed unique
 2022-04-16 23:04:28 +03:00
itanasi
e5ef660157
Updating XP Rewards. Interception now gives XP (#6543) 
* Updating XP Rewards to match Civ5
Add isAirUnit() Boolean for ICombatant

* Revert Melee XP

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-04-16 23:04:17 +03:00
heipizhu4
0dda359f38
Add modding translation instruction to the wiki (#6544) 
Add modding translation instruction to translation.md inpired by #6483.
Mostly is copied from @SomeTroglodyte 's comment and add some of my own translation expeirence.
There might be some grammatical mistakes in this doc.
 2022-04-15 16:24:51 +03:00
itanasi
0e8a22a1e8
When capturing Civilian, stop current action (#6542) 
* On captureCivilianUnit, stop current action

* Remove excess import

Co-authored-by: itanasi <spellman23@gmail.com>
 2022-04-15 16:23:00 +03:00
Yair Morgenstern
94e8264d36 4.0.6-patch1 
Better timesaving for arrows that doesn't keep arrows when we disable view
 2022-04-13 21:17:41 +03:00
Yair Morgenstern
8a32be0ca2 4.0.6 2022-04-13 18:53:46 +03:00
Yair Morgenstern
9d0c4c117c
Version rollout (#6538) 
* Bump version and create initial changelog entry

* Update Italian.properties (#6535)

* Update Filipino.properties (#6532)

* Update Filipino.properties

* Update Filipino.properties

* Update Simplified_Chinese.properties (#6529)

* Update Simplified_Chinese.properties

v4.0.5 translation 1

* 4.0.5 Simpified_Chinese translation 2

4.0.5 Simpified_Chinese translation 2

* Update French.properties (#6524)

* Update Polish.properties (#6523)

* Update Spanish.properties (#6517)

Several rewordings, fixes and homogeneization of terms.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Derdotox <103372983+Derdotox@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
 2022-04-13 18:48:10 +03:00
SomeTroglodyte
04c9be38c7
MusicController - Can catch exceptions from Gdx.app.loop and replaces Timer on desktop with a callback from OpenALLwjgl3Audio.update (#6526) 2022-04-13 18:30:01 +03:00
Xander Lenstra
b45a2f471e
Fixed a bug where production would not be retained when changing from an obsolete unit to its upgraded version when that upgraded version was unique to the nation (#6520) 
* Fixed a bug where production would not be retained when chaing from an obsolete unit to its upgraded version when that upgraded version was unique to the nation

* Removed function

* Extracted to val
 2022-04-13 18:29:50 +03:00
Yair Morgenstern
84ca296a5c Discord suggestion - have allied city states see all tiles of their ally, so they can support them militarily 2022-04-10 22:13:27 +03:00
heipizhu4
55b3c2e644
Update README.md (#6521) 2022-04-10 18:13:10 +03:00
Yair Morgenstern
a46923a187 Bad import got in 2022-04-09 23:15:48 +03:00
Yair Morgenstern
9169ec1e42 Hopefully got rid of ANRs when entering a link when the app has been closed for too long? I think that's the problem? 2022-04-09 23:08:12 +03:00
Yair Morgenstern
76284c923e Hopefully got rid of ANRs on shutdown 2022-04-09 23:00:33 +03:00
Yair Morgenstern
15f3e47809 Don't update arrows if the user isn't displaying arrows - this is most users 2022-04-09 22:57:48 +03:00
Yair Morgenstern
b8d9dd1af3 Hopefully improved continuous rendering's framerate, to solve some ANRs 2022-04-09 22:51:18 +03:00
Yair Morgenstern
9fa3d8de2f 4.0.5 2022-04-09 22:41:12 +03:00
Yair Morgenstern
a8484eea6f Resolved #6513 - Diplomatic Victory check not triggering for human player 2022-04-09 22:37:40 +03:00
Yair Morgenstern
5447f01f1d
Version rollout (#6514) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#6505)

* Update French.properties (#6503)

* Update German translation (#6501)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-04-09 22:37:23 +03:00
Yair Morgenstern
1c13201a23
Added borders to minimap (#6506) 
* Added borders to minimap

* Heavier borders

* Minimap improvements after @SomeTroglodyte's comments
 2022-04-09 22:35:15 +03:00
SomeTroglodyte
fe82f773da
Make Icons clickable in religions per city display (#6497) 
* Make Icons clickable in religions per city display

* Add tutorial mention of the religious icon click feature

* Fix merge import mistakes
 2022-04-09 22:18:19 +03:00
SomeTroglodyte
eaef02bac6
Nicer NotificationScroll (#6511) 
* Nicer NotificationScroll

* Nicer NotificationScroll - patch1
 2022-04-09 21:21:32 +03:00
Yair Morgenstern
286e800b96 Resolved #6492 - package reorg 2022-04-08 13:01:37 +03:00
Xander Lenstra
c45885c763
Fixed a bug where crosshairs are everywhere with the 'attack when embarked' unique (#6507) 2022-04-08 12:26:45 +03:00
Leonard Günther
a2a8c0aab5
Fixed turn checker crashes (#6508) 
* Fixed turn checker failure

when UncivGame.current goes out of scope

* Cleanup

* Less changed lines

* Added documentation
 2022-04-08 12:26:29 +03:00
Yair Morgenstern
3a5900b442 Cities that become capital no longer continue being razed 2022-04-08 00:45:11 +03:00
Yair Morgenstern
b728748cfa 4.0.4 2022-04-06 23:43:29 +03:00
Yair Morgenstern
4080718cc3
Version rollout (#6498) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#6496)

* Update Filipino.properties

Added a few

* Update Filipino.properties

* Update Filipino.properties

fixed errors

* Update Simplified_Chinese.properties (#6494)

4.0.3 translation 1

* Update Dutch.properties (#6489)

Added some missing translations
Changed the translations of Mercantile and Cultured as those translations did not fit in the context

* Update Indonesian.properties (#6487)

* Update French.properties (#6482)

* Update Russian.properties (#6480)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#6477)

* Update German translation (#6476)

* Update Spanish.properties (#6475)

General grammar improvement and some rewordings.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
 2022-04-06 23:25:24 +03:00
Ouaz
b65d30a8ae
Update template.properties (#6484) 
* Update template.properties

- Fix untranslatable entry "Revoke protection for" (see comment in #6131)

* Fix capitalization for "protection"
 2022-04-06 23:20:02 +03:00
Yair Morgenstern
5a368e47d9 Resolved #6490 - custom User-Agent for requests 
Also solved default port override, which is not ideal
 2022-04-06 23:17:53 +03:00
Yair Morgenstern
9ef42f2a56 Caught bad URL parsing exceptions 2022-04-06 23:04:15 +03:00
Yair Morgenstern
360d739b97 Resolved ANRs when opening Options menu 
Was due to system fonts taking a long time to load
 2022-04-06 22:57:27 +03:00
SomeTroglodyte
83327dabe8
Fix Goddess of Protection - maybe (#6493) 
* Fix Goddess of Protection - maybe

* Improve TextSimilarity for case-only differences
 2022-04-06 20:24:35 +03:00
SomeTroglodyte
a4babeda0b
Move SimpleHttp object (#6479) 
* Change TabbedPager mechanism to communicate page activation

* Change TabbedPager mechanism for fixed content

* OptionsPopup better use of TabbedPager

* TabbedPager arrow keys

* After-merge patch

* Move SimpleHttp

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-04-05 21:05:59 +03:00
SomeTroglodyte
8385f814a6
Tabbed pager architecture update (#6460) 
* Change TabbedPager mechanism to communicate page activation

* Change TabbedPager mechanism for fixed content

* OptionsPopup better use of TabbedPager

* TabbedPager arrow keys

* After-merge patch

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2022-04-04 18:06:58 +03:00
Yair Morgenstern
5876047bda Resolved #6469 - solved check server connection errors on Android 2022-03-31 23:36:42 +03:00
Yair Morgenstern
73b6ee9af0 4.0.3 2022-03-31 23:17:09 +03:00
SomeTroglodyte
357800a80e
Missing translations cleanup (#6452) 2022-03-31 23:14:35 +03:00
Yair Morgenstern
443a15dd9b
Version rollout (#6473) 
* Bump version and create initial changelog entry

* Update Finnish.properties (#6472)

* Update Indonesian.properties (#6462)

* Update Spanish.properties (#6461)

Some unpleasing grammar mistakes fixed.

* Update French.properties (#6459)

* Update Spanish.properties (#6457)

* Update German translation (#6450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tom K <tom.kostiainen@andritz.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2022-03-31 23:14:04 +03:00
Xander Lenstra
d417556720
Added a unique for attacking when embarked (#6464) 
* Added a unique for attacking when embarked

* Implemented requested changes

* Fixed withdrawel probability
 2022-03-31 23:06:42 +03:00
청하늘
d87d83f686
Improved city name generation (#6446) 
* Improved city name generation

* Improved city name generation 2

* Optimized city name generation
 2022-03-31 23:05:54 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463) 
* Typed denmarks unique and generalized it

* Added support for deprecated unique
 2022-03-31 23:05:37 +03:00