VoidTwo
|
219e55c860
|
Implemented credits scene
|
2021-12-13 02:15:01 -06:00 |
|
VoidTwo
|
c00ddd741c
|
Added font credits
|
2021-12-13 01:06:16 -06:00 |
|
VoidTwo
|
c10acf2469
|
Added Hub World floor tileset credit
|
2021-12-13 01:00:31 -06:00 |
|
VoidTwo
|
ef5ce684eb
|
Fixed debugger errors in many files and optimized some scenes/code
|
2021-12-12 23:55:59 -06:00 |
|
|
|
fc6dfdef4d
|
updated credits
|
2021-12-12 19:30:33 -06:00 |
|
|
|
877648dbc2
|
added music/sounds
|
2021-12-12 16:44:25 -06:00 |
|
Jasmine Hyder
|
2c65c5f4b6
|
haha
|
2021-12-10 15:38:00 -06:00 |
|
VoidTwo
|
6bfbfd7989
|
Merged with previous commit
|
2021-12-10 15:05:49 -06:00 |
|
VoidTwo
|
494f8e60b2
|
Optimized png files
|
2021-12-10 15:05:37 -06:00 |
|
|
|
c64401aaac
|
updated l4 boss area, timeout on level end
|
2021-12-10 14:49:18 -06:00 |
|
VoidTwo
|
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
|
2021-12-10 11:16:57 -06:00 |
|
|
|
0ead947566
|
completed l4 win condition
|
2021-12-10 11:08:09 -06:00 |
|
VoidTwo
|
111aa4d8ae
|
Merged with main
|
2021-12-09 23:13:44 -06:00 |
|
VoidTwo
|
2b7fe1494b
|
Fixed strange scene name
|
2021-12-09 22:57:05 -06:00 |
|
VoidTwo
|
8707397bb7
|
Implemented win/lose scenes and added fire spinner trap
|
2021-12-09 22:55:16 -06:00 |
|
Jasmine Hyder
|
ef951fb7e4
|
Changing png import for forestTreeBig
|
2021-12-09 22:49:57 -06:00 |
|
|
|
8e64a3677f
|
added l4 win condition
|
2021-12-09 22:35:48 -06:00 |
|
tiffanyfrias10
|
022c084d28
|
Create credits.txt
|
2021-12-09 21:56:55 -06:00 |
|
Jasmine Hyder
|
ad704f9350
|
Fixing more merge conflicts
|
2021-12-09 21:26:42 -06:00 |
|
Jasmine Hyder
|
1fd6eeac95
|
Fixing merge conflicts
|
2021-12-09 20:52:13 -06:00 |
|
Jasmine Hyder
|
9d8de425bb
|
Ghost enemy and other changes
|
2021-12-09 20:39:56 -06:00 |
|
|
|
8bd4acb6fe
|
fixed naming in level 4
|
2021-12-09 20:30:24 -06:00 |
|
Jane Cho
|
4bcf473576
|
Merge pull request #4 from CSE-4392-Game-Design/Space-level
Space level update
|
2021-12-09 18:38:29 -06:00 |
|
Jane Cho
|
ff327a5949
|
Merge branch 'main' into Space-level
|
2021-12-09 18:34:56 -06:00 |
|
VoidTwo
|
037752c118
|
Updated Hub World to have portals to levels and disabled the level select menu
|
2021-12-09 17:31:24 -06:00 |
|
VoidTwo
|
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
Merge tiff to main
|
2021-12-08 23:07:16 -06:00 |
|
|
|
eef06ebd8f
|
merge with main
|
2021-12-08 23:06:13 -06:00 |
|
Jane Cho
|
1f2cc08791
|
enemy update
player now take damage from enemy; barrier time 10-> 5sec; enemy 1 mask change
|
2021-12-08 22:09:40 -06:00 |
|
Jane Cho
|
e438b7bbeb
|
debugger warning gone
null -> pass
|
2021-12-08 21:18:44 -06:00 |
|
|
|
b4f9118ff8
|
Merge pull request #2 from CSE-4392-Game-Design/daniel-hell-level
Merge daniel-hell-level into main
|
2021-12-08 20:44:58 -06:00 |
|
|
|
5dbe858781
|
merge daniel-hell-level branch into main
|
2021-12-08 20:43:20 -06:00 |
|
Jane Cho
|
aac16855e6
|
Animation
Star animation & map boundary
|
2021-12-08 18:44:42 -06:00 |
|
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 |
|
|
|
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 |
|
tiffanyfrias10
|
f3f0611980
|
coin implementation
not done w/ coin implementation yet
|
2021-12-05 19:57:50 -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 |
|
