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

2447 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Yair Morgenstern
7454b57e4d Tech coloration issues 2019-09-09 23:06:17 +03:00
lishaoxia1985
a8663dda91 fix that researched tech can be picked when we pick a free tech (#1049) 
* 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
 2019-09-09 22:43:00 +03:00
Duan Tao
6c3c4bf7af Auto build Aqueducts and Medical Labs. 2019-09-09 15:52:07 +03:00
Smashfanful
6fb2f402f1 Update Nations_Italian.json 2019-09-09 15:51:43 +03:00
Smashfanful
0eed8b04ba Update Notifications.json 2019-09-09 15:51:25 +03:00
Smashfanful
d1f1acf3e0 Update Other.json 2019-09-09 15:51:03 +03:00
Smashfanful
9bf944afad Update NewGame,SaveGame,LoadGame,Options.json 
Italian Translations
 2019-09-09 15:50:45 +03:00
Duan Tao
bfe73c1f4e Tech cost increases with more city. 2019-09-09 17:56:32 +08:00
lishaoxia1985
3b5a7b36d3
Update TechPickerScreen.kt 2019-09-09 16:41:38 +08:00
YueR
74610b748a update 2019-09-09 16:26:25 +08:00
YueR
35ef7989bb update to master 2019-09-09 08:34:28 +08:00
YueR
252748d30c Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-09-09 08:30:23 +08:00
YueR
eb6f07dab4 update to master 2019-09-09 08:29:47 +08:00
YueR
b31c6f3ec7 fix that researched tech can be picked when we pick a free tech 2019-09-09 08:26:17 +08:00
Yair Morgenstern
9e0ba99c0a Invalid trade requests (e.g. giving a city that isn't yours anymore or resources you no longer own) are discarded at the beginning of the civ's turn 2019-09-08 23:33:39 +03:00