Commit Graph

7 Commits

Author SHA1 Message Date
Jasmine Hyder
6d9267d23b Fix merge conflicts when trying to merge main into forest 2021-12-08 14:43:39 -06:00
VoidTwo
05e04c7db9 More file reorganizing and fixed some inconsistencies 2021-12-06 01:31:44 -06:00
Jasmine Hyder
1a8ef7ff92 Undoing me deletingn daniel's branch out of mine 2021-12-05 17:23:19 -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
f18924dd3d initial implementation of sword attack 2021-12-04 02:28:48 -06:00
7e39fdf2bc added actual enemies 2021-11-30 19:12:50 -06:00