Commit Graph

17 Commits

Author SHA1 Message Date
Jasmine Hyder
9d8de425bb Ghost enemy and other changes 2021-12-09 20:39:56 -06:00
Jasmine Hyder
6d9267d23b Fix merge conflicts when trying to merge main into forest 2021-12-08 14:43:39 -06:00
Jane Cho
6e4284a792 Implement level 1
Level 1 is now playable; more to be added
2021-12-08 02:21:21 -06:00
VoidTwo
05e04c7db9 More file reorganizing and fixed some inconsistencies 2021-12-06 01:31:44 -06:00
VoidTwo
0fcb62e094 Reorganized files 2021-12-05 17:52:54 -06:00
Jasmine Hyder
1a8ef7ff92 Undoing me deletingn daniel's branch out of mine 2021-12-05 17:23:19 -06:00
VoidTwo
5269a32000 Merged with daniel-hell-level and modified weapon handling 2021-12-05 17:19:07 -06:00
Jasmine Hyder
da4f26ceab Trying to fix my git clean mistake lol 2021-12-05 04:38:51 -06:00
eb0ec1287f added objective, added boss 2021-12-05 03:26:09 -06:00
Jasmine Hyder
fae11f8d95 Fixing Ghost Enemy 2021-12-04 19:52:58 -06:00
Jasmine
5a3ae103f5 Trying to add new enemy 2021-12-04 17:54:29 -06:00
VoidTwo
fcea3cee03 Major collision detection improvements, more file organization, and added key interactable 2021-12-04 00:07:33 -06:00
Jasmine
1e8a8a15f8 Camera limits, key in chest, dark forest tilesetter 2021-12-01 20:59:53 -06:00
1264dc8e8f merge 2021-11-29 14:45:41 -06:00
VoidTwo
9d2a15985c Merged with main and fixed merge conflicts 2021-11-29 13:53:26 -06:00
3a3d987ee3 unoragnize to merge 2021-11-29 13:05:00 -06:00
VoidTwo
aac45f808c Added some Level 5 implementation and reorganized file structure 2021-11-27 17:36:06 -06:00