Merge branch 'develop' into art

Exit player and create master tilemap
Also removed test tiles
2026-02-15 18:37:07 -05:00 · 2026-02-15 18:36:16 -05:00
6 changed files with 9 additions and 0 deletions
--- a/src/assets/player/player.pxo
+++ b/src/assets/player/player.pxo
--- a/src/assets/tiles/TESTTILE.png
+++ b/src/assets/tiles/TESTTILE.png
--- a/src/assets/tiles/master_tilemap.png
+++ b/src/assets/tiles/master_tilemap.png
--- a/src/assets/tiles/master_tilemap.pxo
+++ b/src/assets/tiles/master_tilemap.pxo
--- a/src/assets/tiles/master_tilemap_addresses.txt
+++ b/src/assets/tiles/master_tilemap_addresses.txt
@@ -0,0 +1,9 @@
 0 - martian ground
 1 - martian ground barrier UP
 2 - martian ground barrier DOWN
 3 - martian ground barrier LEFT
 4 - martian ground barrier RIGHT
 5 - martian ground barrier TOP RIGHT CORNER
 6 - martian ground barrier TOP LEFT CORNER
 7 - martian ground barrier BOTTOM RIGHT CORNER
 8 - martian ground barrier BOTTOM LEFT CORNER
--- a/src/assets/tiles/test_tile.pxo
+++ b/src/assets/tiles/test_tile.pxo
Author	SHA1	Message	Date
WiseNoodle	671a5172ab	Merge branch 'develop' into art	2026-02-15 18:37:07 -05:00
WiseNoodle	a8a0126d11	Exit player and create master tilemap Also removed test tiles	2026-02-15 18:36:16 -05:00