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

2884 commits

This branch
This branch
All branches
Author SHA1 Message Date
YueR
6477e85795 Merge remote-tracking branch 'upstream/master' 
update
 2019-10-05 11:42:12 +08:00
YueR
1f686b2d82 update 2019-10-05 00:11:02 +08:00
YueR
c7ac39c54e update 2019-10-04 22:54:01 +08:00
Smashfanful
67916f9be2 Update Policies.json 
Italian translation corrections
 2019-10-04 16:50:12 +03:00
Smashfanful
e42cadbf09 Update Diplomacy,Trade,Nations.json 2019-10-04 16:49:47 +03:00
Yair Morgenstern
2a00ab2775 "Introduction to X" and "Declare war on X" trade items are now only X, adding the extra text on UI display - this makes them translatable 2019-10-04 16:49:31 +03:00
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
lishaoxia1985
e63e821509
Delete game.png 2019-10-04 20:39:45 +08:00
lishaoxia1985
936d9704f2
Delete game.atlas 2019-10-04 20:39:29 +08:00
YueR
76565383fe update 2019-10-04 20:35:33 +08:00
YueR
5222d19dfe update 2019-10-04 20:29:04 +08:00
YueR
802583efa5 Merge remote-tracking branch 'upstream/master' 
update
 2019-10-04 20:17:37 +08:00
YueR
9060981709 update 2019-10-04 20:08:06 +08:00
YueR
51a3e24912 update 2019-10-04 16:34:29 +08:00
YueR
f5f614208c Merge branch 'master' of https://github.com/lishaoxia1985/UnCiv 2019-10-04 15:15:35 +08:00
YueR
e68c32a1e3 2019-10-04 15:12:58 +08:00
Yair Morgenstern
5049831c18 Great Wall no longer provides a free tech - whoops! 2019-10-03 22:11:06 +03:00
Duan Tao
2305f18233 Destroy planes when city is razed. 2019-10-03 16:32:27 +03:00
Smashfanful
9b86055fc7 Update Other.json 2019-10-03 16:32:00 +03:00
lishaoxia1985
0f51f76902
update 2019-10-03 17:32:19 +08:00
lishaoxia1985
48792ccae9
update 2019-10-03 17:29:17 +08:00
YueR
c9397572f9 update 2019-10-02 23:38:00 +08:00
YueR
2aba654b3a Merge remote-tracking branch 'upstream/master' 
update
 2019-10-02 23:24:52 +08:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
YueR
c2bd0724e8 update 2019-10-02 23:21:23 +08:00
Duan Tao
1f543843af Better worker AI. (#1136) 
* Better worker AI.

* Fix tiles to improve condition.

* tilesToImprove changed from member to function.

* Minor performance optimization.

* Use the same condition for worker AI long term and short term target.
 2019-10-02 17:49:07 +03:00
YueR
4afb23d093 Merge remote-tracking branch 'upstream/master' 
update
 2019-10-02 09:09:26 +08:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
Yair Morgenstern
dd561759e4 Fixed bug where Open Borders trades didn't work when loading games 2019-10-01 22:18:25 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +03:00
MrUldiggg
5c9baaf15a Sweden.json 
Just add any color you want
 2019-10-01 21:59:41 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
YueR
a49237a52c update 2019-09-29 23:47:02 +08:00
YueR
d75bb46b99 update 2019-09-29 22:57:57 +08:00
YueR
5e0bbc69df update 2019-09-29 22:54:22 +08:00
Smashfanful
a91fe87e26 Update Nations_Italian.json 2019-09-29 15:25:39 +03:00
Smashfanful
f4243550ce Update Other.json 2019-09-29 15:25:23 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Duan Tao
1607d0b17c Better AI choice for annexing and razing cities. (#1132) 2019-09-29 11:54:43 +03:00
Yair Morgenstern
3ce1c7ee9d Made battle damage more readable 2019-09-29 11:53:54 +03:00
YueR
9f28c2f60d Merge remote-tracking branch 'upstream/master' 
update
 2019-09-29 15:45:25 +08:00
lishaoxia1985
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127) 
* 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

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-29 10:33:18 +03:00
YueR
4c17e63c73 Merge remote-tracking branch 'upstream/master' 
update
 2019-09-29 14:40:59 +08:00
YueR
f5dd24bf35 update 2019-09-29 03:15:46 +08:00
Yair Morgenstern
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
Yair Morgenstern
4728423a26
Resolved #1098 - added developer steps 2019-09-28 21:57:25 +03:00
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Smashfanful
58fd3b2c6c Update NewGame,SaveGame,LoadGame,Options.json 
Added new lines
 2019-09-28 21:21:30 +03:00
Duan Tao
ba3103277a Fix Persia civ battle bonus. 2019-09-28 21:20:32 +03:00