mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 07:16:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,063 Commits 7 Branches 1,036 Tags 1.1 GiB
7f539aa4fa
Commit Graph

6063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yairm210
7f539aa4fa Version to pin is the upload, not the signing. 
I can't do anything right today, huh.
 2021-09-26 15:04:25 +03:00
yairm210
8b5f198577 Hopefully fixed Google Play release 2021-09-26 14:58:11 +03:00
yairm210
9b2c39321c 3.17.2 2021-09-26 14:07:40 +03:00
Giuseppe D'Addio
398f9bc2f9
Update Italian.properties (#5292) 2021-09-26 14:05:59 +03:00
Yair Morgenstern
e62d0be843
Translations update (#5324) 
* Update Spanish.properties (#5318)

* Update Indonesian.properties (#5315)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#5314)

- new strings translated

* Update Swedish.properties (#5310)

Translated the newly added lines

* Update German translation (#5294)

* Update German translation

* Update German translation

* Update Russian.properties (#5323)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
 2021-09-26 14:04:57 +03:00
SomeTroglodyte
e1b2814b5d
Mini-UI to see Religion info on foreign cities (#5321) 2021-09-26 11:04:33 +03:00
SomeTroglodyte
3a858a7051
Oversight - "base hurry cost" in pedia should be multiple of 10 (#5320) 2021-09-26 10:54:38 +03:00
SomeTroglodyte
8d33dacc3c
Softcode Fountain of Youth (#5308) 
* Softcode Rejuvenation

* Softcode Rejuvenation - comments
 2021-09-25 22:15:03 +03:00
SomeTroglodyte
a4c38174b6
Extra embarrassing fix - Textures missing on Android (#5313) 2021-09-25 22:08:37 +03:00
Yair Morgenstern
8d631254aa
Unified many implementations of common interfaces into abstract classes (#5312) 
* Unified many implementations of common interfaces into abstract classes

* RulesetObject interface
 2021-09-24 17:48:06 +03:00
yairm210
ed47f16c6e Added modder warning for deprecated fields 2021-09-24 16:35:22 +03:00
SomeTroglodyte
c05bf0a2a6
Fix a Nation Picker crash (#5311) 2021-09-24 15:49:56 +03:00
Yair Morgenstern
12302deef6
Precursor to mod target check - (#5303) 
* Precursor to mod target check -
Define acceptable targets for each unique holder

* Warn for bad unique targets, and divide between different types of beliefs

* Moved the belief type logic into the class, rather than being external

* Added comment that getUniqueTarget is currently unneeded, but planned for future use
 2021-09-24 15:02:41 +03:00
SimonCeder
d20b4b0805
"The original work has been modified." in attributions (#5304) 2021-09-24 10:06:24 +03:00
SimonCeder
fa813f8f5e
Quests fixes and additions (#5301) 
* enable all quests

* implement more quests

* weighting for quests

* global quests

* fixes

* fixes

* Update template.properties

* general string

* reviews
 2021-09-24 10:05:30 +03:00
SomeTroglodyte
e9e0f2c55f
World and Natural Wonders Overview (#5297) 
* World and Natural Wonders Overview

* World and Natural Wonders Overview - icon

* World and Natural Wonders Overview - groups and tuning

* World and Natural Wonders Overview - atlas

* World and Natural Wonders Overview - lint
 2021-09-24 10:04:30 +03:00
SomeTroglodyte
8ef84d785e
Music controller - Fix pause (#5307) 2021-09-24 10:00:46 +03:00
yairm210
bae8bd2468 Mod error detection improvements! 
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
 2021-09-23 12:04:16 +03:00
SimonCeder
2e8934af17
Newly Allied city states declare war on your enemies, even unmet ones (#5298) 
* new allies dow, unmet civs meet first and then dow

* no gifts for bad people
 2021-09-23 11:31:36 +03:00
SomeTroglodyte
4a83bed4ba
Nation Picker visual help where to click (#5287) 
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
 2021-09-23 11:23:40 +03:00
AdityaMH
600f1a32fc
Fix missed sound for Sea Beggar (#5300) 2021-09-23 11:23:04 +03:00
SomeTroglodyte
a5a8ea1338
Natural Wonders un-hardcoded (#5279) 
* Natural Wonders un-hardcoded

* Natural Wonders un-hardcoded - oops testing change revert

* Natural Wonders un-hardcoded - tests OK

* Natural Wonders un-hardcoded - requests

* Natural Wonders un-hardcoded - hide from pedia

* Natural Wonders un-hardcoded - readable unique
 2021-09-23 11:21:08 +03:00
MartinP
c7d5caf08c
Correct one line in template.properties (#5302) 2021-09-23 11:20:17 +03:00
SomeTroglodyte
8161da26de
Texture pack/load for mods also distributes by Images.*X* (#5296) 2021-09-22 22:11:39 +03:00
SimonCeder
318a8d99ff
regenerated game.atlas and game.png (#5295) 2021-09-22 21:41:48 +03:00
yairm210
66b0ddb25a Mod error detection improvements! 
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
 2021-09-22 21:28:19 +03:00
Yair Morgenstern
e3f9f849a8
Update template.properties 
Added space that ruined tests
 2021-09-22 20:26:54 +03:00
SimonCeder
0bb565fdc6
Can't trade resources from other trades or city-states (#5252) 
* can't trade resources from city-states

* display untradeable sources in trade screen

* Update template.properties

template string

* Update Swedish.properties

* Spelling, better buttons
 2021-09-22 20:21:41 +03:00
yairm210
98f14523ed Add all cityFilter strings from the 'source of truth', since many were missing from translation file 2021-09-22 19:47:31 +03:00
SomeTroglodyte
d1005327e7
Lint a few warnings and typos (#5293) 2021-09-22 19:32:25 +03:00
yairm210
0771cb1fad 3.17.1 2021-09-22 18:50:17 +03:00
Yair Morgenstern
8538573204
Translations update (#5291) 
* Update Spanish.properties (#5286)

* Update Russian.properties (#5283)

* Update Swedish.properties (#5282)

* Update Swedish.properties

* Update Swedish.properties

* Update Italian.properties (#5278)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#5277)

* Update Germans translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5275)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Japanese.properties (#5274)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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>
Co-authored-by: MartinP <77325495+Mape6@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>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2021-09-22 18:40:02 +03:00
yairm210
5d6765a879 Resolved crash in unit civilopedia lines that depended on unitType being initialized 2021-09-22 18:32:16 +03:00
SomeTroglodyte
5e4aff90e9
Music controller with fade-over and mod capabilities. (#5273) 
* Music controller with fade-over and mod capabilities.
- Preparation for music following game situations
- Minimal in-game hooks for now
- Already allows mods providing music, will play randomly

* Music controller - template
 2021-09-22 09:35:33 +03:00
Xander Lenstra
b7467d3467
Added support for conditionals to some more uniques (#5280) 
* Added support for conditionals to some more uniques

* Implemented a new conditional

* Added the new conditional to the translations file

* Fixed tests

* Implemented requested changes
 2021-09-22 09:24:16 +03:00
Xander Lenstra
4343137b82
Save the sources of uniques with the uniques themselves (#5281) 2021-09-21 20:26:14 +03:00
Yair Morgenstern
05394f627d
Using reflection to find and report deprecated uniques (#5276) 
* Using reflection to find and report deprecated uniques

* No kotlin reflection needed thank you very much
 2021-09-21 20:26:05 +03:00
Xander Lenstra
7a59cbcbe8
Fixed bug where a unit auto-exploring ancient ruins would in some cases disappear after upgrading (#5285) 2021-09-21 20:18:02 +03:00
yairm210
eedfbe0235 Specify acceptable uses of this unique 
Later we'll be able to check this in checkRuleset to warn against incorrect usages
 2021-09-20 16:26:36 +03:00
Xander Lenstra
ce5a82c763
Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
yairm210
bd7824cdb9 More UniqueType-ing, discovering an overlap this time 2021-09-19 21:33:26 +03:00
yairm210
5fc7d1ce46 Gain free building uniqueType'D 2021-09-19 21:18:56 +03:00
yairm210
bdefb7894c cityInfo.getMAtchingUniques accepts uniqueType 2021-09-19 21:15:26 +03:00
yairm210
ef7676183d 3.17.0 2021-09-19 21:04:34 +03:00
yairm210
aee087ec01 tileResource unique fully replaceable by uniques 2021-09-19 20:58:17 +03:00
Yair Morgenstern
dbac2bfccb
Translations update (#5271) 
* Translation update (#5261)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#5260)

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#5258)

* Update German translation

* Update German translation

* Update Italian.properties (#5214)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: cjddig <67223322+cjddig@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-09-19 20:53:20 +03:00
Xander Lenstra
f47f427b05
Adds conditionals to most of the uniques currently in the enum (#5270) 
* Moved uniques to their own folder

* Added support for conditionals to most of the uniques in the current enum

* Deprecation > removal, of course

* Fixed tests & added `.removeConditionals` before checking for placeholders
 2021-09-19 18:43:32 +03:00
Xander Lenstra
62e3dbe014
Moved uniques to their own folder (#5269) 2021-09-19 18:03:41 +03:00
Xander Lenstra
6416f397ea
Fixed a few incorrect upgrades (#5268) 2021-09-19 17:56:53 +03:00
Xander Lenstra
cb4feb29ed
Fixed a few bugs relating to earning great prophets (#5267) 
* Fixed bug where great prophets gifted by city-states wouldn't have a religion

* Fixed bug where earning/buying great prophets whithout having founded a religion would result in great prophets of your pantheon, regardless of the religious state of the city
 2021-09-19 17:56:38 +03:00