Jasmine Hyder
|
6d9267d23b
|
Fix merge conflicts when trying to merge main into forest
|
2021-12-08 14:43:39 -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 |
|
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 |
|
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 |
|
VoidTwo
|
b8cb1fa69b
|
Added more flexible player damage from enemies and cleaned up some code
|
2021-12-05 14:55:47 -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 |
|
VoidTwo
|
9101bf2f65
|
Added locked barriers and a new ghost enemy
|
2021-12-04 18:23:05 -06:00 |
|
Jasmine
|
5a3ae103f5
|
Trying to add new enemy
|
2021-12-04 17:54:29 -06:00 |
|
|
|
db6cec47b4
|
direction weapons, added javelin weapon
|
2021-12-04 17:44:29 -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 |
|
Jasmine
|
1e8a8a15f8
|
Camera limits, key in chest, dark forest tilesetter
|
2021-12-01 20:59:53 -06:00 |
|
VoidTwo
|
ca2ea40b23
|
Fixed some Area2D detection
|
2021-11-30 21:22:52 -06:00 |
|
|
|
7e39fdf2bc
|
added actual enemies
|
2021-11-30 19:12:50 -06:00 |
|
|
|
1264dc8e8f
|
merge
|
2021-11-29 14:45:41 -06:00 |
|
|
|
1b1fe8c2f5
|
update
|
2021-11-29 14:42:40 -06:00 |
|
|
|
614ad2009b
|
latest changes
|
2021-11-29 14:02:16 -06:00 |
|
VoidTwo
|
9d2a15985c
|
Merged with main and fixed merge conflicts
|
2021-11-29 13:53:26 -06:00 |
|
Jasmine
|
2a6d1bce1d
|
Deleting Enemy.tscn
|
2021-11-29 13:35:12 -06:00 |
|
Jasmine
|
5128768a6f
|
Changing name of Enemy.tscn to NightBourne.tscn
|
2021-11-29 13:33:16 -06:00 |
|
|
|
c9b3a2604a
|
unorganization
|
2021-11-29 13:11:51 -06:00 |
|
|
|
8d8037b50c
|
unorganization
|
2021-11-29 13:08:26 -06:00 |
|
|
|
3a3d987ee3
|
unoragnize to merge
|
2021-11-29 13:05:00 -06:00 |
|
Jasmine
|
63863d26b9
|
Enemy Update
|
2021-11-29 12:24:41 -06:00 |
|
VoidTwo
|
7b29ecc3f8
|
Relocated Traps directory to be in a more logical location
|
2021-11-29 11:50:55 -06:00 |
|
VoidTwo
|
045af09111
|
Fixed New Game Button sprites, they were missing a pixel
|
2021-11-29 11:40:39 -06:00 |
|
VoidTwo
|
94833ec06a
|
Added modular traps for use in levels
|
2021-11-28 21:40:36 -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
|
b6b8edce83
|
Added MP3 and WAV as binary files
|
2021-11-28 20:29:53 -06:00 |
|
VoidTwo
|
ffe3312b86
|
Minor improvements and file reorganizing
|
2021-11-28 02:52:03 -06:00 |
|
VoidTwo
|
c4c0c3d02f
|
Merged with Main and fixed conflicts
|
2021-11-28 01:57:16 -06:00 |
|
VoidTwo
|
aac45f808c
|
Added some Level 5 implementation and reorganized file structure
|
2021-11-27 17:36:06 -06:00 |
|
Jasmine
|
74bb8d4b0a
|
Implementing HUD & Changing HUD Style
|
2021-11-23 23:24:48 -06:00 |
|
Jasmine
|
d6af0df27c
|
Added door
|
2021-11-23 20:37:23 -06:00 |
|
Jasmine
|
af2e5a5de5
|
Added enemy sprite
|
2021-11-23 14:29:32 -06:00 |
|
|
|
6bf3263115
|
added bg/foreground
|
2021-11-23 14:28:32 -06:00 |
|
Jasmine
|
a4ff83c688
|
Updating ysort
|
2021-11-22 22:17:52 -06:00 |
|
Jasmine
|
dd18420eed
|
Environment updates
|
2021-11-22 20:43:30 -06:00 |
|
|
|
a06458b8a1
|
added dash and start of tilesetting
|
2021-11-21 23:00:07 -06:00 |
|
VoidTwo
|
c411559e50
|
bae here you go
|
2021-11-16 20:38:36 -06:00 |
|
|
|
436f2db61f
|
Merge pull request #1 from CSE-4392-Game-Design/with-music-sound
added sounds and music to menu/splash screen
|
2021-11-16 20:02:24 -06:00 |
|
Jasmine
|
f0d325af7e
|
here u go bae
|
2021-11-16 19:52:00 -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 |
|
