AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,630 Commits 6 Branches 1,117 Tags
Commit Graph

6630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yairm210
ed224d257a Merge remote-tracking branch 'origin/master' 2021-10-17 23:42:17 +03:00
yairm210
d4205cb405 Typed "Unbuildable" 2021-10-17 23:42:09 +03:00
Xander Lenstra
c840ff99a6
Fixed belief increasing city-state influence resting point (#5502) 2021-10-17 23:02:45 +03:00
Xander Lenstra
1a6eee0d19
Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
yairm210
8b2bb8e59b Typed deprecated uniques so modders have warnings 2021-10-17 22:15:46 +03:00
yairm210
ef2f2eccde 3.17.9 3.17.9 2021-10-17 21:23:58 +03:00
yairm210
1a1194236b Added overload to MapUnit.getMatchingUniques to get uniques from civ as well - see #5494 2021-10-17 21:16:14 +03:00
Yair Morgenstern
d89211c6bb
Translations update (#5497) 
* Update Greek.properties (#5488)

* Update Greek.properties

* Update Greek.properties

* Update Czech.properties (#5486)

* Update Czech.properties

- many new strings translated

* Update Czech.properties

- fixed string param names

* Update Swedish.properties (#5482)

* Update German translation (#5481)

* Update German translation

* Update German translation

* Update Indonesian.properties (#5480)

* Update Italian.properties (#5478)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-10-17 21:02:31 +03:00
Xander Lenstra
5c80e8ee9b
Fixed bug where denmark's pillaging unique doesn't work (#5500) 2021-10-17 08:39:44 +03:00
SimonCeder
ac422d25cb
City State Barbarian Invasion and War with Major pseudo-quests (#5454) 
* barbarian invasion event

* war with major pseudo-quest

* include latecomers

* diplomacy screen

* more notifications

* fixes

* reviews
 2021-10-16 20:34:47 +03:00
Xander Lenstra
551e6e1d54
Implemented holy warriors follower belief (#5411) 
* Implemented holy warriors follower belief

* Minor fixes

* Likely fixed the tests

* Made someTroglodyte happy :)

* Removed stray println's

* Implemented requested changes
 2021-10-16 20:25:38 +03:00
SomeTroglodyte
de0c1161f6
Music pause on "leave game" question, not world screen menu (#5491) 
* Music pause on leave game question, not worldscreen menu

* Music pause on leave game question, not worldscreen menu - log back off
 2021-10-16 20:06:25 +03:00
Xander Lenstra
3c71fe41dc
Fixes bug where culture gain from killing units no longer works (#5489) 2021-10-16 20:05:30 +03:00
Xander Lenstra
24545a92dd
Choose a better visible color for the religious symbol on the city button (#5485) 2021-10-14 23:38:35 +03:00
Xander Lenstra
48bbccbda6
Updated google play & itch.io screenshots to recommended sizes (#5479) 
* Updated google play & itch.io screenshots to recommended sizes

* These use slightly more space and have less ugly black lines around them

* Fantasyhex > default tileset
 2021-10-14 20:54:03 +03:00
Xander Lenstra
134c6e1a97
Updated screenshots for google play & itch.io to better reflect the current state of the game (#5375) 
* Updated screenshots to reflect the current state of the game

* Fixed broken images
 2021-10-13 23:47:37 +03:00
yairm210
f1f2c1e932 3.17.8 3.17.8 2021-10-13 23:27:39 +03:00
Giuseppe D'Addio
dd8f7ed8ff
Update Nations.json (#5457) 
You put one space too much
 2021-10-13 23:24:25 +03:00
Yair Morgenstern
290318f3ad
Translations update (#5477) 
* Update German translation (#5462)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#5461)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5460)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5459)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-10-13 23:19:33 +03:00
Xander Lenstra
67650fec00
Fixed a bug where "[+amount] population [in this city]" did not work (#5476) 2021-10-13 23:16:38 +03:00
SimonCeder
ff67e66348
Free buildings part 2 - works for Carthage too (#5471) 
* free buildings works for Carthage too
unify "provides a free [] []" and "gain a free [] []"

* re-check at start of turn

* reviews
 2021-10-13 19:21:27 +03:00
Xander Lenstra
734fba8f30
Fixed bugs with diplomatic victory (#5474) 2021-10-13 12:03:34 +03:00
yairm210
56222a0ea7 Resolved #5453 - strength bonuses apply from civ bonuses as well 2021-10-12 19:49:12 +03:00
yairm210
038c501ac8 Construction automation constructs attacking units even if they provide unneeded slots 2021-10-12 19:45:21 +03:00
Xander Lenstra
9abc3ddb6e
Fixes a problem with free buildings provided in other cities not being free (#5470) 2021-10-12 17:21:04 +03:00
SimonCeder
36711f70ad
Variable resource quantities (#5456) 
* implement varying resource amounts

* works on old maps

* reviews
 2021-10-12 07:38:07 +03:00
SimonCeder
1a92f9c084
Free buildings are free (#5466) 
* free buildings are free

* ai shouldn't sell free buildings either
 2021-10-12 07:34:23 +03:00
SimonCeder
e375fb9896
Disable religious quest with religion disabled; enumify "Hidden when religion is disabled" (#5465) 
* enumify hidden with religion disabled

* prevent religious quests in no-religion games
 2021-10-12 07:31:22 +03:00
Xander Lenstra
d44bfce665
Fixed crashes from era (#5467) 2021-10-12 07:30:20 +03:00
MartinP
58d335f8d4
Deleted unnecessary quotation mark (#5463) 2021-10-11 13:14:09 +03:00
Giuseppe D'Addio
f208fdf05f
Update template.properties (#5458) 
Added new translation line
 2021-10-11 09:33:52 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders (#5446) 
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
 2021-10-11 09:23:28 +03:00
Arthur van der Staaij
f0545130e9
Fixed the base cost of the Grand Temple (#5455) 
Base cost 300->125
 2021-10-11 09:23:09 +03:00
yairm210
5468821edf 3.17.7 3.17.7 2021-10-10 22:41:46 +03:00
CrispyXYZ
1a63a16e59
Update Simplified_Chinese.properties (#5447) 
* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties
 2021-10-10 22:35:09 +03:00
Xander Lenstra
a73b7b008f
Likely fixed a bug where AI nukes could hit nations they had a peace treaty with (#5449) 
* Likely fixed a bug where AI nukes could hit players they had a peace treaty with

* Typefied blast radius unique
 2021-10-10 22:26:54 +03:00
Xander Lenstra
9fab1f6ee7
Researching all of the techs in the previous era now also puts you in the next era (#5451) 2021-10-10 17:14:30 +03:00
Xander Lenstra
2bd8132b8d
Made it impossible to cut short peace treaties (#5450) 2021-10-10 17:11:14 +03:00
Xander Lenstra
24d7a57c1f
Fixed a bug where religious units would be expelled when an open borders agreement ended (#5448) 2021-10-10 17:10:36 +03:00
Xander Lenstra
0ddeb6eb64
Fixed bug with byzantine unique (#5445) 2021-10-10 06:24:44 +03:00
logic
3b49cc18a2
Civ icon redirects to civilopedia (#5414) 
* update for no reason

* bruuhhhhhhhhh

* update for no reason

* bruuhhhhhhhhh

* remove comments

* delete atlas

* Create game.atlas
 2021-10-09 22:32:47 +03:00
Yair Morgenstern
1132042949
When choosing military units, 'carrying' units are only chosen if they provide needed 'slots' for carrying units. (#5436) 2021-10-09 20:59:58 +03:00
Xander Lenstra
1df454368a
Solves bugs with unit movement through fog of war (#5382) 2021-10-09 20:46:35 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408) 
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
 2021-10-09 20:45:59 +03:00
SimonCeder
69e1792fa9
Return Civilians captured by Barbarians to original owner; Capture stacked civilians (#5437) 
* return captured civilians

* stacked civilian capture bug

* works on old saves

* diplomacy bonus expires on war declared

* vector bug
 2021-10-09 20:44:03 +03:00
yairm210
fd3bfbade4 Resolved #5435 - all civ + unit uniques are accounted for in both ways 2021-10-09 20:22:29 +03:00
SimonCeder
185050bd9f
cs units wander (#5441) 2021-10-09 20:11:52 +03:00
yairm210
81ebacc310 3.17.6 3.17.6 2021-10-08 17:02:29 +03:00
Yair Morgenstern
f175a59e5d
Translations update (#5439) 
* Update Korean translation (#5434)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Swedish.properties (#5419)

* Update German translation (#5418)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5417)

Co-authored-by: cjddig <67223322+cjddig@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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-10-08 16:54:48 +03:00
yairm210
0b3f8d11d3 Tile height set by lazy. 
This is good enough to give a 10% performance boost for regular players when there are a lot of units.
If mods add elevation somehow WITHIN a turn, this will be lost, but will recalc next turn correctly.
 2021-10-08 15:54:24 +03:00