f64c5b36d0
added game option to disable unwanted spectators from a multiplayer game ( #7290 )
...
* feature
* only display option if onlineMultiplayer is enabled
* translatable
* no more negativity
* 1
* threw UncivShowableException
* reviews
* reviewed myself
2022-08-22 21:11:12 +03:00
121bda2833
4.2.5
2022-08-22 21:09:04 +03:00
87a4b57bf0
Version rollout ( #7688 )
...
* Bump version and create initial changelog entry
* Update Vietnamese.properties (#7686 )
* Update Filipino.properties (#7677 )
* Update Filipino.properties
* Update Filipino.properties
* update traditional_chinese for Maya. (#7675 )
* update traditional_chinese for Maya.
* update
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
* Update Catalan.properties (#7667 )
* Update Catalan.properties
* Update Catalan.properties (names of spies)
* Update Catalan.properties
* Update Indonesian.properties (#7664 )
* Update Indonesian.properties
* Update Indonesian.properties
* Ukrainian translations (#7659 )
* Ukrainian translations
* Misprints corrected
* New strings from a master branch
* Translations for the spy names
* More names translated
* Update German translation (#7657 )
* Update French.properties (#7654 )
* Update Simplified_Chinese.properties (#7652 )
* Update Simplified_Chinese.properties
* Fix error
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Italian.properties (#7651 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Weltzer <63961560+Weltzer@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: kensvin <kensvin28@gmail.com >
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@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 >
2022-08-22 21:02:45 +03:00
18ef8fc20e
Removed legacy tileset code ( #7658 )
...
* Removed legacy tileset code
which was only used for the "Default" tileset
* Updated "Default" tileset to support new rendering
* Updated docs
* Fixed fogOfWar coloring bug
* Removed cityImage variable completely
* Renamed variable out to baseHexagon
* Moved color lerp out of for loop
* Renamed "Default" tileset to "Minimal"
* Made "HexaRealm" the games fallback tileset
* Implemented requested changes
* Readded accidentally removed variable
* Reverted updateTileImage back to foreach loop
Since indices are not needed anymore
* Regenerated game.atlas and game.png
2022-08-22 13:02:52 +02:00
c5c0f24a5f
Add "Wait" command in "Idle Units" tutorial ( #7672 )
...
* Add "Wait" command in "Idle Units" tutorial
* Improve wording for "Wait" command tutorial
2022-08-18 16:16:13 +03:00
90e582a0c3
Add an icon for "Wait" unit action ( #7668 )
2022-08-16 12:30:37 +02:00
87c1662462
Hopefully resolved #7663 by upgrading androidx.work version
2022-08-14 14:36:12 +03:00
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies ( #7641 )
...
* Handfull of comment questions, small refactorings
* Code changes
* Reworded a unique, removed a file
* Added spy names for all nations, minor consistency change
* Removed debug output
* Added an empty constructor so gdx can reconstruct it
2022-08-13 22:45:16 +03:00
9326f47cdf
Fix an untranslated string ( #7656 )
...
when trying to launch a new game on a map that is not compatible with the ruleset.
2022-08-13 13:08:53 +02:00
9898789772
4.2.4
2022-08-12 14:36:01 +03:00
afa2327828
Version rollout ( #7650 )
...
* Bump version and create initial changelog entry
* Update Simplified_Chinese.properties（2nd attempt） (#7646 )
* Update Simplified_Chinese.properties
* A checkpoint for undoing commits
* Update Simplified_Chinese.properties
* Fix error
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Indonesian.properties (#7644 )
* Update German translation (#7642 )
* Update German translations
* Updat German translations
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update Polish.properties (#7640 )
* Update Spanish.properties (#7639 )
* Update Spanish.properties
* Update Spanish.properties
* Update Spanish.properties
* Update Italian.properties (#7636 )
* Perform housekeeping for Ukrainian translations - symbols, word order, and extra translations (#7626 )
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
* Update Catalan.properties (#7614 )
* Update Catalan.properties
* Update Catalan.properties. Change verbal periphrases and apostrophe symbol.
* Update Catalan.properties
* Update French.properties (#7608 )
* Update French.properties
* Update French.properties
Update translation to 4.2.3
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com >
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name >
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
2022-08-12 14:30:26 +03:00
8f23ae52cc
List which city owns each tile in the city screen UI ( #7631 )
2022-08-12 14:26:09 +03:00
28f65a7599
Add free belief unique + refactor a few religion functions ( #7612 )
...
* Free belief unique
* Fix edge case
* Another edge case
* Bug fixes
* Fix some conditions
* Refactor another function
* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)
* Fix the edge case handling
* Cleanup
* Reviews + more refactoring and cleanup
* Update comments
* Unnecessary comment
* Improvements
* Typo
2022-08-12 14:24:42 +03:00
0df499b9fe
Increment sdk version to 32, to see if it passes Github build
2022-08-08 14:02:49 +03:00
9ca5b0f850
Fix missing "HP" in battle notifications ( #7638 )
...
These two missing "HP" caused these two lines to not be translated in the notification log.
2022-08-08 08:50:02 +03:00
cf44f41372
Increment sdk version to 31, to see if it passes Github build
2022-08-08 00:02:15 +03:00
068d903ee5
Revert ktx version
2022-08-07 23:59:28 +03:00
b296d014b5
4.2.3
2022-08-07 23:51:02 +03:00
29b6b35f56
Version rollout ( #7635 )
...
* Bump version and create initial changelog entry
* Update German translation (#7634 )
* Update Korean.properties (#7630 )
* fix a few style issues in the German translation (#7621 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Yattong the Mackerel <saud2410@naver.com >
Co-authored-by: Kristian Rother <krother@academis.eu >
2022-08-07 23:48:01 +03:00
b630388984
Add unit type to Civilopedia ( #7620 )
2022-08-07 17:37:11 +03:00
69e6093e2e
Update Damage Notifications ( #7623 )
...
* Minor Compile change
* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification
* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification
* Revert "Update to -[amount] HP for battle notifications"
This reverts commit 63961029da
2022-08-06 13:23:42 -04:00
7a30e29e07
Add missing string to the translations template file ( #7627 )
...
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
2022-08-06 09:14:21 -04:00
b14870fbc5
Reinstated desugaring since it broke the build
2022-08-05 16:11:02 +03:00
1dc7c6bfa8
Android gradle update - explicitly state build tools version, update to 32.0.0, remove desugaring.
2022-08-05 11:00:04 +03:00
948b95a9dc
Android gradle update - explicitly state build tools version, remove desugaring
2022-08-05 10:49:38 +03:00
a1357414a0
4.2.2
2022-08-04 18:37:23 +03:00
7473213d77
Version rollout ( #7601 )
...
* Bump version and create initial changelog entry
* Update Ukrainian translations - add missing, correct existing (#7597 )
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
* Update Simplified_Chinese.properties (#7590 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
* Update Korean.properties (#7585 )
* Update Catalan.properties (#7583 )
* Update French.properties (#7575 )
* Update Spanish.properties (#7574 )
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
* Update Italian.properties (#7572 )
* Update Dutch.properties (#7547 )
* Update Dutch.properties
* Paar spellingsdingetjes eruit gehaald
* Vertalingen toegevoegd
Verwarrend: speler-ID en gebruiker-ID worden door elkaar gebruikt! vb regel 675
Mag het pull request worden geamendeerd of moet er een apart pull request gemaakt worden?
* Paar spellingsdingetjes
* Nieuwe vertalingen
* Fixed tests not working
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name >
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: Yattong the Mackerel <saud2410@naver.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: TPunkiee <110175928+TPunkiee@users.noreply.github.com >
2022-08-04 18:32:20 +03:00
33ca2d8ef9
fix #7565 : Remove duplicate "Consumes ..." lines of city screen ( #7592 )
...
* fix #7565 : Delete one "Consumes ..." lines of city screen
* fix #7565 : Delete one "Consumes ..." lines of city screen
* fix #7565 : Delete one "Consumes ..." lines of city screen
2022-08-03 13:38:35 -04:00
61d48a5c37
Add Damage numbers to Battle Notifications ( #7587 )
...
* Initial changes
* Adding damage numbers
2022-08-03 20:24:19 +03:00
67fbc07552
Add translation for XP on World Screen ( #7595 )
2022-08-03 20:22:46 +03:00
01cc67cee4
Reworded a tutorial, deleted unused line ( #7594 )
...
* Reworded a tutorial, deleted unused line
* Fixed faith symbol
2022-08-03 20:22:29 +03:00
2671babefd
Fix Air Sweep Notification Translations ( #7577 )
...
* Fix Air Sweep Notification Translations
* Modify all translation files
* Fix a missing space
2022-08-03 17:34:21 +03:00
ebafe97e67
Updated the interface introduction content in the Encyclopedia of civilization ( #7586 )
...
* Add files via upload
* Upload the World_Screen.png
This will match the latest presentation
* Upload the World_Screen.png
because it is so old
* Update Tutorials.json
The Tutorials.json add the ：
㉑: The Multiplayer Button - Here will help you easily check your current multiplayer game",
This will match the latest presentation
and
ⓗ: Here you will see what you currently have ☮Faith quantity, of course, if you don't open it ☮Faith Before starts the game, this will be ‘Off’
2022-08-03 17:33:37 +03:00
7f1c91ddaf
Update template.properties ( #7576 )
...
Fix untranslatable strings (issue #6131 )
2022-08-02 22:57:10 +02:00
a3e7d5ccb6
fastlane cleanup for bad translations
2022-08-01 23:39:03 +03:00
1d83d16e85
4.2.1
2022-08-01 19:50:30 +03:00
99cda99f41
Version rollout ( #7571 )
...
* Bump version and create initial changelog entry
* Update Korean.properties (#7569 )
* Update Korean.properties
Checking every 10~20 lines...
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Ukrainian translations (#7560 )
* Update Ukrainian.properties - add missing translations
* Missing translations are added
* Trailing spaces are restored
* More translations are added
* More translations are added
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
* Hungarian translation #idk (#7558 )
Another translation coming up from here ^^
* Update Polish.properties (#7556 )
* Update Italian.properties (#7555 )
* Update Italian.properties
* Update Italian.properties
* Update Italian.properties
* Update Italian.properties
* Update Italian.properties
* Update French.properties (#7553 )
* Update Spanish.properties (#7552 )
* Update Spanish.properties
Woah, I got fuzzy with so many "Interceptor" conjugations 0_o\
* Update Spanish.properties
* Improve Spread Religion tutorial
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com >
* Update Catalan.properties (#7551 )
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Turkish.properties (#7548 )
`Domalan` is too local a translation and has other meanings. `Yermantarı"` is better.
* Update Simplified_Chinese.properties (#7546 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Indonesian.properties (#7541 )
* Update Indonesian.properties
* Fixed tests
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Yattong the Mackerel <saud2410@naver.com >
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com >
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com >
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: Selim <slmyldz41@gmail.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
2022-08-01 19:48:09 +03:00
6a943bb46f
Rename "Show minimap" to "Minimap size" ( #7567 )
2022-07-31 15:56:45 -04:00
8331b87f64
Removed duplicate placeholders ( #7544 )
2022-07-28 16:18:01 +03:00
c738da892c
4.2.0
2022-07-28 09:12:57 +03:00
a6b55ca14a
Version rollout ( #7538 )
...
* Bump version and create initial changelog entry
* Translate a few missing lines to Ukrainian (#7537 )
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
* Update Finnish.properties (#7535 )
* Update Finnish.properties
* Update Finnish.properties
* Update Korean.properties (#7531 )
* Update Traditional_Chinese.properties (#7527 )
* Update Polish.properties (#7525 )
* Update Catalan.properties (#7524 )
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Catalan.properties
* Update Russian.properties (#7520 )
* Update Lithuanian.properties (#7518 )
* Update Traditional_Chinese.properties (#7516 )
* Update Traditional_Chinese.properties
* Update Traditional_Chinese.properties
* Update German translation (#7511 )
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update German translation
* Update Simplified_Chinese.properties (#7509 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Indonesian.properties (#7506 )
* Update Filipino.properties (#7505 )
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Spanish.properties (#7503 )
* Update French.properties (#7501 )
* Update Swedish.properties (#7500 )
* Update Italian.properties (#7498 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name >
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com >
Co-authored-by: Securetux <110048962+Securetux@users.noreply.github.com >
Co-authored-by: Yattong the Mackerel <saud2410@naver.com >
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com >
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com >
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: SimonCeder <63475501+SimonCeder@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
2022-07-28 09:06:46 +03:00
4eb0038d10
Allows inquisitors to block holy cities ( #7521 )
...
* Inquisitors can disable holy cities
* Templates and notifications
* Combined with changes of previous religious PR
* Reviews
2022-07-27 22:18:04 +03:00
af6ab8e4e5
Add Air Sweep ( #7484 )
...
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay
* Adding Air Sweep Battle Table
* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile
* initial airsweep code
* Implement airSweep
* BattleTable indicates tile you're AirSweeping
* some notifications
* Clean up notifications.
Add icons
* Revert game.atlas and game.png
* Fix selection properly
* Update Vanilla UnitPromotions.json
* Better handling of movement use
comment cleanup
* missing credit
* Proper code so that Seas units also deal no damage
Adding Tutorials!
* Remove Intercept Bonus Damage/Protection
* Remove chance of Interceptor missing
* Battle Table a bit more consistent
* Defender also gets Air Sweep Modifiers
* Defender doesn't get bonus
* Remove unused getInterceptBonus
Combine logic
* Show damage in notifications for Air Sweep
* Randomize intercepting Civ and prioritize Air Units
* Remove debug code
* Updated atlas
* Clean up Uniques
* Object-ify DamageDealt for ease of reference
* code clean up
Co-authored-by: itanasi <spellman23@gmail.com >
2022-07-27 22:16:53 +03:00
9fa00a9fa9
change wording
2022-07-22 23:12:55 +02:00
0e00ec22c6
workers will replace city ruins
2022-07-22 20:53:01 +02:00
0e0e245365
Allow HexaRealm to render jungles on hills ( #7502 )
2022-07-22 14:30:58 +02:00
2f8acff08c
4.1.21
2022-07-21 09:33:35 +03:00
5b50106ea5
Version rollout ( #7496 )
...
* Bump version and create initial changelog entry
* Update Russian.properties (#7493 )
* Update Filipino.properties (#7487 )
* Update Simplified_Chinese.properties (#7480 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
2022-07-21 09:19:22 +03:00
06096eaa8e
Mod categories ( #7298 )
...
* feature
* more categories
* added categories
* filter installed part1
* display vanilla rulesets in rulesets category + fix download from URL not showing
* filter installed mods
* removed isVanilla variable
* only look at second topic
* same but for online mdos as well
* replaced tilesets with graphics
* translations
* code duplication
* removed vanilla content from rulesets
* combined the function into one
* revert amountPerPage even tough its already on master
* Filter class
* 1
* mutableListOf<>()
* mutableListOf<>() again
* getFilterText removed
* !categoryFilter(filter)
* matchesCategory
* if (modTopic.size < 2) return false
2022-07-21 09:15:26 +03:00
aa8cbb49a3
4.1.20
2022-07-18 19:19:39 +03:00
