Merge branch 'master' of https://github.com/Supergamer1337/DungeonCra…

…wler
Supergamer1337 · Mar 31, 2019 · 19aa11a · 19aa11a
2 parents 32ea066 + b606467
commit 19aa11a
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 58 deletions.
diff --git a/Game Folder/rooms/test5/test5.yy b/Game Folder/rooms/test5/test5.yy
diff --git a/Game Folder/sprites/en_spr_boss/54e66085-a24c-430b-9304-ba0cbb8c5974.png b/Game Folder/sprites/en_spr_boss/54e66085-a24c-430b-9304-ba0cbb8c5974.png
diff --git a/Game Folder/sprites/en_spr_boss/583c1f67-c471-4f9c-84be-d8999a952e41.png b/Game Folder/sprites/en_spr_boss/583c1f67-c471-4f9c-84be-d8999a952e41.png
diff --git a/Game Folder/sprites/en_spr_boss/en_spr_boss.yy b/Game Folder/sprites/en_spr_boss/en_spr_boss.yy
diff --git a/...s/54e66085-a24c-430b-9304-ba0cbb8c5974/3181bd08-fa95-4fe9-94f2-1ae73ebc6c8e.png b/...s/54e66085-a24c-430b-9304-ba0cbb8c5974/3181bd08-fa95-4fe9-94f2-1ae73ebc6c8e.png
diff --git a/...s/583c1f67-c471-4f9c-84be-d8999a952e41/62789809-6355-4963-ab69-85c4c1378708.png b/...s/583c1f67-c471-4f9c-84be-d8999a952e41/62789809-6355-4963-ab69-85c4c1378708.png
diff --git a/Game Folder/sprites/fr_spr_attack/01c014a3-8756-4b74-9b8e-7473e3b1ee14.png b/Game Folder/sprites/fr_spr_attack/01c014a3-8756-4b74-9b8e-7473e3b1ee14.png
diff --git a/Game Folder/sprites/fr_spr_attack/48f9f711-622c-48cc-8e91-4c4eda1b42e8.png b/Game Folder/sprites/fr_spr_attack/48f9f711-622c-48cc-8e91-4c4eda1b42e8.png
diff --git a/Game Folder/sprites/fr_spr_attack/fr_spr_attack.yy b/Game Folder/sprites/fr_spr_attack/fr_spr_attack.yy
diff --git a/...s/01c014a3-8756-4b74-9b8e-7473e3b1ee14/5e608840-3505-43ae-b055-a8de86103dcb.png b/...s/01c014a3-8756-4b74-9b8e-7473e3b1ee14/5e608840-3505-43ae-b055-a8de86103dcb.png
diff --git a/...s/48f9f711-622c-48cc-8e91-4c4eda1b42e8/1e799ab5-61b3-43b4-b3db-43f5de2f5ea7.png b/...s/48f9f711-622c-48cc-8e91-4c4eda1b42e8/1e799ab5-61b3-43b4-b3db-43f5de2f5ea7.png
diff --git a/Game Folder/sprites/fr_spr_player/70ef5e73-bafa-43ad-b511-6758014d4a5e.png b/Game Folder/sprites/fr_spr_player/70ef5e73-bafa-43ad-b511-6758014d4a5e.png
diff --git a/Game Folder/sprites/fr_spr_player/950ca5c3-5677-4e02-b972-fc1e3d0773f7.png b/Game Folder/sprites/fr_spr_player/950ca5c3-5677-4e02-b972-fc1e3d0773f7.png
diff --git a/Game Folder/sprites/fr_spr_player/fr_spr_player.yy b/Game Folder/sprites/fr_spr_player/fr_spr_player.yy
diff --git a/...s/70ef5e73-bafa-43ad-b511-6758014d4a5e/c82ca73d-16f0-457d-82b8-e8dd68f8107d.png b/...s/70ef5e73-bafa-43ad-b511-6758014d4a5e/c82ca73d-16f0-457d-82b8-e8dd68f8107d.png
diff --git a/...s/950ca5c3-5677-4e02-b972-fc1e3d0773f7/291d344f-96a0-4c5f-bd3e-83eb8ffc4564.png b/...s/950ca5c3-5677-4e02-b972-fc1e3d0773f7/291d344f-96a0-4c5f-bd3e-83eb8ffc4564.png
diff --git a/Game Folder/sprites/spr_teleport/36e17589-5e2b-4b39-bde8-e6faaf4dc6be.png b/Game Folder/sprites/spr_teleport/36e17589-5e2b-4b39-bde8-e6faaf4dc6be.png
diff --git a/Game Folder/sprites/spr_teleport/ffc8eabf-34ad-4211-93d7-f1b41fab5088.png b/Game Folder/sprites/spr_teleport/ffc8eabf-34ad-4211-93d7-f1b41fab5088.png
diff --git a/...s/36e17589-5e2b-4b39-bde8-e6faaf4dc6be/29167690-aa09-4b49-8905-ed079425aea0.png b/...s/36e17589-5e2b-4b39-bde8-e6faaf4dc6be/29167690-aa09-4b49-8905-ed079425aea0.png
diff --git a/...s/ffc8eabf-34ad-4211-93d7-f1b41fab5088/b602090a-12f4-4063-b405-d377a58545f8.png b/...s/ffc8eabf-34ad-4211-93d7-f1b41fab5088/b602090a-12f4-4063-b405-d377a58545f8.png
diff --git a/Game Folder/sprites/spr_teleport/spr_teleport.yy b/Game Folder/sprites/spr_teleport/spr_teleport.yy