Commit Graph

29 Commits

Author SHA1 Message Date
eef06ebd8f merge with main 2021-12-08 23:06:13 -06:00
5dbe858781 merge daniel-hell-level branch into main 2021-12-08 20:43:20 -06:00
Jane Cho
d6e7dd9db3 Level 1 implemented
Level 1 playable; more to be added
2021-12-08 03:05:02 -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
06a90e9e9a added enemy hitboxes and damage 2021-12-07 22:18:58 -06:00
7d04c41d79 merge with main 2021-12-07 20:21:41 -06:00
tiffanyfrias10
8d119ff0c9 Level Functionality Complete 2021-12-06 19:25:29 -06:00
tiffanyfrias10
f774ea1741 Chest + Door Functionality 2021-12-06 16:08:29 -06:00
VoidTwo
05e04c7db9 More file reorganizing and fixed some inconsistencies 2021-12-06 01:31:44 -06:00
VoidTwo
08f5ec4ef9 Merge branch 'main' into void 2021-12-06 01:06:13 -06:00
VoidTwo
bae81b5b01 Fixed weapon handling to be more consistent and increased the size for easier gameplay 2021-12-06 01:01:55 -06:00
tiffanyfrias10
51365d9f74 Fixed spacing, fixed enemy hitbox 2021-12-05 21:07:17 -06:00
tiffanyfrias10
15b647a90a Merge branch 'main' into tiff 2021-12-05 20:05:14 -06:00
VoidTwo
0fcb62e094 Reorganized files 2021-12-05 17:52:54 -06:00
VoidTwo
5269a32000 Merged with daniel-hell-level and modified weapon handling 2021-12-05 17:19:07 -06:00
VoidTwo
b8cb1fa69b Added more flexible player damage from enemies and cleaned up some code 2021-12-05 14:55:47 -06:00
eb0ec1287f added objective, added boss 2021-12-05 03:26:09 -06:00
VoidTwo
9101bf2f65 Added locked barriers and a new ghost enemy 2021-12-04 18:23:05 -06:00
f18924dd3d initial implementation of sword attack 2021-12-04 02:28:48 -06:00
VoidTwo
fcea3cee03 Major collision detection improvements, more file organization, and added key interactable 2021-12-04 00:07:33 -06:00
VoidTwo
34d4e0454e Optimized scene tree and debugged some area detection 2021-11-30 23:06:42 -06:00
VoidTwo
ca2ea40b23 Fixed some Area2D detection 2021-11-30 21:22:52 -06:00
tiffanyfrias10
73efc1ffea Added snowmen damage + music 2021-11-30 20:16:38 -06:00
7e39fdf2bc added actual enemies 2021-11-30 19:12:50 -06:00
VoidTwo
ee62a1cf5f Merged with main and fixed merge conflicts 2021-11-29 13:22:17 -06:00
VoidTwo
4c55683bde Added pause capability to all levels, added music to Level 5, added a simple chasing AI to the glowing ghosts, and optimized the Main Menu scene 2021-11-28 20:33:22 -06:00
VoidTwo
ffe3312b86 Minor improvements and file reorganizing 2021-11-28 02:52:03 -06:00
VoidTwo
aac45f808c Added some Level 5 implementation and reorganized file structure 2021-11-27 17:36:06 -06:00
VoidTwo
2c98c112bd New features and plenty of code still in testing. This includes a level select, basic inventory, and a basic HUD. 2021-11-15 22:29:42 -06:00