SimonCeder
cbd3c2910e
Icons for city states ( #5160 )
...
* Add city state icons
* Add the icons
* Get filename from cityStateType.name
* less padding
* Icon names in enum, icons in diplomacy screen
2021-09-09 21:28:30 +03:00
yairm210
9a35323331
Merge branch 'temp'
2021-09-09 21:26:49 +03:00
yairm210
1e8afc10d4
3.16.13-patch1
2021-09-09 21:26:24 +03:00
SomeTroglodyte
9857b2cfc4
Fix crash entering mod management ( #5158 )
...
(cherry picked from commit df5540442f
)
2021-09-09 21:25:08 +03:00
Xander Lenstra
94fa48c4b5
Fix Civil Society policy ( #5164 )
2021-09-09 20:12:53 +03:00
SomeTroglodyte
df5540442f
Fix crash entering mod management ( #5158 )
2021-09-09 20:06:37 +03:00
SomeTroglodyte
38a545e9a6
An icon for BeliefType.Enhancer ( #5159 )
2021-09-09 20:06:20 +03:00
SomeTroglodyte
612ad0ab55
Fix era notification ( #5161 )
2021-09-09 20:03:51 +03:00
Xander Lenstra
7b6e57d3b5
Religion goes from alpha into beta: available from stat screen immediately ( #5149 )
2021-09-09 07:24:56 +03:00
SomeTroglodyte
bebfe92fb1
Mod manager portrait and auto scroll ( #5138 )
...
* Mod manager portrait mode
* Mod manager portrait and auto scroll
- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).
* Mod manager portrait - template
2021-09-09 07:24:00 +03:00
SomeTroglodyte
ffdc289611
Civilopedia remove migration-only interface elements ( #5150 )
2021-09-09 07:18:26 +03:00
Xander Lenstra
9c876ad84e
Wrote an extensive tutorial documenting most of religion ( #5130 )
...
* Wrote an extensive tutorial documenting most of religion
* Fixed spelling and improved clarity
* Fixed typo (Thanks for noticing!)
* Reworded and split up tutorials, fixed grammer/spelling mistakes
* Added missing quote mark
2021-09-09 06:22:43 +03:00
SomeTroglodyte
8b210fb798
Kotlin 1.5 new warnings - the rest ( #5151 )
2021-09-09 06:21:44 +03:00
Xander Lenstra
9ff8435a21
Removed non-baserule mods from blacklist
2021-09-08 22:50:13 +02:00
yairm210
6d3423f5b0
Merge remote-tracking branch 'origin/master'
2021-09-08 23:46:17 +03:00
yairm210
4eb9fe3751
Fixed error in APK release
2021-09-08 23:46:07 +03:00
ravignir
ac5122741b
deleting the annoying part of misimplemeted pledge to protect mechanic. ( #5146 )
...
Maybe poll this on discord.
2021-09-08 23:35:20 +03:00
yairm210
1530389507
3.16.13
2021-09-08 23:19:07 +03:00
yairm210
e81d8ff646
3.16.13
2021-09-08 23:06:10 +03:00
Yair Morgenstern
7c20edda43
Translations update ( #5144 )
...
* Update Japanese.properties (#5132 )
religion
tech
* Update Swedish.properties (#5112 )
Translated the newly added lines.
* Update Italian.properties (#5106 )
* Update Indonesian.properties (#5105 )
* Update Greek.properties (#5104 )
* Update Greek.properties
* Update Greek.properties
* Update Greek.properties
* Update Greek.properties
* Update Greek.properties
* Update German translation (#5100 )
* Update German translation
* Update Germans translation
* Update German translation
* work on dutch translation (#5087 )
* work on dutch translation
* translation fixes
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
2021-09-08 23:00:15 +03:00
yairm210
ba8201e14c
Better APK release steps
2021-09-08 22:55:02 +03:00
Alex25820
022b55e937
Adds support for opening debug menu on MacOS ( #5142 )
2021-09-08 21:50:20 +03:00
Xander Lenstra
d247cacbca
Added "in other cities" as a cityFilter ( #5131 )
2021-09-08 21:41:57 +03:00
Xander Lenstra
3722fab38d
From the indstrial era onwards, things change in religion ( #5095 )
...
* Improved redability
* From the industrial era onwards, religion goes into 'second phase'
* Fixed tests
* Fixed formula for buying great prophets starting from the industrial era
* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code
* Fix compilation errors
2021-09-08 21:24:26 +03:00
SomeTroglodyte
65695496f3
Greek flag ( #5124 )
2021-09-08 21:19:46 +03:00
SomeTroglodyte
366ce4b89b
Kotlin 1.5 new warnings - partial ( #5121 )
2021-09-08 21:15:32 +03:00
SomeTroglodyte
1785c1f78e
No right-click on Android ( #5125 )
2021-09-08 21:13:43 +03:00
Xander Lenstra
4cfdfee301
Added "Incompatible with [promotionName]" unique ( #5128 )
2021-09-08 21:12:57 +03:00
Xander Lenstra
e2a1e44282
Fixed bugs with unit movement ( #5126 )
...
* Fixed bugs with unit movement
* Optimized function call
* Cleaning up some code
* Removed comments that are no longer applicable
2021-09-08 21:11:59 +03:00
SimonCeder
7297139594
CS vulnerable to ally unhappiness ( #5134 )
2021-09-08 21:02:34 +03:00
SomeTroglodyte
ab5083173d
Kotlin 1.5 new warnings - partial ( #5120 )
2021-09-08 20:48:24 +03:00
SimonCeder
8b6881c76b
checks for protection, delays ( #5133 )
2021-09-08 20:47:23 +03:00
SomeTroglodyte
e0fe788e28
Add a "Reset to defaults" button to the Newgame screen ( #5141 )
...
* Add a reset to defaults button to the new game screen
* Add a reset to defaults button to the new game screen - template
2021-09-08 20:46:18 +03:00
Xander Lenstra
d1135f3d20
Fixes incorrect default paramter for starting era ( #5119 )
2021-09-08 20:44:50 +03:00
Xander Lenstra
a1f7721878
Fixes #5113 ( #5122 )
...
* Fixed #5113
* Better check
2021-09-08 20:42:58 +03:00
Xander Lenstra
9a29ce8422
Fixed all renamed units being called 'instanceName' ( #5140 )
...
* Fixed all renamed units being called 'instanceName'
* Removed extreneous square brackets resulting in incorrect translations
* Fixed translation problems
2021-09-08 20:42:27 +03:00
SomeTroglodyte
69e2828a0e
SerializationTests restore settings file ( #5110 )
2021-09-06 18:32:34 +03:00
SomeTroglodyte
7118e9779c
GameStarter wrap and shape aware ( #5107 )
...
- Starting locations code aware of wrap and map shape
- RiverGenerator wrap aware
- RiverGenerator guard against endless loop
2021-09-06 18:32:12 +03:00
SomeTroglodyte
7f386da2bc
Kotlin 1.5 new warnings - partial ( #5108 )
...
* Kotlin 1.5 new warnings - partial
* Kotlin 1.5 new warnings - partial
2021-09-06 18:28:20 +03:00
SimonCeder
2ca42a705f
Force ranking, bullying improvements ( #5102 )
...
* Proper demand tribute thresholds
* Proper calculation for Force rankings
* debug strings
* use new force ranking for AI threatAssessment
* use new force ranking for AI threatAssessment, pt 2
2021-09-06 15:50:39 +03:00
Xander Lenstra
486e2a7a8a
Deprecate all mods without an eras.json file ( #4809 )
...
* Enforce the existence of an eras.json file for mods
* Merged `getEra()` and `getEraObject()`
* Hide mods we have deemed outdated
* Fixed compile errors that I didn't notice before
* Fixed unit tests
2021-09-06 14:50:38 +03:00
Xander Lenstra
8079a8dc7b
Fix bugs ( #5103 )
...
* Fixed a bug where moving a unit through ancient ruins spawning another unit would duplicate units
* Fixed a bug where automatically exploring units upgrading from ancient ruins would not upgrade
* Fixed a bug where city state influence could go lower than the minimum
2021-09-06 14:35:31 +03:00
SimonCeder
c7264556ea
City state intrusion anger ( #5090 )
...
* move functions, greece UP
* CS influence from killing barbs
* Greece healing in CS territory
* move diplomacy bonuses into CityStateFunctions.kt
* Split filter in Battle.kt, nicer code
2021-09-05 21:22:02 +03:00
yairm210
2474c6a635
Re-upgraded Kotlin to 1.5.30, and together with it - minSdk and source&target compatibility to 1.8.
...
We've finally advanced to 2015 (when 1.7 was deprecated)
2021-09-05 19:36:35 +03:00
yairm210
a28feda692
3.16.12
...
Reverted Kotlin upgrade since it doesn't play well with Android compile :(
2021-09-05 19:01:54 +03:00
Yair Morgenstern
3693311572
Fixed "space at end of translation" error
2021-09-05 17:51:31 +03:00
yairm210
6567088efe
3.16.12
2021-09-05 15:10:21 +03:00
Yair Morgenstern
3d272bc561
Translations update ( #5093 )
...
* Update Indonesian.properties (#5086 )
* Update Swedish.properties (#5078 )
Translated the newly added lines.
* Create Greek.properties (#5069 )
* Create Greek.properties
* Update Greek.properties
* Update Greek.properties
* Update Greek.properties
* Update Italian.properties (#5068 )
* Update Italian.properties
* Update Italian.properties
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-09-05 14:58:55 +03:00
Xander Lenstra
f016012e39
Fixed a bug where no icon would display in city religion UI for pantheons ( #5094 )
2021-09-05 14:58:02 +03:00
yairm210
5170a27e07
Fixed crash where deleting mods meant you could never start a game again
...
If the last game you created used a mod that you later removed from the the device it could never be removed from the new game parameters
Caught exceptions from quickstart failing
2021-09-05 14:57:21 +03:00