wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1504 commits 7 branches 304 tags 288 MiB
Commit graph

593 commits

Author SHA1 Message Date
lishaoxia1985
ab915c408a Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
9549be7d06 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
6ef95c37ff Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a182b32485 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a89c0623ce Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
57b8d9f3d9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
d0984e12a9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
f6c5532b14 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
50224c71f6 Update Translations.json 2019-04-23 14:38:50 +03:00
Yair Morgenstern
f954686dfd
Merge pull request #669 from lishaoxia1985/master 
Update Translations.json
 2019-04-22 09:17:16 +03:00
lishaoxia1985
edcfe69732
Update Translations.json 2019-04-21 19:21:58 +08:00
Yair Morgenstern
30232564a2
Merge pull request #667 from lishaoxia1985/master 
update some simplified chinese language
 2019-04-21 08:33:28 +03:00
lishaoxia1985
4c52b639e5
Update Translations.json 2019-04-21 06:49:39 +08:00
lishaoxia1985
c845001097
Update Translations.json 2019-04-21 03:51:24 +08:00
Yair Morgenstern
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
lishaoxia1985
dd48d4444f
Update Translations.json 2019-04-21 01:26:47 +08:00
Am-per-Sand
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
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
25455df0fd
Merge pull request #649 from divizdev/master 
Russian translation
 2019-04-15 08:22:09 +03:00
Yair Morgenstern
7ce7c2da93 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-14 22:13:10 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
divizdev
8fe889dc96
Merge branch 'master' into master 2019-04-14 21:22:14 +03:00
diviz
9647a6d64e Russian translation 2019-04-14 21:17:06 +03:00
Smashfanful
e69a23b43e
Update Units.json 
Added Brute
 2019-04-12 16:42:27 +02:00
Yair Morgenstern
ccb9950187 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 17:05:55 +03:00
Yair Morgenstern
7228634982 Resolved #642 - pyramids unlocked with Masonry 2019-04-12 17:05:35 +03:00
Yair Morgenstern
02868dc157
Merge pull request #639 from Smashfanful/patch-91 
Update Nations.json
 2019-04-12 17:01:54 +03:00
Smashfanful
f3e303e464
Update Translations.json 2019-04-12 15:25:51 +02:00
Smashfanful
3a16014fab
Update Nations.json 2019-04-12 15:21:01 +02:00
Yair Morgenstern
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
e3dcd4cb43 Added Cossack unique unit - #563 2019-04-12 14:02:15 +03:00
Yair Morgenstern
4c9ca3fd19 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-12 13:34:17 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
b000fda165
Merge pull request #604 from Smashfanful/patch-79 
Update Nations_Italian.json
 2019-04-12 13:33:49 +03:00
Smashfanful
1461e0a58b
Update Translations.json 2019-04-12 11:35:26 +02:00
Yair Morgenstern
a969c8f479 Added Ship of the Line unique unit - #563 2019-04-12 09:18:01 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Smashfanful
edfd2a69c2
Update Translations.json 2019-04-10 19:32:01 +02:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building 
Added Chu-Ko-Nu unique unit
 2019-04-09 23:31:16 +03:00
Smashfanful
3927d8d7ab
Update Translations.json 2019-04-09 16:47:54 +02:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
42eb3fa297 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-07 20:24:15 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Smashfanful
fb77a35901
Update Translations.json 2019-04-05 10:40:51 +02:00