diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..90a66bb51c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.svg binary +# These are basically image files. diff --git a/android/Images/TileSets/FantasyHex/Arrows/Generic.png b/android/Images/TileSets/FantasyHex/Arrows/Generic.png new file mode 100644 index 0000000000..8b35cc39bf Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/Generic.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png b/android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png new file mode 100644 index 0000000000..c7ba0aa5d0 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitHasAttacked.png b/android/Images/TileSets/FantasyHex/Arrows/UnitHasAttacked.png new file mode 100644 index 0000000000..429321afe5 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitHasAttacked.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png b/android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png new file mode 100644 index 0000000000..370513df01 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitMoving.png b/android/Images/TileSets/FantasyHex/Arrows/UnitMoving.png new file mode 100644 index 0000000000..627fb4a458 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitMoving.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png b/android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png new file mode 100644 index 0000000000..646dc64a98 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png differ diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png b/android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png new file mode 100644 index 0000000000..598b18da90 Binary files /dev/null and b/android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png differ diff --git a/android/ImagesToNotAddToGame/Arrows.svg b/android/ImagesToNotAddToGame/Arrows.svg new file mode 100644 index 0000000000..c265b599b7 Binary files /dev/null and b/android/ImagesToNotAddToGame/Arrows.svg differ diff --git a/android/ImagesToNotAddToGame/Footprints.png b/android/ImagesToNotAddToGame/Footprints.png new file mode 100644 index 0000000000..834775f89b Binary files /dev/null and b/android/ImagesToNotAddToGame/Footprints.png differ diff --git a/android/ImagesToNotAddToGame/SVGExport/README b/android/ImagesToNotAddToGame/SVGExport/README new file mode 100644 index 0000000000..2b19bec066 --- /dev/null +++ b/android/ImagesToNotAddToGame/SVGExport/README @@ -0,0 +1 @@ +This is just an empty directory so the export filepaths saved in SVG files have somewhere to put PNGs after you've edited them. diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 5c891ed179..637ec96f50 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -12,7 +12,6 @@ import com.unciv.logic.map.TileInfo import com.unciv.models.AttackableTile import com.unciv.models.UnitActionType import com.unciv.models.helpers.UnitMovementMemoryType - import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType diff --git a/docs/Credits.md b/docs/Credits.md index 0658af7fbb..d7c2bcc915 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -672,6 +672,8 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Mountains ](https://thenounproject.com/term/mountains/15616/) by Andrew J. Young as base for Civilopedia category Terrains * [File:Maya.svg](https://en.wikipedia.org/wiki/File:Maya.svg) for Mayan numerals * [East side of stela C, Quirigua](https://en.wikipedia.org/wiki/File:East_side_of_stela_C,_Quirigua.PNG) for Mayan calendar symbols +* [Footprints](https://thenounproject.com/icon/footprints-1393611/) by Abdul Wahhab for movement overlay toggle, slightly modified. Currently unused. +* Arrows.svg by Intralexical (@will-ca), CC0. ## Main menu