Commit graph

1335 commits

Author SHA1 Message Date
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
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
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
Yair Morgenstern
fd772a93a2
Merge pull request #589 from ninjatao/upgrade_to_itself
Fixed : unit upgrades to itself with 10 gold.
2019-03-18 16:01:50 +02:00
Duan Tao
11bb63495b Fixed : unit upgrades to itself with 10 gold. 2019-03-18 18:40:11 +08:00
Yair Morgenstern
3086520bd2 Hopefully solved a YouCantGetThereFromHereException in tryAttackNearbyEnemy 2019-03-18 06:47:17 +02:00
Yair Morgenstern
c33b0a67fe Resolved #586 - units now upgrade to the most recent upgrade, not to the next possible one 2019-03-17 23:10:11 +02:00
Yair Morgenstern
f1f3753231 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-17 20:33:07 +02:00
Yair Morgenstern
d307c638b5 Resolved #577 - fixed translations where the text in brackets didn't fit the pattern 2019-03-17 20:33:02 +02:00
Yair Morgenstern
1004f1aaca
Merge pull request #584 from ninjatao/water_defense
Embarked civilian units should have no defense.
2019-03-17 13:30:46 +02:00
Yair Morgenstern
6f6bd85d27
Merge pull request #583 from ninjatao/units_upgrade
Fix a very stupid obselete define.
2019-03-17 13:30:08 +02:00
Duan Tao
f8a8d7bbfb Embarked civilian units should have no defense. 2019-03-17 15:50:52 +08:00
Duan Tao
a495413481 Fix a very stupid obselete define. 2019-03-17 14:48:05 +08:00
Yair Morgenstern
1c4989c6b5
Merge pull request #582 from ninjatao/units_upgrade
Modern units upgrade tree.
2019-03-17 07:10:14 +02:00
Duan Tao
ea36508200 Modern units upgrade tree. 2019-03-17 11:39:32 +08:00
Yair Morgenstern
625017f270
Merge pull request #578 from Am-per-Sand/patch-1
Variable names warning for translators
2019-03-16 21:01:36 +02:00
Am-per-Sand
9f09c2dc55
Variable names warning for translators 2019-03-16 18:55:41 +01:00
Yair Morgenstern
29bc82e1bd Diplomacy screen redesigned, to allow for more diplomacy options in the future 2019-03-15 12:14:19 +02:00
Yair Morgenstern
ab2e044a09 Units no longer freeze on the spot when they need to heal but can't find where 2019-03-15 10:41:51 +02:00
Yair Morgenstern
36781e4b55 Unified ranking tiles for healing logic 2019-03-15 10:34:16 +02:00
Yair Morgenstern
5873ccc848 Resolved #541 - change "Replacable Parts" to "Replaceable Parts", also in saved games
Continuation of #571
2019-03-15 10:21:00 +02:00
Yair Morgenstern
34a3c3dfae
Merge pull request #572 from L314/spelling
"Replacable Parts" is now "Replaceable Parts"
2019-03-15 10:08:10 +02:00
Yair Morgenstern
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
Yair Morgenstern
9bccc739d4
Merge pull request #574 from Smashfanful/patch-74
Update Nations.json
2019-03-14 21:47:22 +02:00
Yair Morgenstern
8de1d2b5f7
Merge pull request #573 from Smashfanful/patch-73
Update Nations_Italian.json
2019-03-14 21:44:32 +02:00
Yair Morgenstern
72734de254
Merge pull request #575 from Smashfanful/patch-75
Update Translations.json
2019-03-14 21:41:14 +02:00
Yair Morgenstern
456f524601 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-03-14 21:33:38 +02:00
Yair Morgenstern
db6c47e13a Sorted spacing issues 2019-03-14 21:33:33 +02:00
Smashfanful
72ebc2ae4d
Update Translations.json 2019-03-14 12:24:14 +01:00
Smashfanful
776ce635dd
Update Nations.json 2019-03-14 11:34:04 +01:00
Smashfanful
50871d02e3
Update Nations_Italian.json 2019-03-14 11:33:44 +01:00
Smashfanful
f67b4370ca
Update Nations_Italian.json 2019-03-14 11:30:06 +01:00
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