Commit Graph

679 Commits

Author SHA1 Message Date
08c7671c68 Update GreatPeopleNames.json
little update, a " was missing
2019-03-29 12:01:33 +01:00
2f889fb57f Merge branch 'master' into patch-2 2019-03-27 16:18:17 +02:00
e4b9597fb1 Update Translations.json 2019-03-27 11:45:37 +01:00
5f344c5299 Update Translations.json
Also added some translation you should add
2019-03-25 18:31:25 +01:00
d0b65da424 Update Translations.json
Update French version
2019-03-25 11:27:37 +01:00
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
9b7a796a03 Merge pull request #597 from Am-per-Sand/master
Frigate <-> Caravel icons swap
2019-03-22 00:59:12 +02:00
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
e3a589ffb4 Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
36ead7a569 Delete Frigate.png 2019-03-21 15:19:17 +01:00
c6ca334271 Delete Caravel.png 2019-03-21 15:19:07 +01:00
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu"
Changed info in saved games to fit the change
2019-03-21 12:53:41 +02:00
3f6dead4c6 Merge pull request #590 from Am-per-Sand/master
"Machu Picchu" typo
2019-03-21 12:30:24 +02:00
080a2f7e9a Merge branch 'master' into patch-77 2019-03-20 23:37:20 +02:00
06c4ea25b6 Merge pull request #591 from Smashfanful/patch-76
Update Translations.json
2019-03-20 22:40:23 +02:00
d16322d494 Delete Machu Pichu.png 2019-03-20 18:54:40 +01:00
f83eed0d08 new wonder icon
Machu Picchu correct
2019-03-20 18:54:07 +01:00
92f929506c Update Translations.json 2019-03-20 17:06:25 +01:00
3aaac3bb36 Update Translations.json 2019-03-20 17:05:24 +01:00
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
1d88e76452 Split map into layers for base image, features, overlays, and fog
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
2019-03-20 12:09:54 +02:00
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
9d5c6911fd Added a tileset for Thorm maps - beutiful stuff but doesn't zoom in well, hope I'll be able to find a more HQ version of this type 2019-03-19 23:13:46 +02:00
fbf700efdd Update Translations.json 2019-03-19 19:44:22 +01:00
56597f205b "Machu Picchu" 2019-03-19 17:44:04 +01:00
94ab46f540 "Machu Picchu" 2019-03-19 17:40:55 +01:00
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
21377f63e7 Added Tilesets, for alternative tile images - this could be big!
Options table is now a table, not a list - more room for future options
2019-03-19 17:09:51 +02:00
f1f3753231 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-17 20:33:07 +02:00
d307c638b5 Resolved #577 - fixed translations where the text in brackets didn't fit the pattern 2019-03-17 20:33:02 +02:00
a495413481 Fix a very stupid obselete define. 2019-03-17 14:48:05 +08:00
ea36508200 Modern units upgrade tree. 2019-03-17 11:39:32 +08:00
9f09c2dc55 Variable names warning for translators 2019-03-16 18:55:41 +01:00
34a3c3dfae Merge pull request #572 from L314/spelling
"Replacable Parts" is now "Replaceable Parts"
2019-03-15 10:08:10 +02:00
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
9bccc739d4 Merge pull request #574 from Smashfanful/patch-74
Update Nations.json
2019-03-14 21:47:22 +02:00
8de1d2b5f7 Merge pull request #573 from Smashfanful/patch-73
Update Nations_Italian.json
2019-03-14 21:44:32 +02:00
72734de254 Merge pull request #575 from Smashfanful/patch-75
Update Translations.json
2019-03-14 21:41:14 +02:00
456f524601 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-14 21:33:38 +02:00
db6c47e13a Sorted spacing issues 2019-03-14 21:33:33 +02:00
72ebc2ae4d Update Translations.json 2019-03-14 12:24:14 +01:00
776ce635dd Update Nations.json 2019-03-14 11:34:04 +01:00
50871d02e3 Update Nations_Italian.json 2019-03-14 11:33:44 +01:00
f67b4370ca Update Nations_Italian.json 2019-03-14 11:30:06 +01:00
32fbabdd19 "Replacable Parts" is now "Replaceable Parts" 2019-03-14 02:55:22 -05:00
53bbd84e3a Update Nations.json 2019-03-13 16:38:38 +01:00