Commit Graph

698 Commits

Author SHA1 Message Date
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
472c370c8f Added Terracotta Army wonder - part of #245 2019-04-08 22:36:50 +03:00
Yair Morgenstern
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
86ed7c2ec3
Merge pull request #632 from Am-per-Sand/master
Machu Picchu deresoluted
2019-04-08 08:51:56 +03:00
Am-per-Sand
28a63d8170
Machu Picchu deresoluted
Enlarged building to be more distinct on large screens in small scale
2019-04-07 22:32:28 +02:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +03:00
Yair Morgenstern
42eb3fa297 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-07 20:24:15 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Smashfanful
fb77a35901
Update Translations.json 2019-04-05 10:40:51 +02:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +03:00
Smashfanful
bf33bcaffc
Update Tutorials_Italian.json
Some minor corrections
2019-04-01 17:57:47 +02:00
Yair Morgenstern
6796c1868b Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game 2019-04-01 00:05:11 +03:00
Yair Morgenstern
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +03:00
Yair Morgenstern
38f732b461 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-29 15:18:17 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
18f96dd207
Merge pull request #611 from B5656/patch-3
Create BasicHelp_French.json
2019-03-29 15:10:55 +03:00
Yann
08c7671c68
Update GreatPeopleNames.json
little update, a " was missing
2019-03-29 12:01:33 +01:00
Yann
d0dac336b6
Create BasicHelp_French.json
add french version of the basic help
2019-03-29 11:50:38 +01:00
Yair Morgenstern
2f889fb57f
Merge branch 'master' into patch-2 2019-03-27 16:18:17 +02:00
Smashfanful
e4b9597fb1
Update Translations.json 2019-03-27 11:45:37 +01:00
Smashfanful
5f344c5299
Update Translations.json
Also added some translation you should add
2019-03-25 18:31:25 +01:00
Yann
d0b65da424
Update Translations.json
Update French version
2019-03-25 11:27:37 +01:00
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
Yair Morgenstern
9b7a796a03
Merge pull request #597 from Am-per-Sand/master
Frigate <-> Caravel icons swap
2019-03-22 00:59:12 +02:00
Yair Morgenstern
dddda38d57 City tiles no longer show "ground" area 2019-03-21 23:59:02 +02:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Am-per-Sand
e3a589ffb4
Frigate <-> Caravel icons swap 2019-03-21 15:21:03 +01:00
Am-per-Sand
36ead7a569
Delete Frigate.png 2019-03-21 15:19:17 +01:00
Am-per-Sand
c6ca334271
Delete Caravel.png 2019-03-21 15:19:07 +01:00
Yair Morgenstern
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
Yair Morgenstern
3f6dead4c6
Merge pull request #590 from Am-per-Sand/master
"Machu Picchu" typo
2019-03-21 12:30:24 +02:00
Yair Morgenstern
080a2f7e9a
Merge branch 'master' into patch-77 2019-03-20 23:37:20 +02:00
Yair Morgenstern
06c4ea25b6
Merge pull request #591 from Smashfanful/patch-76
Update Translations.json
2019-03-20 22:40:23 +02:00
Am-per-Sand
d16322d494
Delete Machu Pichu.png 2019-03-20 18:54:40 +01:00
Am-per-Sand
f83eed0d08
new wonder icon
Machu Picchu correct
2019-03-20 18:54:07 +01:00
Smashfanful
92f929506c
Update Translations.json 2019-03-20 17:06:25 +01:00
Smashfanful
3aaac3bb36
Update Translations.json 2019-03-20 17:05:24 +01:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
a52bc2776c Added Jungle tiles to FantasyHex tileset! 2019-03-20 13:06:18 +02:00
Yair Morgenstern
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
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Yair Morgenstern
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
Smashfanful
fbf700efdd
Update Translations.json 2019-03-19 19:44:22 +01:00
Am-per-Sand
56597f205b
"Machu Picchu" 2019-03-19 17:44:04 +01:00
Am-per-Sand
94ab46f540
"Machu Picchu" 2019-03-19 17:40:55 +01:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00