This website requires JavaScript.
219e55c860
Implemented credits scene
2021-12-13 02:15:01 -06:00
c00ddd741c
Added font credits
2021-12-13 01:06:16 -06:00
c10acf2469
Added Hub World floor tileset credit
2021-12-13 01:00:31 -06:00
ef5ce684eb
Fixed debugger errors in many files and optimized some scenes/code
2021-12-12 23:55:59 -06:00
fc6dfdef4d
updated credits
Daniel Tam
2021-12-12 19:30:33 -06:00
877648dbc2
added music/sounds
Daniel Tam
2021-12-12 16:44:25 -06:00
2c65c5f4b6
haha
2021-12-10 15:38:00 -06:00
6bfbfd7989
Merged with previous commit
2021-12-10 15:05:49 -06:00
494f8e60b2
Optimized png files
2021-12-10 15:05:37 -06:00
c64401aaac
updated l4 boss area, timeout on level end
Daniel Tam
2021-12-10 14:49:18 -06:00
e5aafa6cd0
Added win condition for level 1 and added boss fight for level 5
2021-12-10 14:23:23 -06:00
3c880d1566
fixed queue free in l4
Daniel Tam
2021-12-10 11:16:57 -06:00
0ead947566
completed l4 win condition
Daniel Tam
2021-12-10 11:08:09 -06:00
111aa4d8ae
Merged with main
2021-12-09 23:13:44 -06:00
2b7fe1494b
Fixed strange scene name
2021-12-09 22:57:05 -06:00
8707397bb7
Implemented win/lose scenes and added fire spinner trap
2021-12-09 22:55:16 -06:00
ef951fb7e4
Changing png import for forestTreeBig
2021-12-09 22:49:57 -06:00
8e64a3677f
added l4 win condition
Daniel Tam
2021-12-09 22:35:48 -06:00
022c084d28
Create credits.txt
2021-12-09 21:56:55 -06:00
ad704f9350
Fixing more merge conflicts
2021-12-09 21:26:42 -06:00
1fd6eeac95
Fixing merge conflicts
2021-12-09 20:52:13 -06:00
9d8de425bb
Ghost enemy and other changes
2021-12-09 20:39:56 -06:00
8bd4acb6fe
fixed naming in level 4
Daniel Tam
2021-12-09 20:30:24 -06:00
4bcf473576
Merge pull request #4 from CSE-4392-Game-Design/Space-level
2021-12-09 18:38:29 -06:00
ff327a5949
Merge branch 'main' into Space-level
2021-12-09 18:34:56 -06:00
037752c118
Updated Hub World to have portals to levels and disabled the level select menu
2021-12-09 17:31:24 -06:00
2147d38874
Code cleanup and minor fixes to Level 3
2021-12-09 04:08:28 -06:00
9dce1e02cf
Merge pull request #3 from CSE-4392-Game-Design/tiff
omgdanieltam
2021-12-08 23:07:16 -06:00
eef06ebd8f
merge with main
Daniel Tam
2021-12-08 23:06:13 -06:00
1f2cc08791
enemy update
2021-12-08 22:09:40 -06:00
e438b7bbeb
debugger warning gone
2021-12-08 21:18:44 -06:00
b4f9118ff8
Merge pull request #2 from CSE-4392-Game-Design/daniel-hell-level
omgdanieltam
2021-12-08 20:44:58 -06:00
5dbe858781
merge daniel-hell-level branch into main
Daniel Tam
2021-12-08 20:43:20 -06:00
aac16855e6
Animation
2021-12-08 18:44:42 -06:00
6d9267d23b
Fix merge conflicts when trying to merge main into forest
2021-12-08 14:43:39 -06:00
d6e7dd9db3
Level 1 implemented
2021-12-08 03:05:02 -06:00
6e4284a792
Implement level 1
2021-12-08 02:21:21 -06:00
06a90e9e9a
added enemy hitboxes and damage
Daniel Tam
2021-12-07 22:18:58 -06:00
7d04c41d79
merge with main
Daniel Tam
2021-12-07 20:21:41 -06:00
8d119ff0c9
Level Functionality Complete
2021-12-06 19:25:29 -06:00
f774ea1741
Chest + Door Functionality
2021-12-06 16:08:29 -06:00
05e04c7db9
More file reorganizing and fixed some inconsistencies
2021-12-06 01:31:44 -06:00
08f5ec4ef9
Merge branch 'main' into void
2021-12-06 01:06:13 -06:00
bae81b5b01
Fixed weapon handling to be more consistent and increased the size for easier gameplay
2021-12-06 01:01:55 -06:00
51365d9f74
Fixed spacing, fixed enemy hitbox
2021-12-05 21:07:17 -06:00
15b647a90a
Merge branch 'main' into tiff
2021-12-05 20:05:14 -06:00
f3f0611980
coin implementation
2021-12-05 19:57:50 -06:00
0fcb62e094
Reorganized files
2021-12-05 17:52:54 -06:00
1a8ef7ff92
Undoing me deletingn daniel's branch out of mine
2021-12-05 17:23:19 -06:00
5269a32000
Merged with daniel-hell-level and modified weapon handling
2021-12-05 17:19:07 -06:00
b8cb1fa69b
Added more flexible player damage from enemies and cleaned up some code
2021-12-05 14:55:47 -06:00
da4f26ceab
Trying to fix my git clean mistake lol
2021-12-05 04:38:51 -06:00
eb0ec1287f
added objective, added boss
Daniel Tam
2021-12-05 03:26:09 -06:00
fae11f8d95
Fixing Ghost Enemy
2021-12-04 19:52:58 -06:00
9101bf2f65
Added locked barriers and a new ghost enemy
2021-12-04 18:23:05 -06:00
5a3ae103f5
Trying to add new enemy
2021-12-04 17:54:29 -06:00
db6cec47b4
direction weapons, added javelin weapon
Daniel Tam
2021-12-04 17:44:29 -06:00
f18924dd3d
initial implementation of sword attack
Daniel Tam
2021-12-04 02:28:48 -06:00
fcea3cee03
Major collision detection improvements, more file organization, and added key interactable
2021-12-04 00:07:33 -06:00
1e8a8a15f8
Camera limits, key in chest, dark forest tilesetter
2021-12-01 20:59:53 -06:00
34d4e0454e
Optimized scene tree and debugged some area detection
2021-11-30 23:06:42 -06:00
ca2ea40b23
Fixed some Area2D detection
2021-11-30 21:22:52 -06:00
34f7407d6a
Change of Friction
2021-11-30 21:21:58 -06:00
73efc1ffea
Added snowmen damage + music
2021-11-30 20:16:38 -06:00
7e39fdf2bc
added actual enemies
Daniel Tam
2021-11-30 19:12:50 -06:00
1264dc8e8f
merge
Daniel Tam
2021-11-29 14:45:41 -06:00
1b1fe8c2f5
update
Daniel Tam
2021-11-29 14:42:40 -06:00
614ad2009b
latest changes
Daniel Tam
2021-11-29 14:02:16 -06:00
9d2a15985c
Merged with main and fixed merge conflicts
2021-11-29 13:53:26 -06:00
2a6d1bce1d
Deleting Enemy.tscn
2021-11-29 13:35:12 -06:00
5128768a6f
Changing name of Enemy.tscn to NightBourne.tscn
2021-11-29 13:33:16 -06:00
e8d659ed93
Removed unnecessary files
2021-11-29 13:24:52 -06:00
ee62a1cf5f
Merged with main and fixed merge conflicts
2021-11-29 13:22:17 -06:00
c9b3a2604a
unorganization
Daniel Tam
2021-11-29 13:11:51 -06:00
8d8037b50c
unorganization
Daniel Tam
2021-11-29 13:08:26 -06:00
3a3d987ee3
unoragnize to merge
Daniel Tam
2021-11-29 13:05:00 -06:00
63863d26b9
Enemy Update
2021-11-29 12:24:41 -06:00
7b29ecc3f8
Relocated Traps directory to be in a more logical location
2021-11-29 11:50:55 -06:00
045af09111
Fixed New Game Button sprites, they were missing a pixel
2021-11-29 11:40:39 -06:00
94833ec06a
Added modular traps for use in levels
2021-11-28 21:40:36 -06:00
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
b6b8edce83
Added MP3 and WAV as binary files
2021-11-28 20:29:53 -06:00
ffe3312b86
Minor improvements and file reorganizing
2021-11-28 02:52:03 -06:00
c4c0c3d02f
Merged with Main and fixed conflicts
2021-11-28 01:57:16 -06:00
aac45f808c
Added some Level 5 implementation and reorganized file structure
2021-11-27 17:36:06 -06:00
74bb8d4b0a
Implementing HUD & Changing HUD Style
2021-11-23 23:24:48 -06:00
d6af0df27c
Added door
2021-11-23 20:37:23 -06:00
af2e5a5de5
Added enemy sprite
2021-11-23 14:29:32 -06:00
6bf3263115
added bg/foreground
Daniel Tam
2021-11-23 14:28:32 -06:00
85ee3e7a07
Coin + Countdown Timer
2021-11-23 11:27:33 -06:00
d4302081be
Fixed snowmen enemy bug
2021-11-22 22:37:49 -06:00
a4ff83c688
Updating ysort
2021-11-22 22:17:52 -06:00
506253d310
Pls test Jas
2021-11-22 22:15:28 -06:00
dd18420eed
Environment updates
2021-11-22 20:43:30 -06:00
a06458b8a1
added dash and start of tilesetting
Daniel Tam
2021-11-21 23:00:07 -06:00
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
omgdanieltam
2021-11-16 20:02:24 -06:00
f0d325af7e
here u go bae
2021-11-16 19:52:00 -06:00
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
4c65b9c4c0
added sounds and music to menu/splash screen
Daniel Tam
2021-10-22 18:19:26 -05:00
VoidTwo
Daniel Tam
Jasmine Hyder
tiffanyfrias10
Jane Cho