Commit graph

2362 commits

Author SHA1 Message Date
YueR
bfb92e3745 viewport 2019-09-16 16:51:42 +08:00
Yair Morgenstern
f03dfc10d6 Lakes provide 2 food, as per original Civ 2019-09-16 06:40:35 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
479b751cb3 Gold and Science breakdowns are now much more detailed 2019-09-15 18:52:40 +03:00
Yair Morgenstern
b038e926a4 Idle units are much more visible on the map
Technically, nstead of fading out the entire unit with its background, we just fade out its central icon, that way it remains much more visible on the map
2019-09-15 18:15:57 +03:00
YueR
4057153510 update 2019-09-15 21:11:42 +08:00
YueR
0e19105445 update 2019-09-15 20:42:24 +08:00
YueR
b4f3dadefa 2019-09-15 20:41:28 +08:00
YueR
11f9728c94 Merge remote-tracking branch 'upstream/master'
update
2019-09-15 20:38:07 +08:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
bad10370de innerColor and outerColor function name changes 2019-09-14 23:17:52 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode
Moved Nation jsons
2019-09-14 23:06:34 +03:00
Smashfanful
3688622d06 Update Buildings.json
Added translations for Wonder Quotes
2019-09-14 21:04:39 +03:00
Smashfanful
610795beef Update Buildings.json 2019-09-14 21:04:19 +03:00
pikkolpk
90e9cf056c Update Diplomacy,Trade,Nations.json 2019-09-14 21:03:57 +03:00
YueR
97a9d16c28 update 2019-09-14 23:15:55 +08:00
YueR
d24f7a51af update 2019-09-14 21:18:10 +08:00
YueR
9aff29f414 Merge remote-tracking branch 'upstream/master'
update
2019-09-14 15:22:39 +08:00
Yair Morgenstern
656c94a2a3 Revert "Nubian Pitati Archer and Australian Digger"
This reverts commit 00f66a785f.
2019-09-12 19:46:56 +03:00
Yair Morgenstern
fe3cd222ef Revert "Australian Outback Station"
This reverts commit dbdf2d819f.
2019-09-12 19:46:22 +03:00
Smashfanful
dbdf2d819f Australian Outback Station 2019-09-12 19:44:04 +03:00
Smashfanful
00f66a785f Nubian Pitati Archer and Australian Digger 2019-09-12 19:43:48 +03:00
lishaoxia1985
5f43c93846 MrUldiggg delete some words which are necessary. please update immediately (#1069)
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update
2019-09-12 19:42:29 +03:00
YueR
9c0e45e3b4 update 2019-09-12 21:46:27 +08:00
YueR
9c74e59e2d uMerge remote-tracking branch 'upstream/master'
update
2019-09-12 20:41:44 +08:00
YueR
dc524b8971 update 2019-09-12 19:02:14 +08:00
YueR
4f7b5ff21c update 2019-09-12 18:40:14 +08:00
lishaoxia1985
6e34f4743a update translation (#1067)
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
2019-09-12 13:05:58 +03:00
YueR
6c6182246d Merge remote-tracking branch 'upstream/master'
update
2019-09-12 17:38:39 +08:00
YueR
a05563e0e0 2019-09-12 17:38:30 +08:00
Yair Morgenstern
05a77a9a68 Fixed "units deselect after next turn" problem
Popup alerts now come before trade request popups
2019-09-11 21:18:01 +03:00
MrUldiggg
ed807551eb Philipinnes.json
Philippines Civilization
2019-09-11 19:42:19 +03:00
Smashfanful
9d9aebc35a Australian Civilization (#1066) 2019-09-11 19:40:54 +03:00
Smashfanful
4bef4719cc Nubian Civilization 2019-09-11 19:39:21 +03:00
Yair Morgenstern
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
Yair Morgenstern
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +03:00
YueR
178c10c87f update 2019-09-11 21:27:10 +08:00
Smashfanful
7578cf4bbc Update Units,Promotions.json (#1061)
* Update Units,Promotions.json

Missing Italian Translation, and I think I accidentally deleted the Spanish translation for Turtle Ship

* Update Units,Promotions.json
2019-09-11 11:22:40 +03:00
Duan Tao
548b1a96d0 Fix statue of liberity affect. 2019-09-11 10:33:28 +03:00
Duan Tao
d2ee684293 Adjust food and culture weight for AI cities developpment. (#1060) 2019-09-11 10:33:06 +03:00
lishaoxia1985
99959c9937 delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058)
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
2019-09-10 17:41:45 +03:00
YueR
1c009c2819 显示教程 2019-09-10 20:49:08 +08:00
YueR
9c43b60f79 language polish is wrong to be writing "polski" 2019-09-10 20:16:34 +08:00
YueR
6e8582b262 update 2019-09-10 19:42:24 +08:00
YueR
62d874d4bc delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align. 2019-09-10 19:37:16 +08:00
YueR
68cfe8de2b update 2019-09-10 06:26:57 +08:00
Yair Morgenstern
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +03:00
Yair Morgenstern
bdb049a29a
Tech cost increases with more city. (#1054) 2019-09-09 23:07:43 +03:00