Commit Graph

745 Commits

Author SHA1 Message Date
a182b32485 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
a89c0623ce Update Translations.json 2019-04-23 14:38:50 +03:00
57b8d9f3d9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
d0984e12a9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
f6c5532b14 Update Translations.json 2019-04-23 14:38:50 +03:00
50224c71f6 Update Translations.json 2019-04-23 14:38:50 +03:00
c19be603f2 new Cossack icon 2019-04-22 12:33:23 +02:00
f954686dfd Merge pull request #669 from lishaoxia1985/master
Update Translations.json
2019-04-22 09:17:16 +03:00
edcfe69732 Update Translations.json 2019-04-21 19:21:58 +08:00
30232564a2 Merge pull request #667 from lishaoxia1985/master
update some simplified chinese language
2019-04-21 08:33:28 +03:00
4c52b639e5 Update Translations.json 2019-04-21 06:49:39 +08:00
c845001097 Update Translations.json 2019-04-21 03:51:24 +08:00
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
dd48d4444f Update Translations.json 2019-04-21 01:26:47 +08: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
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
6723b8b717 Update Nations.json 2019-04-15 16:45:46 +02: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
25455df0fd Merge pull request #649 from divizdev/master
Russian translation
2019-04-15 08:22:09 +03:00
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +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
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
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
1461e0a58b Update Translations.json 2019-04-12 11:35:26 +02:00
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
b00b432bb3 War Chariot
100x100 white on grey transparent
2019-04-11 20:19:24 +02:00
edfd2a69c2 Update Translations.json 2019-04-10 19:32:01 +02:00
6af749b77b Added Walls of Babylon unique building
Added Chu-Ko-Nu unique unit
2019-04-09 23:31:16 +03:00
3927d8d7ab Update Translations.json 2019-04-09 16:47:54 +02:00
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03:00
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
86ed7c2ec3 Merge pull request #632 from Am-per-Sand/master
Machu Picchu deresoluted
2019-04-08 08:51:56 +03:00