mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-03 12:54:43 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,960 Commits 6 Branches 1,047 Tags 1.1 GiB
33ce6a7f3e
Commit Graph

5960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xander Lenstra
33ce6a7f3e
Fixed crash from new piety policy (#5202) 2021-09-13 10:51:47 +03:00
ravignir
337ab6999a
Made camps buildable on jungles. (#5203) 2021-09-13 10:51:30 +03:00
Xander Lenstra
9c66154a44
Updated piety policy tree (#5195) 
* Added piety policy tree

* Misread an ability

* Fixed filter
 2021-09-12 21:48:28 +03:00
Xander Lenstra
a4c520fd26
Added "Consumes [amount] [resource]" for improvements (#5129) 
* Added "Consumes [amount] [resource]" for improvements

* It now also works for placeable improvements

* Made construction grayed out instead of disappear when no resources available
 2021-09-12 21:21:46 +03:00
SomeTroglodyte
af20124e5d
Handle maps with invalid mapSize more gracefully (#5190) 
* Handle maps with invalid mapSize more gracefully

* Handle maps with invalid mapSize more gracefully - new game exception handling

* Handle maps with invalid mapSize more gracefully - moved version save init
 2021-09-12 19:15:21 +03:00
Xander Lenstra
03a7288656
Fixed sqrt of negative number (#5193) 2021-09-12 19:07:33 +03:00
yairm210
70c3b4bd65 3.16.14 2021-09-11 23:18:35 +03:00
Yair Morgenstern
ac2ce8ada7
Translations update (#5184) 
* Update Polish.properties (#5180)

Translated names of:

- All religions
- Untranslated civilization names
- Some Leaders

Co-authored-by: PLynx <pawelrys2011@gmail.com>

* Update Spanish.properties (#5176)

I'm back

* Update Swedish.properties (#5163)

Translated the newly added lines

* Update Indonesian.properties (#5155)

* Update German translation (#5153)

* Update Italian.properties (#5148)

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@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-11 23:10:06 +03:00
Xander Lenstra
b002e53eba
Fixed some bugs (#5178) 
* Fixed bug where moving a unit stopped automation

* Fixed bug where chosing an icon last in the religion screen would not enable the 'found religion' button

* Fixed bug where buying units with an increasing cost would deduct the wrong amount

* Fixed bug making it impossible to pick free techs
 2021-09-11 23:09:43 +03:00
yairm210
db78bcf00d Fixed another crash when mod game had religion enabled but had no great prophet unit 2021-09-11 23:07:39 +03:00
yairm210
619dfc5e09 Fixed crash when mod game had religion enabled but had no great prophet unit 
Also slight deprecation
 2021-09-11 23:05:07 +03:00
SimonCeder
d59fe45f51
Proper implementation of pledge to protect (#5165) 
* penalties for attacking

* proper timers on penalties

* template.properties

* space

* Player can pick sides when protected civs attacked/bullied
Protect gives resting point 10 for influence

* correct string
 2021-09-11 21:10:45 +03:00
SomeTroglodyte
45e87688cf
Guard against crash in getNumThreateningBarbarians without barbs (#5173) 
* Guard against crash in getNumThreateningBarbarians without barbs

* Guard against crash in getNumThreateningBarbarians without barbs - missing inits
 2021-09-11 21:09:45 +03:00
yairm210
00e962c9ac Resolved #4977 - can no longer fast-tap to confuse the policy/construction screens 2021-09-10 13:51:01 +03:00
yairm210
71220c5bfd Merge remote-tracking branch 'origin/master' 2021-09-10 13:42:49 +03:00
yairm210
66d7e8cbd0 Minor improvements 2021-09-10 13:42:37 +03:00
SomeTroglodyte
e575399baa
Prevent packaged exe being shot down by mod atlas packing failures (#5169) 2021-09-10 13:02:25 +03:00
yairm210
19837c235a 3.16.13-windows64NewPackrTest 2021-09-10 12:39:15 +03:00
yairm210
2c8bf658ed 3.16.13-windows64NewPackrTest 2021-09-10 12:30:09 +03:00
yairm210
ec7897dc1a Should upload the apk for realsies now 2021-09-09 22:07:32 +03:00
yairm210
3103984250 Merge remote-tracking branch 'origin/master' 2021-09-09 21:55:45 +03:00
yairm210
d8d94cb6bd Deprecation 2021-09-09 21:55:25 +03:00
SimonCeder
83050c2b11
Militaristic city states can give unique unit; refactor city state initialization (#5147) 
* Pick unique unit for militaristic CS

* Provide unique unit when able

* refactor some code

* remove debug

* template.properties

* fix failing build

* Add variance to spawning rate, add ≈ to string, better formatting.
 2021-09-09 21:30:12 +03:00
SomeTroglodyte
f1f4def7f0
Fix Denunceation typo, reorg compatibility code (#5156) 
* Fix Denunceation typo, reorg compatibility code

* Fix Denunceation typo - lint
 2021-09-09 21:29:13 +03:00
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