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
6,601 Commits 7 Branches 1,036 Tags 1.1 GiB
c51e7a5e1e
Commit Graph

6601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
will-ca
19927d89ba
Use .toTextButton() in more places. (#5994) 
* Use toTextButton for WorldScreenTopbar "Overview".

* Use toTextButton for AddMultiplayerGameScreen "Paste gameID from clipboard".

* Use toTextButton in MultiplayerScreen.

* Use toTextButton for CityOverviewTable city.name.
 2022-01-19 14:16:21 +02:00
will-ca
b0ffae0da0
Refactor and unify some buttons that have a label next to an icon. (#5992) 
* Take Actor instead of image String for String.toButton icon.

* Remove superfluous Group size wrapper.

* Builder-style configuration for string icon buttons.

* Add a function to the big unify picker screen option buttons.

* Unify unit action string icon button.

* Unify TabbedPager string icon buttons.

* Unify EmpireOverviewScreen string icon buttons.

* Unify CivilopediaScreen string icon buttons.

* Unify GreaterPersonPickerScreen string icon buttons.

* Unify PromotionPickerScreen string icon buttons.

* Unify ImprovementPickerScreen string icon buttons.

* Unify DiplomaticVotePickerScreen string icon buttons.

* Unify OffersListScroll string icon buttons. (Also moves icon to left.)

* Unify UnitOverviewTable string icon buttons.

* Turn IconTextButton into a class.

* Separate icon parameters.

* Remove outdated arg and comment.

* Remove obsolete generic.
 2022-01-19 14:16:08 +02:00
Yair Morgenstern
8846c158fb
Resolved #5988 - Allow modded improvements (#5989) 
Current worker automation assumes A LOT about the current ruleset.
This is only step 1, which allows skipping irrelevant improvements to reach actually useful improvements.
Comments welcome.
 2022-01-18 01:58:43 +00:00
will-ca
e477e4917a
Missing template.properties fields for AddMultiplayerGameScreen. (#5993) 2022-01-17 22:23:56 +02:00
yairm210
b4214baf1f Smaller stars on the promotions, so they don't 'leak' outside the promotion image 2022-01-16 22:07:44 +02:00
yairm210
e074ed7546 Added civ icon to Battle Table when attacking cities 2022-01-16 21:09:43 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Yair Morgenstern
838b797699
Translations update (#5986) 
* Update English.properties. (Remove no-op translations.) (#5977)

* Update Spanish.properties (#5970)

* Update Italian.properties (#5966)

* I made some changes to the simplified Chinese translation file.  (#5987)

* Minor polishing up for accuracy and some translation

* Additional translation

* Update Simplified_Chinese.properties

Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
 2022-01-16 19:50:07 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized. 
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
 2022-01-16 19:10:30 +02:00
will-ca
9b121a478a
Clean up refactored pixel unit resolving. (#5979) 2022-01-16 18:43:49 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976) 
* Explain when cities can't be razed.

* Light refactoring and reword.

* Add update notice in translation strings.
 2022-01-16 18:43:33 +02:00
Yair Morgenstern
b813e0b38a
Fixed assumption that the current game is in the list of games gathered from preview files (#5981) 2022-01-16 18:42:45 +02:00
ravignir
b1517f0cde
Made attacked civilians lose 40 hp as in civ5. (#5978) 
Is it the smallest commit ever? xD
 2022-01-16 18:39:41 +02:00
will-ca
ec59533f82
Tint colour and not alpha in CityTileGroup. (#5969) 2022-01-16 03:03:23 +01:00
will-ca
b7d3a6c581
Fix a tiny and limited memory leak. (#5968) 2022-01-16 03:03:06 +01:00
yairm210
f8e9b6912e Merge remote-tracking branch 'origin/master' 2022-01-15 23:16:42 +02:00
yairm210
790bfc10b7 Resolved #5980 - "Cannot be built with" catches building equivalents as well 2022-01-15 23:16:28 +02:00
itanasi
9584389864
Capturing Civilians Not an Attack (#5974) 
* Change to not count civilian attacks

* Change to not count civilian attacks

Co-authored-by: temurakami <spellman23@gmail.com>
 2022-01-15 22:43:11 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00
Xander Lenstra
2986052397
Typed all tech uniques (#5967) 2022-01-14 17:44:53 +00:00
yairm210
8311e65120 Victory types capitalized 2022-01-14 12:21:53 +02:00
yairm210
e7042d24ea City state permutations normalized to "City-State" 
#5963
 2022-01-14 12:16:16 +02:00
yairm210
4dcb45408d Unique deprecation 2022-01-14 11:00:38 +02:00
yairm210
462ae2dad0 3.18.17 2022-01-14 10:49:22 +02:00
Yair Morgenstern
6e95a07572
More unit unique typing (#5952) 
* There are so many of these my gosh

* Fixed, good thing we have tests :)

* Fixed
 2022-01-14 10:43:13 +02:00
Yair Morgenstern
aaeb4f36d8
Translations update (#5965) 
* Polish translations (#5964)

* Update Polish.properties

Translated some technology names

* Update Polish.properties

Some translations of:
- City names
- Temples
- Buildings

* Update Polish.properties

Some random translations

* Update Indonesian.properties (#5948)

Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2022-01-14 10:37:35 +02:00
Yair Morgenstern
398e7903ef
Resolved #5930 - removed extraneous stat icons + resolved sorting problem they caused in Civilopedia tutorials. (#5959) 2022-01-14 10:11:45 +02:00
Xander Lenstra
7cb58eb82d
Typed all policy uniques (#5955) 
* Typed all policy uniques

* Reworded golden age length
 2022-01-14 10:11:30 +02:00
Yair Morgenstern
826b8f4826
Handling for multiplayer download errors (#5958) 2022-01-14 10:09:10 +02:00
Yair Morgenstern
4cce74253d
Abstracted file storage from the multiplayer data retrieval - this should allow implementations of both #5866 and #2679 for other implementations of IFileStorage (#5960) 2022-01-13 16:33:21 +00:00
Xander Lenstra
74d3854e45
Very likely fixed a bug that occasionally placed hills on top of mountains (#5946) 2022-01-11 23:30:25 +00:00
Xander Lenstra
8b846f8087
Typed a few unit uniques (#5951) 
* Typed a few unit uniques

* Fixed tests

* Actually implemented a unique type :)
 2022-01-11 23:24:58 +00:00
Yair Morgenstern
4308ad44ed
Removed silly crash for unteneble mods, and a try/catch that due to changes no longer caught hat it should have. (#5950) 2022-01-11 23:17:41 +00:00
Xander Lenstra
b8a437ed8c
Added a few missing template strings from the 'about' page of the settings (#5949) 2022-01-11 21:06:05 +02:00
AdityaMH
7a83f5091a
Fix incorrect Archer obsolete (#5947) 
* Fix incorrect Archer obsolete

* Sorry, from previous

* Bring back

* Fix other "Archer" forK
 2022-01-11 17:04:19 +02:00
Xander Lenstra
d809f3a132
Made all the other constants determining the strength of cities moddable (#5940) 2022-01-10 13:55:22 -08:00
Xander Lenstra
93a109b082
Fixed a bug where citadels did not damage nearby units (#5941) 
* Fixed a bug where citadels did not damage nearby units

* Fixed tests
 2022-01-10 13:32:48 -08:00
Xander Lenstra
0349e0a776
Updated the natural wonders for vanilla (#5943) 
* Updated the natural wonders for vanilla

* Might as well remove the faith ruins bonuses
 2022-01-10 13:28:05 -08:00
Xander Lenstra
3e6a190ab4
Unit tests for uniques (#5945) 
* Added a unit test file for uniques

* Added a few tests
 2022-01-10 22:01:14 +02:00
yairm210
1999364b9e Chore - more typified unit uniques 2022-01-10 21:53:13 +02:00
yairm210
c6a9f6a857 Chore - typified unit uniques 2022-01-10 21:13:59 +02:00
yairm210
a06c607c0c 3.18.16-patch1 2022-01-10 19:19:48 +02:00
Xander Lenstra
86f8dff39b
Fixed a crash when using conditionals in transient unit uniques (#5939) 2022-01-10 11:53:00 +02:00
yairm210
480beb83b3 3.18.16 2022-01-09 22:34:44 +02:00
Yair Morgenstern
32ab5f32bd
Translations update (#5937) 
* Update German.properties (#5936)

* Update German.properties

Some additional translation and corrections

* Update German.properties

* Create German.properties

corrections

* Update Ukrainian.properties (#5935)

Translate Crash screen messages

* Update French.properties (#5934)

* Update French.properties

* Add files via upload

* Add files via upload

* Delete French.properties

* Update French.properties

* Update French.properties

* Update German translation (#5931)

* Update Spanish.properties (#5929)

* Update Spanish.properties

I´m back... kind of.

* Update Spanish.properties

* Crash Screen Translated (#5926)

I have translated the Crash Screen.

Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>

Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: StepanIvasyn <57094070+StepanIvasyn@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: F. García <47331543+FranMer13@users.noreply.github.com>
Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>
 2022-01-09 21:46:24 +02:00
Yair Morgenstern
598f39e567
Deprecation of requiredBuildingInAllCities (#5922) 
* Deprecation of requiredBuildingInAllCities

* Should be a warning not an error
 2022-01-09 21:40:47 +02:00
Xander Lenstra
fc287bd9f3
Added a way to add moddable constants (#5921) 
* Added a way to add moddable constants to unciv

* Fixed xp from barbarians problem

* Maybe I should test my code before pushing
 2022-01-09 21:40:41 +02:00
Yair Morgenstern
44b262ec52
Remove support for stat-named specialists (#5923) 2022-01-09 21:39:32 +02:00
Yair Morgenstern
513b37583f
Converted "Can construct [improvementName]" to a uniqueType (#5924) 2022-01-09 21:39:27 +02:00
Yair Morgenstern
5f5aca6780
Simplified conditional checks - where I felt it would make it more readable (#5927) 
* Simplified conditional checks - where I felt it would make it more readable.

Also added checks to ensure that era exists when checking era.

* Now passes tests

* Simplified unit tile checks
 2022-01-09 21:39:20 +02:00