Jasmine Hyder 1fd6eeac95 Fixing merge conflicts

2021-12-09 20:52:13 -06:00

..

Ash.tres

Base version of game

2021-10-19 12:58:01 -05:00

default_env.tres

Base version of game

2021-10-19 12:58:01 -05:00

level4tileset.png

Fix merge conflicts when trying to merge main into forest

2021-12-08 14:43:39 -06:00

level4tileset.png.import

Fix merge conflicts when trying to merge main into forest

2021-12-08 14:43:39 -06:00

level4tileset.tres

Fix merge conflicts when trying to merge main into forest

2021-12-08 14:43:39 -06:00

Level_4_Tileset.tres

Reorganized files

2021-12-05 17:52:54 -06:00

Level_5_Enemy_Glowing_Ghost_Occluder.tres

Major collision detection improvements, more file organization, and added key interactable

2021-12-04 00:07:33 -06:00

Level_5_Floor_Tileset.tres

Major collision detection improvements, more file organization, and added key interactable

2021-12-04 00:07:33 -06:00

Level_5_Walls_Tileset.tres

Implement level 1

2021-12-08 02:21:21 -06:00

tileSet.tres

Merged with main and fixed merge conflicts

2021-11-29 13:22:17 -06:00