Commit Graph

1481 Commits

Author SHA1 Message Date
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
ad9f22e88c Merge pull request #665 from Am-per-Sand/patch-2
enable Sentry for water melee units
2019-04-20 21:22:35 +03:00
f8efee7c1c Merge pull request #666 from Am-per-Sand/patch-3
Enable Piety when building Broadcast Tower
2019-04-20 21:17:56 +03:00
3afcd68a6b Enable Piety when building Broadcast Tower
someone wrote [it should work for Broadcast Towers](https://forums.civfanatics.com/resources/social-policy-piety-vanilla.25659/#1) as well.
2019-04-20 18:50:53 +02:00
630f86bbb3 enable Sentry for water melee units
There is contradictory information on units that can receive Sentry promotion, but this has been already enabled, so **adding missing prerequisites** so as water melee can get it as well as water ranged now.
2019-04-20 18:42:02 +02:00
1840793464 Merge pull request #661 from ninjatao/maptype_continents
Maptype continents
2019-04-19 16:45:51 +03:00
c83a2ed73c Continents shape improved. 2019-04-19 19:03:40 +08:00
babd29919a MapGen added type Continents. 2019-04-19 18:46:43 +08:00
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
9dabbb7946 Merge pull request #658 from ninjatao/AI_parameter
Adjust AI parameters.
2.14.9
2019-04-17 15:02:28 +03:00
54fc81fda7 Merge pull request #655 from Am-per-Sand/piety
Activate Piety bonus
2019-04-17 13:30:25 +03:00
c6c3ba1e67 Adjust AI parameters. 2019-04-17 18:21:09 +08:00
e3907e0fe1 forgot Broadcast Tower 2019-04-16 19:50:36 +02:00
35a0dee32f Activate Piety bonus
N.B.
The same condition may be found in `Building.kt`, so 
- may be add a function `isCultural`
or
- add a property `cultural:true` or even `type:[military, cultural, productive, financial, scientific, wonder]` to `Buildings.json` and get rid of `isWonder` there
2019-04-16 19:45:19 +02:00
010215bd10 Merge pull request #654 from Smashfanful/patch-97
Update Nations.json
2019-04-15 22:15:09 +03:00
cbf0c52d2c Barbarians no longer spawn on mountains and lakes (a bit silly) 2019-04-15 22:08:44 +03:00
6723b8b717 Update Nations.json 2019-04-15 16:45:46 +02:00
66370400b5 Merge pull request #652 from ninjatao/BigBen
Big ben
2019-04-15 16:52:04 +03:00
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
5d77ac8b84 Merge pull request #651 from ninjatao/fix_battletable
Fix submarines battle table.
2019-04-15 10:56:53 +03:00
e63f9297b3 Fix submarines battle table. 2019-04-15 14:05:22 +08:00
25455df0fd Merge pull request #649 from divizdev/master
Russian translation
2019-04-15 08:22:09 +03:00
bafd7b2a21 Merge pull request #650 from ninjatao/fix_conquer
Fix unassigned population when capturing city.
2019-04-15 08:21:00 +03:00
67a763ef21 Fix unassigned population when capturing city. 2019-04-15 09:27:05 +08:00
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
8d91cb90dc Solved another rare concurrency error 2.14.8 2019-04-14 22:18:40 +03:00
8bf09420e0 Resolved #647 - Starting locations should not be on tiny Islands 2019-04-14 22:13:55 +03:00
7ce7c2da93 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-14 22:13:10 +03:00
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
8fe889dc96 Merge branch 'master' into master 2019-04-14 21:22:14 +03:00
9647a6d64e Russian translation 2019-04-14 21:17:06 +03:00
a072e18081 Merge pull request #645 from Smashfanful/patch-94
Update Units.json
2019-04-14 07:30:20 +03:00
0539890a4d Added "No barbarians" starting option - part of #559 2019-04-13 22:49:17 +03:00
e69a23b43e Update Units.json
Added Brute
2019-04-12 16:42:27 +02:00
ccb9950187 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 17:05:55 +03:00
7228634982 Resolved #642 - pyramids unlocked with Masonry 2019-04-12 17:05:35 +03:00
02868dc157 Merge pull request #639 from Smashfanful/patch-91
Update Nations.json
2019-04-12 17:01:54 +03:00
8d449e5694 Merge pull request #641 from Smashfanful/patch-92
Update Translations.json
2019-04-12 17:01:24 +03:00
d86672b0c0 Organized new game screen functions 2019-04-12 16:59:56 +03:00
f3e303e464 Update Translations.json 2019-04-12 15:25:51 +02:00
3a16014fab Update Nations.json 2019-04-12 15:21:01 +02:00
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
4c9ca3fd19 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 13:34:17 +03:00
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
b000fda165 Merge pull request #604 from Smashfanful/patch-79
Update Nations_Italian.json
2019-04-12 13:33:49 +03:00
f21371dfe4 Merge pull request #638 from Smashfanful/patch-89
Update Translations.json
2019-04-12 13:33:20 +03:00