Commit Graph

6246 Commits

Author SHA1 Message Date
yairm210
2c9e702639 Merge remote-tracking branch 'origin/master' 2021-10-31 10:32:59 +02:00
yairm210
1af01dc693 Fixed music download error 2021-10-31 10:32:50 +02:00
Yair Morgenstern
715a810b9c
Update buildAndDeploy.yml
Release tag belongs to release section
2021-10-30 22:25:10 +03:00
yairm210
c8f2d337c3 3.17.13 2021-10-30 20:41:59 +03:00
Yair Morgenstern
e53d611f4a
Translations update (#5610)
* Update translation: Simplified Chinese (#5606)

* The currently missing german lines (#5596)

* Update Indonesian.properties (#5595)

* Update Italian.properties (#5575)

* Update Swedish.properties (#5574)

Co-authored-by: Zoron <zoronlivingston@gmail.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-10-30 20:33:21 +03:00
will-ca
79ec9a461a
Show construction icons in Cities Overview. (#5602)
* Show construction icons in Cities Overview.

* Don't try to draw images for empty Cities Overview constructions.
2021-10-30 20:25:55 +03:00
Yair Morgenstern
860e788fb5
Separate unit automation (#5592)
* Should resolve #5534 and the long-standing request of "move after automate" by separating the automated movement from the actual end of turn

* Added translation

* Automated units move in a separate thread to avoid UI freezing
2021-10-30 19:02:43 +03:00
asda488
72ffeaddce
Remove Discord RPC checks for unsuitable devices (#5594)
* Allow Discord RPC disabiling on ARM devices

* Remove Discord RPC check
2021-10-30 19:02:24 +03:00
SimonCeder
bfe0b68ab8
Barbarian units (#5589)
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00
SomeTroglodyte
6172a893b8
Fix PercentProductionBuildings and PercentProductionWonders (#5588) 2021-10-29 11:29:03 +03:00
SimonCeder
03cebbdd42
Fix for broken saves in #5573 (#5587)
* no new camps in 4 tiles for 15 turns after cleared

* can't spawn land units on water or vice versa, unit choice

* UniqueType.MustSetUp

* sometroglodyte's fixes
2021-10-28 22:31:20 +03:00
Xander Lenstra
4c053ddc99
Revert "Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577)" (#5585)
This reverts commit db6e588479.
2021-10-28 22:01:06 +03:00
SomeTroglodyte
8c781bc0d2
Minor hardening of music against OpenAL quirks (#5586) 2021-10-28 22:00:14 +03:00
Xander Lenstra
db6e588479
Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577)
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown
2021-10-28 18:02:30 +03:00
GGGuenni
defc9262c2
GameInfoPreview upload as Metadata (#5584)
* Added Upload and Download functionality

* Add preview upload where gameInfo is uploaded
2021-10-28 18:00:07 +03:00
SimonCeder
d8bb60f06c
Barbarian fixes (#5573)
* no new camps in 4 tiles for 15 turns after cleared

* can't spawn land units on water or vice versa, unit choice

* UniqueType.MustSetUp
2021-10-28 17:59:27 +03:00
yairm210
87d24e89c4 3.17.12 2021-10-27 21:23:20 +03:00
Yair Morgenstern
4466de9899
Translations update (#5572)
* Update Brazilian_Portuguese.properties (#5564)

* Update Italian.properties (#5551)

* Update French Translation (#5538)

* Update French Translation

* Update French.properties

* Filipino.properties (#5331)

* Filipino.properties

Sorry if I was not able to continue this. I will try to continue it now.

* Updated Version

I'll continue editing this whenever I have spare time.

* Update 2

Co-authored-by: PredoTop <93168287+PredoTop@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Gloadonix <56483221+Gloadonix@users.noreply.github.com>
Co-authored-by: SunnySunset <88270612+SunnySunset@users.noreply.github.com>
2021-10-27 21:19:52 +03:00
yairm210
bc0db35077 Resolved #5571 - text-fix to "four victory types" 2021-10-27 21:16:38 +03:00
SomeTroglodyte
21d2f7b714
Clarify relation Oil well / Refrigeration a little (#5570) 2021-10-27 20:08:04 +03:00
GGGuenni
ca1d070c81
Improved MultiplayerScreen performance (#5527)
* Added MultiplayerGameInfo

* Added usage of MultiplayerGameInfo

* Integrate MultiplayerGamInfo into GameInfoPreview

* Replaced MultiplayerGameInfo with GameInfoPreview

* Correction in function docs

* PR cleanup

* Added currentTurnStartTime from merge

* Fixed resign not propagating to preview
2021-10-27 16:30:25 +03:00
SimonCeder
446c3fb97a
Conquistadors only settle other continents (#5566)
* conquistadors only settle other continents

* make it a conditional
2021-10-27 07:08:23 +03:00
SimonCeder
04196974a4
Improve AI performance vs barbarians; AI settlers (#5562)
* AI more effective against barbarians

* Discourage settler death marches

* game speed

* optimization
2021-10-27 07:07:09 +03:00
Xander Lenstra
33956673f5
Added information on the changed victory types (#5568) 2021-10-26 18:31:12 +03:00
SomeTroglodyte
eaa765a619
doCitadelDamage minor optimization (#5565) 2021-10-26 12:16:06 +03:00
Xander Lenstra
693cf97849
Made some improvements to the religion UI (#5561)
* Made some improvements to the religion UI

* Added translatable strings

* Added some pretty colors - code based on code provided by SomeTroglodyte way back

* I hate spaces

* Moar colourz
2021-10-26 09:01:00 +03:00
Xander Lenstra
b2557de5d0
Fixed a bug where every improvement pretended to be a citadel (#5563) 2021-10-26 08:31:39 +03:00
Xander Lenstra
cbfbec166b
Fixed a bug where great prophets gained through non-conventional means did not receive bonus spreads provided by wonders (#5558)
* Fixed a bug where great prophets gained through non-conventional means did not receive bonus spreads provided by wonders

* Fixed overextended indentation
2021-10-25 23:56:48 +03:00
Xander Lenstra
5d9c1266d7
Fixed ruins having two faith bonuses that could apply at the same time (#5545)
* Fixed ruins having two faith bonuses that could apply at the same time

* Added turn restrictions on ruins
2021-10-25 19:09:39 +03:00
Colin Vanden Heuvel
4c19347a89
Provide more information to waiting players in multiplayer (#5508)
* Add some very small Quality-of-Life improvements for multiplayer games

- GameInfo.kt
 - Add timestamp for the start of the last turn to save info, hopefully
   this will enable a multiplayer turn timer in the near future

- MultiplayerScreen.kt
 - Current turn indicator for multiplayer games now shows for how long it
   has been the current player's turn.

- WorldScreen.kt
 - Next Turn Action will display which player we are waiting for rather
   than the generic "Waiting for other players..."

* Update text for translations and add better elapsed times

template.properties
- Add translation templates for waiting turn information

German.properties
- Provide German translation for waiting turn info

Japanese.properties
- Provide Japanese translation for waiting turn info

MultiplayerScreen.kt
- Add translation brackets for waiting turn info
- Add a function which determines whether to represent
  elapsed time in Minutes, Hours, or Days (and does so)

WorldScreen.kt
- Add translation brackets for waiting turn info

* Fix line translated endings as per request

MultiplayerScreen.kt
- Translation for the "Last refresh:/Current Turn:" display no longer
  includes line endings
- "Last refresh:/Current Turn:" display now uses LF line endings only

* Show generic "Waiting for" message in single player

WorldScreen.kt
- Place an additional condition for getNextTurnAction which selects the
  generic "Waiting for" message in single player and the civ-specific
  one in multiplayer

Co-authored-by: Colin S. Vanden Heuvel <colin.vandenheuvel@wisc.edu>
2021-10-25 19:09:03 +03:00
SimonCeder
6fdbc8a8da
fix bug with contest quests (#5554) 2021-10-25 19:08:43 +03:00
yairm210
741f2522b9 3.17.11 2021-10-24 20:54:39 +03:00
Yair Morgenstern
8e9b7026c0
Translations update (#5543)
* Update Swedish.properties (#5541)

* Update Simplified_Chinese.properties (#5539)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#5531)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5529)

* Update dutch translation (#5550)

* work on dutch translation

* fix missing placeholder

* fix incomplete string translation

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
2021-10-24 20:51:13 +03:00
Xander Lenstra
3681b45592
Fixed Siam's unique applying multiple times (#5547) 2021-10-24 20:48:14 +03:00
Xander Lenstra
f474cf1516
Added missing unit type filter (#5548) 2021-10-24 20:47:47 +03:00
Xander Lenstra
b66443574e
Enumified all remaining resource & improvement uniques (#5523)
* Added conditionals & enumified improvement stat uniques

* Enumified all the other uniques

* Fixed bug where improvemen stat icons didn't show up in tech tree & reviews
2021-10-24 20:47:29 +03:00
Xander Lenstra
e9d36ea0ce
Fixed a bug where AI would not found religions (#5544) 2021-10-24 20:44:54 +03:00
Xander Lenstra
074676c342
Fixed a bug where buying units with faith would not increase in cost (#5546) 2021-10-24 20:44:03 +03:00
Yair Morgenstern
6ac3547b8e
City construction speedup with caching stats from tiles (#5536)
* City construction speedup with caching stats from tiles

* Reduced cityStats.update to only one cityConstructions.getStats() call, improving performance by another 30% approx
2021-10-24 09:05:05 +03:00
yairm210
9a7ea263d6 Resolved #5530 - fixed "[stats] from all [stat] buildings" check for stat relatedness 2021-10-22 00:02:14 +03:00
SimonCeder
9b798b3588
Inner Sea map type (#5535)
* Inner Sea map type

* space in templates
2021-10-21 23:51:24 +03:00
yairm210
cb4aef7b35 Fixed tests 2 2021-10-20 23:26:01 +03:00
yairm210
24f3e784fa Fixed tests 2021-10-20 23:18:03 +03:00
yairm210
60f0724b42 Hardcore typing for uniques in how to improve city UI performance 2021-10-20 22:11:31 +03:00
yairm210
dda2f6a37c Deprecation of old uniques 2021-10-20 21:35:13 +03:00
yairm210
50225101ea Resolved #5494 using new overloads 2021-10-20 21:28:02 +03:00
yairm210
3ae6d675cd 3.17.10 2021-10-20 21:20:24 +03:00
Yair Morgenstern
f343cb2c79
Translations update (#5524)
* Update Russian.properties (#5517)

* Update Thai.properties (#5514)

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update German translation (#5511)

* Update Indonesian.properties (#5510)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5507)

* Update Swedish.properties (#5505)

Co-authored-by: GD-alt <62538561+GD-alt@users.noreply.github.com>
Co-authored-by: Arnattha <92711795+Arnattha@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-10-20 21:14:26 +03:00
Xander Lenstra
13859e78c1
Unified and enumified production percentage bonus uniques (#5521) 2021-10-20 16:57:55 +03:00
SimonCeder
ae8c72adbc
Improvements fog of war (#5504)
* fog of war for improvements

* fix spectator mode

* unnecessary imports

* getShownImprovement
2021-10-20 16:42:15 +03:00