mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 23:37:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,684 Commits 7 Branches 1,036 Tags 1.1 GiB
4526b0f17d
Commit Graph

7684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xander Lenstra
b20fd27d42
Updated readme roadmap (#7662) 
Basically removing things that have been implemented in the past and adding a link to #4697.
 2022-08-14 22:05:23 +03:00
Xander Lenstra
b1727f9360
Fix spies being gained in non espionage games (#7661) 
* 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

* No spies gained when espionage is disabled

* Added missing function
 2022-08-14 18:37:39 +03:00
Yair Morgenstern
87c1662462
Hopefully resolved #7663 by upgrading androidx.work version 2022-08-14 14:36:12 +03:00
Xander Lenstra
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
MindaugasRumsa51
89979748a1
Notificiations tab scroll fix in empire overview (#7536) 
* Update NotificationsOverviewTable.kt

* Update EmpireOverviewCategories.kt

* Update NotificationsOverviewTable.kt
 2022-08-13 22:43:42 +03:00
OptimizedForDensity
9967642573
Fix infinite city-state tribute bug (#7653) 2022-08-13 22:43:25 +03:00
Ouaz
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
Yair Morgenstern
9898789772 4.2.4 2022-08-12 14:36:01 +03:00
Yair Morgenstern
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
OptimizedForDensity
8f23ae52cc
List which city owns each tile in the city screen UI (#7631) 2022-08-12 14:26:09 +03:00
OptimizedForDensity
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
Yair Morgenstern
306aef4c67 Resolved #7647 - Mod translations loaded upon lod download 2022-08-12 14:24:22 +03:00
OptimizedForDensity
a4424d2ab1
Several pathfinding optimizations (#7523) 
* Slight pathfinding optimization

* Cache canReach()

* More optimizations

* Use hashset instead of two arraylists
 2022-08-08 17:13:27 +03:00
Yair Morgenstern
0df499b9fe Increment sdk version to 32, to see if it passes Github build 2022-08-08 14:02:49 +03:00
Ouaz
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
Yair Morgenstern
cf44f41372 Increment sdk version to 31, to see if it passes Github build 2022-08-08 00:02:15 +03:00
Yair Morgenstern
068d903ee5 Revert ktx version 2022-08-07 23:59:28 +03:00
Yair Morgenstern
b296d014b5 4.2.3 2022-08-07 23:51:02 +03:00
Yair Morgenstern
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
OptimizedForDensity
b630388984
Add unit type to Civilopedia (#7620) 2022-08-07 17:37:11 +03:00
OptimizedForDensity
f1a69744cb
Fix mod translation file generation (#7629) 2022-08-07 17:36:55 +03:00
Xander Lenstra
44fdf53b05
Added a hidden option for enabling espionage (#7615) 2022-08-06 22:05:44 +03:00
Xander Lenstra
baeae5c8ae
Occupied cities have +2 extra unhappiness (#7628) 2022-08-06 22:05:21 +03:00
itanasi
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.

* Rename variables

* Even if you can't see the Interceptor Tile, still get full info if not killed
 2022-08-06 13:23:42 -04:00
Kostiantyn Kolesnichenko
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
Liam A
00e1ed25a1
Made invisible units not become visible just by being next to an owned tile. (#7618) 2022-08-06 11:58:57 +02:00
Xander Lenstra
35eb71c937
Removes the option for disabling religion (#7606) 
* Removes the option for disabling religion

* Deprecated religionEnabled variable, set default to `true` and removed in cases where it shouldn't have effect
 2022-08-05 11:46:06 -04:00
Yair Morgenstern
b14870fbc5 Reinstated desugaring since it broke the build 2022-08-05 16:11:02 +03:00
OptimizedForDensity
6309bbdcb6
Fix bug related to resuming games (#7613) 2022-08-05 14:01:57 +02:00
Yair Morgenstern
1dc7c6bfa8 Android gradle update - explicitly state build tools version, update to 32.0.0, remove desugaring. 2022-08-05 11:00:04 +03:00
Yair Morgenstern
948b95a9dc Android gradle update - explicitly state build tools version, remove desugaring 2022-08-05 10:49:38 +03:00
Xander Lenstra
7a749fdec1
Added 'without resource' conditional (#7611) 2022-08-05 10:16:30 +03:00
Xander Lenstra
121859defb
Added a unique for destroying improvements on attack (#7605) 
* Added a unique to destroy improvements on attack

* Removed last part of unique, as we have the `in [tileFilter] tiles` conditional
 2022-08-04 20:12:42 -04:00
Yair Morgenstern
a1357414a0 4.2.2 2022-08-04 18:37:23 +03:00
Yair Morgenstern
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
MindaugasRumsa51
5cc77dad3e
Update ReligionAutomation.kt (#7581) 2022-08-04 18:29:20 +03:00
Yair Morgenstern
c4747524d4
Disabled packing base images when running from JAR (#7478) 2022-08-04 10:35:01 +03:00
Nika Kasradze
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
itanasi
61d48a5c37
Add Damage numbers to Battle Notifications (#7587) 
* Initial changes

* Adding damage numbers
 2022-08-03 20:24:19 +03:00
OptimizedForDensity
67fbc07552
Add translation for XP on World Screen (#7595) 2022-08-03 20:22:46 +03:00
Xander Lenstra
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
itanasi
0da7918a94
Minor Compile change (#7588) 2022-08-03 10:42:41 -04:00
itanasi
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
xk730
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
itanasi
436917f2af
Allow Citizen Management to pick any tile owned within 3 tiles (#7533) 2022-08-03 16:08:46 +02:00
Ouaz
7f1c91ddaf
Update template.properties (#7576) 
Fix untranslatable strings (issue #6131)
 2022-08-02 22:57:10 +02:00
OptimizedForDensity
30e1dcbcdd
Fix broken translation (#7580) 2022-08-02 18:23:37 +03:00
Yair Morgenstern
a3e7d5ccb6 fastlane cleanup for bad translations 2022-08-01 23:39:03 +03:00
Yair Morgenstern
1d83d16e85 4.2.1 2022-08-01 19:50:30 +03:00
Yair Morgenstern
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