Commit graph

1057 commits

Author SHA1 Message Date
yairm210
5045d2c499
Merge pull request #345 from ninjatao/units_obselete
Some units obslete properly.
2018-12-13 17:10:43 +02:00
Duan Tao
c8ec2bcbb7 prefer to place new land units on land. 2018-12-13 19:54:04 +08:00
Duan Tao
92289b1952 Horseman obsletes when lancer shows up. 2018-12-13 19:33:58 +08:00
yairm210
042e295611
Merge pull request #344 from ninjatao/can_only_attack_water
Make submarine only attack water tiles.
2018-12-13 13:15:40 +02:00
yairm210
88939f6e86
Merge pull request #346 from ninjatao/cannot_continue_info
Cannot continue info now has city name.
2018-12-13 13:13:26 +02:00
Duan Tao
74efa3cfbc Cannot continue info now has city name. 2018-12-13 19:00:48 +08:00
Duan Tao
8d011dda41 Some units obslete properly. 2018-12-13 18:52:56 +08:00
Duan Tao
a9249ede0c Make submarine only attack water tiles. 2018-12-13 18:36:35 +08:00
yairm210
ac241d2744
Merge pull request #334 from ninjatao/add_battleship
Add Battleship. Enabled Electronics for battleship.
2018-12-13 12:21:45 +02:00
Duan Tao
b91e1f418f Fix attackable detection. 2018-12-13 12:29:55 +08:00
Duan Tao
11871991d3 Submarine can only be aimed by destroyers and submarines. 2018-12-13 12:14:09 +08:00
Yair Morgenstern
9e8930c263 Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v! 2018-12-12 23:05:14 +02:00
Yair Morgenstern
406fa60f61 Unhappiness battle modifier properly capped now 2018-12-12 22:57:03 +02:00
yairm210
9187465699
Merge pull request #335 from ninjatao/cityrange_tutorial
Add city range tutorial.
2018-12-12 22:34:42 +02:00
Duan Tao
36d7b30279 Submarine is invisible now, except to submarines and destroyers. But it still can be aimed by everybody. 2018-12-12 22:52:09 +08:00
Duan Tao
209eb4c73b Add submarine and refrigeration. Submarine is not invisible yet. 2018-12-12 13:23:29 +08:00
yairm210
6110fc1cd3
Merge pull request #330 from ninjatao/fix_embark_attack
Allow embarked units to attack land units, like in civ5.
2018-12-11 21:34:56 +02:00
yairm210
34edd303df
Merge pull request #337 from GaoSiming988/master
add tutorial_simplified_chinese
2018-12-11 21:31:54 +02:00
yairm210
b4544abfc9
Merge pull request #338 from ninjatao/fix_upgrade
Upgraded unit now gets promotions working.
2018-12-11 20:49:28 +02:00
Duan Tao
3ff5cd5140 Upgraded unit now gets promotions working. 2018-12-11 23:45:18 +08:00
Duan Tao
2cfdf13fc8 Add obslete condition for Frigate. 2018-12-11 22:27:56 +08:00
GaoSiming988
e53f83ddd4
add tutorial_simplified_chinese 2018-12-11 13:43:37 +01:00
Duan Tao
d73bf6d13f Fix spelling error. 2018-12-11 19:19:36 +08:00
Duan Tao
2e7a2cda12 Add city range tutorial. 2018-12-11 19:06:36 +08:00
Duan Tao
2edb566078 Add Battleship. Enabled Electronics for battleship. 2018-12-11 16:26:29 +08:00
yairm210
1850bb5c87
Merge pull request #331 from ninjatao/some_chinese_translation
some chinese translation correction.
2018-12-11 07:54:07 +02:00
Duan Tao
4f28c51511 some chinese translation correction. 2018-12-11 13:24:35 +08:00
Duan Tao
ed507ad063 Allow embarked units to attack land units, like in civ5. 2018-12-11 11:43:48 +08:00
Yair Morgenstern
63f1f501cd Added Hoplite (Greek unique unit) and Rome's unique ability 2018-12-10 22:31:03 +02:00
Yair Morgenstern
78879df350 Russian translations now in line with everyone else 2018-12-10 18:13:01 +02:00
Yair Morgenstern
422200e78d Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-10 18:10:42 +02:00
Yair Morgenstern
ec80dcc0c0 Minor translation changes 2018-12-10 18:10:19 +02:00
yairm210
1558b78f56
Merge pull request #327 from kypcop/patch-1
add some russian translates
2018-12-10 17:33:25 +02:00
Yair Morgenstern
437c422817 When exiting city, the city's unit is not selected 2018-12-10 16:26:38 +02:00
kypcop
f605ccbdd5
add some russian translates 2018-12-10 17:17:43 +03:00
Yair Morgenstern
7ee76771f5 Added some missing translations
aab/apk now doesn't einclude local debug files
Maybe solved resume problem on Chrome OS (see issue 322), needs to be checked
2018-12-10 14:09:01 +02:00
yairm210
2dd32b9a2c
Merge pull request #326 from ninjatao/fix_free_tech
Fix research queue when getting free tech.
2018-12-10 12:28:39 +02:00
Yair Morgenstern
197d698c57 Organized Freedom policies 2018-12-10 11:55:18 +02:00
Duan Tao
dc314fa315 Fix research queue when getting free tech. 2018-12-10 17:50:46 +08:00
Yair Morgenstern
6dbf6232e9 Hidden tiles no longer visible from inside the city screen - kudos flecheapolinienne! 2018-12-10 11:40:34 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00
Yair Morgenstern
70d6697f16 Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles 2018-12-10 11:04:40 +02:00
yairm210
4ea09a71b6
Merge pull request #312 from ninjatao/auto_specialist
Allow auto assign population to specialists.
2018-12-10 10:52:57 +02:00
Yair Morgenstern
1ba0929869 Font download now preceded by a "requires fonts, do you want to download?" message that allows you to opt out 2018-12-10 10:41:13 +02:00
Duan Tao
d364f3896c Allow ai city to re-assign specialists. 2018-12-10 11:34:30 +08:00
Yair Morgenstern
d1df5a2fdf Chinese font downloaded per-use basis - makes the android app require Internet permissions, but that was coming anyway 2018-12-09 19:47:21 +02:00
Duan Tao
bb12fc7cdb Code style improvement. 2018-12-09 19:05:33 +08:00
yairm210
01e7deed79
Merge pull request #316 from GaoSiming988/patch-1
add chinese, pls try it
2018-12-08 21:15:51 +02:00
GaoSiming988
8fa874a23c
Some error corrections of cn_translation
Some error corrections of cn_translation
2018-12-08 20:02:45 +01:00
GaoSiming988
8dc58cc583
add chinese, pls try it
add chinese, pls try it
2018-12-08 19:32:51 +01:00