Description:
Add fence and tower.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
|
|
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
| @@ -47,7 +47,7 | |||||
|
|
47 | ## Merged |
|
47 | ## Merged |
|
|
48 |
|
48 | ||
|
|
49 | isometric-park-fna/Content/merged_tileset.png: isometric-park-fna/Content/pak64_tileset.png |
|
49 | isometric-park-fna/Content/merged_tileset.png: isometric-park-fna/Content/pak64_tileset.png |
|
|
50 |
montage isometric-park-fna/Content/part4_tileset.png $^ isometric-park-fna/Content/remos_trees.png -background transparent -geometry +0+0 -tile 1x PNG |
|
50 | montage isometric-park-fna/Content/part4_tileset.png $^ isometric-park-fna/Content/remos_trees2.png isometric-park-fna/Content/64x64_Objects_2.png isometric-park-fna/Content/rubberduck_parts_tower.png -background transparent -geometry +0+0 -tile 1x PNG:isometric-park-fna/Content/merged_tileset.png |
|
|
51 |
|
51 | ||
|
|
52 | merged: isometric-park-fna/Content/merged_tileset.png |
|
52 | merged: isometric-park-fna/Content/merged_tileset.png |
|
|
53 |
|
53 | ||
| @@ -155,7 +155,7 | |||||
|
|
155 |
|
155 | ||
|
|
156 | ## Acknowledgements ## |
|
156 | ## Acknowledgements ## |
|
|
157 |
|
157 | ||
|
|
158 | Art: [Isometric 64x64 Outside Tileset by Yar](https://opengameart.org/content/isometric-64x64-outside-tileset), various images from the Library of Congress and USDA Forest Service |
|
158 | Art: [Isometric 64x64 Outside Tileset by Yar](https://opengameart.org/content/isometric-64x64-outside-tileset), [Peaceful](https://silivar.itch.io/isometric-asset-pack-peaceful) by Silivar various images from the Library of Congress and USDA Forest Service |
|
|
159 |
|
159 | ||
|
|
160 | Libraries: [FNA](https://fna-xna.github.io/), [SpriteFontPlus](https://github.com/rds1983/SpriteFontPlus), [Tracery.Net](https://github.com/josh-perry/Tracery.Net), [ImGui.NET](http://imgui.net/), and [Encompass-cs](http://moonside.games/docs/encompass/) |
|
160 | Libraries: [FNA](https://fna-xna.github.io/), [SpriteFontPlus](https://github.com/rds1983/SpriteFontPlus), [Tracery.Net](https://github.com/josh-perry/Tracery.Net), [ImGui.NET](http://imgui.net/), and [Encompass-cs](http://moonside.games/docs/encompass/) |
|
|
161 |
|
161 | ||
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -719,6 +719,18 | |||||
|
|
719 | drawTileAt(6, 4, 141, 3); |
|
719 | drawTileAt(6, 4, 141, 3); |
|
|
720 | drawTileAt(8, 4, 142, 2); |
|
720 | drawTileAt(8, 4, 142, 2); |
|
|
721 | drawTileAt(10, 4, 142, 3); |
|
721 | drawTileAt(10, 4, 142, 3); |
|
|
|
722 | |||
|
|
|
723 | for (int i = 10; i < 199; i++) { | ||
|
|
|
724 | drawTileAt(10, i, 281, 1); | ||
|
|
|
725 | } | ||
|
|
|
726 | drawTileAt(10, 199, 284, 1); | ||
|
|
|
727 | drawTileAt(11, 199, 280, 1); | ||
|
|
|
728 | drawTileAt(12, 199, 280, 1); | ||
|
|
|
729 | drawTileAt(13, 199, 283, 1); | ||
|
|
|
730 | drawTileAt(13, 198, 281, 1); | ||
|
|
|
731 | drawTileAt(13, 197, 282, 1); | ||
|
|
|
732 | drawTileAt(12, 197, 285, 1); | ||
|
|
|
733 | drawTileAt(12, 25, 300, 2); | ||
|
|
722 | #endif |
|
734 | #endif |
|
|
723 |
|
735 | ||
|
|
724 | #region draw_cursor |
|
736 | #region draw_cursor |
You need to be logged in to leave comments.
Login now