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

2390 commits

This branch
This branch
All branches
Author SHA1 Message Date
YueR
d106d29b0c update 2019-09-19 19:37:36 +08:00
Duan Tao
c4e4f3d2a3 Fix trade resources check. 2019-09-19 11:10:50 +03:00
Yair Morgenstern
2def82c4a6 When picking random city states for a map, first priority now goes to city states with starting locations defined in the map 2019-09-18 22:42:44 +03:00
Yair Morgenstern
753efe5f47 Added error popup when failed to download map 2019-09-18 22:28:16 +03:00
Yair Morgenstern
f4d828d5e4 Finished changing all unit promotion icons! 2019-09-18 22:15:37 +03:00
YueR
9820a12b0a update 2019-09-18 18:14:01 +08:00
YueR
56ce2245e2 update 2019-09-18 17:53:39 +08:00
YueR
74490fe9fb Merge remote-tracking branch 'upstream/master' 
update
 2019-09-18 17:46:15 +08:00
YueR
64c98a27ea update 2019-09-18 17:45:59 +08:00
Duan Tao
45342a7d63 Remove redundant item is Logistics prequisition. 2019-09-18 08:43:17 +03:00
Duan Tao
0adeb68ea6 Invisible submarines are excluded from notification. 2019-09-18 08:42:47 +03:00
YueR
b6bae3de2b Merge remote-tracking branch 'upstream/master' 
update
 2019-09-18 09:52:19 +08:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
190d9f72fd Resolved #1091 (spelling mistakes) 2019-09-17 22:39:21 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Smashfanful
9271fe22a4 Update Techs.json 
Added quotes for Ancient and Classical Age techs
 2019-09-17 20:41:03 +03:00
YueR
6231117340 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-17 19:23:00 +08:00
Smashfanful
11840de2ce Update Nations.json 
Two more City-States: Zanzibar and Singapore
 2019-09-17 08:15:54 +03:00
Smashfanful
2ef533f57b Update Credits.md (#1087) 
* Update Credits.md

* Update Credits.md
 2019-09-17 08:14:36 +03:00
Duan Tao
0f1f5bf746 Spaceship should not be bought. 2019-09-17 08:14:10 +03:00
YueR
93fc889598 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-17 05:19:55 +08:00
Smashfanful
d7d7d9a7e6 Update Nations_Italian.json 2019-09-16 19:50:59 +03:00
Smashfanful
9b9dec952b Update Nations_Italian.json 
Persian and Irochese civs, and two new City-States
 2019-09-16 19:50:59 +03:00
Smashfanful
4cd30d8301 Update Diplomacy,Trade,Nations.json 2019-09-16 19:50:06 +03:00
Smashfanful
2dccc6cf90 Update Buildings.json 
Since the Persian Civilization is on the go, I guess we can work this out.
 2019-09-16 19:49:43 +03:00
Smashfanful
1b4b326cf7 Update Units,Promotions.json 
Italian Translations
 2019-09-16 19:49:11 +03:00
lishaoxia1985
390254b584 instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080) 
* 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

* update

* update

* update

* update

* viewport
 2019-09-16 19:48:41 +03:00
lishaoxia1985
b4af3efbc1
Merge branch 'master' into master 2019-09-16 16:54:42 +08:00
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