Commit Graph

24 Commits

Author SHA1 Message Date
slevy14
968eadb389 resized player, edited some movement data 2023-04-28 01:37:18 -07:00
slevy14
153a1b4f8d fixed combining branch 2023-04-27 20:12:07 -07:00
Sam
1b634fd829 Merge branch 'master' into combining 2023-04-27 19:50:40 -07:00
Bryanna
2445765471 trying grenouille assets again 2023-04-27 19:45:27 -07:00
Sam
01ebd18f5b merged "master" into "combining 2023-04-27 19:15:53 -07:00
Bryanna
79194a1015 grenouille assets 2023-04-27 15:56:36 -07:00
slevy14
863d7e04ef (kinda) fixed grapple momentum
also updated the player prefab -- PLEASE remember to override the player prefab with any changes you make to the individual object in the scene
2023-04-27 13:31:04 -07:00
slevy14
ad3b8f9166 player can now jump on enemies to defeat them 2023-04-27 12:27:15 -07:00
slevy14
839a1710ec added basic enemy collision
still need to figure out how to make the jumping on heads work, but we need a jump for that lol
2023-04-27 12:27:15 -07:00
slevy14
3de471ecd7 added transition scene with basic tutorial AND PERSISTENT DATA
PLEASE launch game from the main menu scene, otherwise persistent data will not load correctly
2023-04-27 12:27:15 -07:00
slevy14
a5d1116f8e created spawn point system
works by placing spawn point prefabs wherever you want them. Also created some prefabs of death zone and grapple zone objects
2023-04-27 12:27:15 -07:00
slevy14
536d777d5f player can now jump on enemies to defeat them 2023-04-26 16:52:49 -07:00
slevy14
d6128d10ef added basic enemy collision
still need to figure out how to make the jumping on heads work, but we need a jump for that lol
2023-04-26 16:05:43 -07:00
slevy14
c0f9749da5 added transition scene with basic tutorial AND PERSISTENT DATA
PLEASE launch game from the main menu scene, otherwise persistent data will not load correctly
2023-04-25 13:27:12 -07:00
slevy14
34bb1be2fb created spawn point system
works by placing spawn point prefabs wherever you want them. Also created some prefabs of death zone and grapple zone objects
2023-04-25 10:22:38 -07:00
slevy14
775bfd76ea updated enemy behavior
added more sprites, increased functionality, etc
2023-04-20 13:31:08 -07:00
slevy14
32a1412a57 added animation and camera
camera movement is very basic, animation is just right facing lol. also i know the organization is a bit of a mess, i promise i'll fix it
2023-04-19 21:34:00 -07:00
slevy14
686bc2528b Added sounds, fixed some bugs
added a sound for the tambourine, spider web, and background music.\n- finally fixed the web animation\n- added Sir Jacques to the web animation\n- changed the way the fire point tracks the grapple
2023-04-19 17:24:55 -07:00
slevy14
cb059613f9 cleaned up scripts a little bit 2023-04-17 16:47:12 -07:00
slevy14
275763628b reconfigured collision
also made some adjustments to player behavior and controller
2023-04-17 15:22:24 -07:00
slevy14
41374abe80 UPDATED TO UNITY 2022.2.15f1
please please please make sure this is opened in the right unity version or it will give you problems :)
2023-04-14 13:52:50 -07:00
slevy14
4b7bb231a9 added a way for the player to die and respawn, reconfigured test level
ALSO installed TMP but it has been giving me ISSUES
2023-04-13 16:52:11 -07:00
slevy14
f7581dad01 added new art assets
also fixed some bugs with collision
2023-04-13 12:20:17 -07:00
slevy14
5a1ab041de imported grappling files 2023-04-11 19:55:24 -07:00