Commit Graph

7 Commits

Author SHA1 Message Date
Jasmine Hyder
1fd6eeac95 Fixing merge conflicts 2021-12-09 20:52:13 -06:00
Jasmine Hyder
6d9267d23b Fix merge conflicts when trying to merge main into forest 2021-12-08 14:43:39 -06:00
06a90e9e9a added enemy hitboxes and damage 2021-12-07 22:18:58 -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
7e39fdf2bc added actual enemies 2021-11-30 19:12:50 -06:00