mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 16:54:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Show arrows on map for unit actions: Asset files. (#5825)

Browse Source 
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

* Assets for map arrows overlay.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
This commit is contained in:
will-ca 2021-12-25 12:29:19 -08:00 committed by GitHub
parent b744acdc55
commit af941754cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
*.svg binary
# These are basically image files.

BIN
android/Images/TileSets/FantasyHex/Arrows/Generic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 843 B

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitHasAttacked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 B

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 841 B

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitMoving.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 756 B

BIN
android/ImagesToNotAddToGame/Arrows.svg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
android/ImagesToNotAddToGame/Footprints.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

1
android/ImagesToNotAddToGame/SVGExport/README Normal file
View File

@ -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.

1
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -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

2
docs/Credits.md
View File

@ -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