Skip to content
Snippets Groups Projects
Commit b578e0b4 authored by annavah's avatar annavah
Browse files

Merge branch 'meeting_room' into 'master' 

Added meeting room, edited woodshop

See merge request !3
parents 53bd533c 22d3da83
No related branches found
No related tags found
1 merge request!3Added meeting room, edited woodshop
Expand all Hide whitespace changes
Inline Side-by-side
maps/main.json
+ 4
− 4
View file @ b578e0b4
This diff is collapsed.
maps/tiles_png/warpzone/warpzone.png
+ 0
− 0
View replaced file @ 53bd533c View file @ b578e0b4
maps/tiles_png/warpzone/warpzone.png

53.8 KiB | W: | H:

maps/tiles_png/warpzone/warpzone.png

56.8 KiB | W: | H:

maps/tiles_png/warpzone/warpzone.png
maps/tiles_png/warpzone/warpzone.png
maps/tiles_png/warpzone/warpzone.png
maps/tiles_png/warpzone/warpzone.png
  • 2-up
  • Swipe
  • Onion skin
maps/tiles_png/warpzone/warpzone.png.kra
+ 0
− 0
View file @ b578e0b4
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment