1274 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
Smashfanful	3026a500d2	Update Translations.json ... There are various non-Italian translation that are made with Google Translator, so they may be vague. Feel free to correct them.	2019-03-08 12:55:17 +01:00
Yair Morgenstern	2ec8225c20	Resolved #384 - can now sell one building per city per turn	2019-03-08 13:45:12 +02:00
Duan Tao	b6d4ff8747	Slightly better build order. AI has more troops.	2019-03-08 18:48:06 +08:00
Yair Morgenstern	adea36fb81	Commented out snow - we don't want it appearing in patches until we have better map generation	2019-03-08 10:15:10 +02:00
Yair Morgenstern	7b6d37053b	Merge pull request #528 from Smashfanful/patch-49 ... Update Nations_Italian.json	2019-03-07 23:09:04 +02:00
Yair Morgenstern	f15490d0ac	Resolved #470 - can now click on a building in the city info table to display its effect ... Organized city info table	2019-03-07 23:05:48 +02:00
Yair Morgenstern	6f46750c15	Merge pull request #532 from Smashfanful/patch-53 ... Update Translations.json	2019-03-07 19:15:04 +02:00
Yair Morgenstern	8fff034221	Merge pull request #531 from Smashfanful/patch-52 ... Update Buildings.json	2019-03-07 19:14:33 +02:00
Yair Morgenstern	15cb18ca26	Merge pull request #530 from Smashfanful/patch-51 ... Update Units.json	2019-03-07 19:14:17 +02:00
Yair Morgenstern	bc2a4882c5	Merge pull request #519 from Smashfanful/patch-46 ... Update Terrains.json	2019-03-07 19:09:06 +02:00
Smashfanful	7713170d97	Update Translations.json	2019-03-07 17:32:28 +01:00
Smashfanful	c93ee1e1f2	Update Buildings.json ... Added Walls of Babylon. Should I also add Forum for Rome, Obelisk for Egypt and Shale Plant for Japan (all from CIV4)?	2019-03-07 17:28:46 +01:00
Smashfanful	873d4f1cff	Update Units.json ... Added War Chariots for Egypt, Chu-Ko-Nu for China, Cossack for Russia, Ship of the Line for England, and Legion for Rome. Legion should also build roads. Some suggestion to updates for Legion, Samurai and Camel Archer.	2019-03-07 17:18:30 +01:00
Smashfanful	c34249a66e	Update Nations_Italian.json ... Corrections.	2019-03-07 15:54:32 +01:00
Yair Morgenstern	b73ee6d1e0	Merge pull request #527 from ninjatao/runtime_json_error ... Fix json error.	2019-03-07 11:53:14 +02:00
Duan Tao	0c6826fd9b	Fix json error.	2019-03-07 14:01:57 +08:00
Yair Morgenstern	6a833ae89a	Resolved #514 - enemy civ is defeated even when he has settlers left, as per original Civ	2019-03-06 20:39:53 +02:00
Yair Morgenstern	4dcf2cacc4	Merge pull request #521 from Smashfanful/patch-48 ... Update Translations.json	2019-03-06 20:37:07 +02:00
Yair Morgenstern	c0652a79f1	Merge pull request #520 from Smashfanful/patch-47 ... Update TileResources.json	2019-03-06 20:36:38 +02:00
Smashfanful	aab1ebb47d	Update Translations.json	2019-03-06 18:51:06 +01:00
Smashfanful	42d043a8ad	Update TileResources.json ... Added Copper, Bison, Citrus, Crab, Truffles and Cocoa	2019-03-06 16:33:23 +01:00
Smashfanful	da2a95512e	Update Terrains.json ... Added Snow, and updated Desert and Tundra.	2019-03-06 15:45:51 +01:00
Yair Morgenstern	10508792db	Merge pull request #517 from Smashfanful/patch-44 ... Update Nations_Italian.json	2019-03-06 15:45:38 +02:00
Yair Morgenstern	c5e7870f38	Merge pull request #518 from Smashfanful/patch-45 ... Update Nations.json	2019-03-06 15:45:25 +02:00
Smashfanful	ae6189164e	Update Nations.json	2019-03-06 14:27:50 +01:00
Smashfanful	249b9fe57d	Update Nations_Italian.json	2019-03-06 14:27:44 +01:00