Commit graph

1550 commits

Author SHA1 Message Date
Lliam Leosh
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
Yair Morgenstern
6a45bdb723
Merge pull request #569 from Smashfanful/patch-71
Update Nations.json
2019-03-13 18:01:30 +02:00
Smashfanful
53bbd84e3a
Update Nations.json 2019-03-13 16:38:38 +01:00
Yair Morgenstern
7d312eea39
Merge pull request #567 from ninjatao/AI_peace
AIs negociate peace.
2019-03-13 13:10:57 +02:00
Duan Tao
d113a88e21 AIs negociate peace. 2019-03-13 18:13:39 +08:00
Yair Morgenstern
479b3a02ad Resolved #383 - Configurable amount of turns between autosaves 2019-03-12 22:10:25 +02:00
Yair Morgenstern
4669d4aa2a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-12 19:26:12 +02:00
Yair Morgenstern
eba3aa3033 no message 2019-03-12 19:25:41 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
7a26dc335b
Merge pull request #562 from Smashfanful/patch-69
Update Tutorials_Italian.json
2019-03-12 19:24:46 +02:00
Yair Morgenstern
f69be35647
Merge pull request #564 from ninjatao/fix_buildings_list
Fix builds list in city screen.
2019-03-12 18:19:31 +02:00
Duan Tao
67eb3a86e0 Fix builds list in city screen. 2019-03-12 22:18:30 +08:00
Yair Morgenstern
02f1530c44 Fixed translation file 2019-03-11 20:20:07 +02:00
Smashfanful
54189ae296
Update Tutorials_Italian.json
Added some lines for the Italian version.
2019-03-11 17:08:47 +01:00
Yair Morgenstern
cef4eafa0f
Merge pull request #557 from ninjatao/fix_bombarf_crash
Fix bombard crash.
2019-03-11 17:52:05 +02:00
Duan Tao
1a5862d6b1 Fix build error... 2019-03-11 23:19:40 +08:00
Duan Tao
dbf48ac7bf Fix bombard crash. 2019-03-11 23:07:04 +08:00
Yair Morgenstern
c69aea2125
Merge pull request #555 from Smashfanful/patch-65
Update Translations.json
2019-03-11 16:46:24 +02:00
Yair Morgenstern
88a3b6e59f
Merge pull request #542 from Smashfanful/patch-58
Update Nations.json
2019-03-11 16:45:37 +02:00
Yair Morgenstern
b05386062b
Merge pull request #553 from Smashfanful/patch-63
Update BasicHelp.json
2019-03-11 16:44:16 +02:00
Smashfanful
40b0125320
Update Translations.json
Three new Wonders suggested by Smashfanful: Mausoleum of Halicarnassus, Himeji Castle and Statue of Zeus
2019-03-11 15:01:29 +01:00
Smashfanful
968667208b
Update Nations.json 2019-03-11 14:15:04 +01:00
Smashfanful
4e5d2bd127
Update BasicHelp.json
Some grammatical errors have been corrected, I hope.
2019-03-11 14:13:44 +01:00
Yair Morgenstern
0fcc3a6807 Fixed bug where setting the max. amount of AI players meant that there was no human player, so people got a fully-fogged out map 2019-03-10 23:43:49 +02:00
Yair Morgenstern
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02:00
Yair Morgenstern
aea7d750fd Added a popup when trying and faiing to load a game, so people will send me emails when this happens 2019-03-10 23:13:04 +02:00
Yair Morgenstern
881f532bf7 Memory-saving tweak 2019-03-10 23:04:04 +02:00
Yair Morgenstern
115aef50ad Better starting locations on tiny map with lots of players 2019-03-10 23:03:25 +02:00
Yair Morgenstern
09b1446fea Removed empty translations (very bad for people who play the game in that language)
Added a way to copy game info directly from files, and also a popup when encountering a certain error, for debugging purposes
2019-03-10 22:52:57 +02:00
Yair Morgenstern
c924052a12
Merge pull request #548 from Smashfanful/patch-61
Update Translations.json
2019-03-10 22:33:06 +02:00
Smashfanful
ac9c942dd3
Update Translations.json 2019-03-10 19:09:12 +01:00
Yair Morgenstern
883469a6b9
Merge pull request #547 from ninjatao/explorer_heal
Auto-explore heals if injured.
2019-03-10 15:52:16 +02:00
Duan Tao
5173bd98a2 Auto-explore heals if injured. 2019-03-10 20:42:13 +08:00
Yair Morgenstern
319b1c8524 Can now attack enemies from the map, just like moving units 2019-03-09 22:56:20 +02:00
Yair Morgenstern
d26aaf9a35 Now it should compile properly
Also fixed tabbing for simplified chinese and portuguese translations, which was consistently off
2019-03-09 22:34:30 +02:00
Yair Morgenstern
51747e4fd2
Merge pull request #540 from Smashfanful/patch-57
Update Units.json
2019-03-09 22:09:45 +02:00
Yair Morgenstern
8e74797a44
Merge pull request #539 from Smashfanful/patch-56
Update Nations.json
2019-03-09 22:08:14 +02:00
Yair Morgenstern
949042872a
Merge pull request #538 from Smashfanful/patch-55
Update Translations.json
2019-03-09 22:07:24 +02:00
Yair Morgenstern
3883261d45
Merge pull request #537 from ninjatao/jira/493
Better defeat condition.
2019-03-09 22:07:07 +02:00
Smashfanful
01d24e6363
Update Nations.json
Added Starting Bias, Ability names and Adjectives.
2019-03-09 14:58:55 +01:00
Smashfanful
8067147266
Update Units.json
Added much more units.
2019-03-08 19:08:02 +01:00
Smashfanful
0ccde1896a
Update Nations.json 2019-03-08 19:05:08 +01:00
Smashfanful
a008b4521c
Update Translations.json 2019-03-08 18:09:55 +01:00
Duan Tao
451a95a86c Better defeat condition. 2019-03-08 22:37:26 +08:00
Yair Morgenstern
94fb9af4a1
Merge pull request #536 from ninjatao/jira/493
Load proper citiesCreated info.
2019-03-08 16:36:43 +02:00
Duan Tao
01dd1fccd7 Load proper citiesCreated info. 2019-03-08 22:23:56 +08:00
Yair Morgenstern
40e2bb9323 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-08 15:44:27 +02:00
Yair Morgenstern
9d37c551e3 Add translation items for selling buildings 2019-03-08 15:44:11 +02:00
Yair Morgenstern
077db3b843
Merge pull request #535 from Smashfanful/patch-54
Update Translations.json
2019-03-08 15:43:37 +02:00
Yair Morgenstern
fa181275b0
Merge pull request #534 from ninjatao/test_warfare
Slightly better build order. AI has more troops.
2019-03-08 15:41:49 +02:00