Commit Graph

56 Commits

Author SHA1 Message Date
slevy14
4625a1f6ba added new enemy prefab, reconfigured enemy patrol script
enemy patrol now contains option for vertical movement
2023-04-28 02:13:40 -07:00
slevy14
06f8cefd11 committing the player data numbers changes
unity is being stupid, turns out changing this data AT ALL will *not* update the file to be tracked in git. instead, need to quit unity and reopen it to get git to recognize the changes, like here
2023-04-28 01:43:14 -07:00
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
slevy14
716036bc1f moved trumpet jump to new player controller
this should work, though i'm still not 100% sure how the new jump works
2023-04-27 19:47:39 -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
allylikesfrogs
043675236f bg and found a new tileset 2023-04-27 15:33:22 -07:00
allylikesfrogs
234b2038ac basic tileset layout - clarinet level 2023-04-27 14:35:44 -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
Nicholas Novak
8e221cf94b Adapted movement controller to work with master 2023-04-27 12:54:31 -07:00
slevy14
ad3b8f9166 player can now jump on enemies to defeat them 2023-04-27 12:27:15 -07:00
slevy14
7ae4fdd547 added icon for building 2023-04-27 12:27:15 -07:00
allylikesfrogs
0ac8c4b7f2 no substantial changes i'm just done for now 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
allylikesfrogs
3a20673b6f new clarinet scene, testing tilemaps 2023-04-27 12:27:15 -07:00
slevy14
8dd536f254 added a debug mode variable to state controller
if this is checked, then the debug menu will be useable. when building the game, make sure to uncheck the debug mode box to prevent it from coming up in the build
2023-04-27 12:27:15 -07:00
slevy14
5216ea077a added scene switcher debug menu
can be accessed at any time with the
2023-04-27 12:27:15 -07:00
slevy14
25fa38b4d5 added buttons to pause menu 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
d4e4fb87c0 added basic pause menu 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
c5f6575d1f added background music to main menu
all the kermit stuff is placeholder but it will be there until further notice
2023-04-27 12:27:15 -07:00
slevy14
38239e4e0f added a start screen and scene manager 2023-04-27 12:27:15 -07:00
Nicholas Novak
e4da369c5f Changed some of the movement parameters to make the character move more naturally 2023-04-27 12:26:10 -07:00
Nicholas Novak
ded2d4e1da Finished overhaul of movement controller 2023-04-27 12:18:47 -07:00
slevy14
536d777d5f player can now jump on enemies to defeat them 2023-04-26 16:52:49 -07:00
slevy14
e178bb430c added icon for building 2023-04-26 16:37:10 -07:00
allylikesfrogs
cd0e8f6ac7 no substantial changes i'm just done for now 2023-04-26 16:33:34 -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
allylikesfrogs
6fe26462cf new clarinet scene, testing tilemaps 2023-04-26 16:01:41 -07:00
slevy14
33ee9e08e1 added a debug mode variable to state controller
if this is checked, then the debug menu will be useable. when building the game, make sure to uncheck the debug mode box to prevent it from coming up in the build
2023-04-26 13:27:08 -07:00
slevy14
41d128373d added scene switcher debug menu
can be accessed at any time with the
2023-04-26 13:03:48 -07:00
slevy14
6612092d51 added buttons to pause menu 2023-04-25 15:38:12 -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
cea079d243 added basic pause menu 2023-04-25 10:59:49 -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
0924a69f77 added background music to main menu
all the kermit stuff is placeholder but it will be there until further notice
2023-04-23 22:50:37 -07:00
slevy14
617d45d372 added a start screen and scene manager 2023-04-23 22:18:37 -07:00
slevy14
775bfd76ea updated enemy behavior
added more sprites, increased functionality, etc
2023-04-20 13:31:08 -07:00
slevy14
cf6a69ebad put the camera back to a reasonable distance 2023-04-19 21:34:45 -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
Nicholas Novak
fb8732f820 Progress on movement controller 2023-04-17 00:01:49 -07:00
slevy14
5b3de2e587 cleaned up comments in player behavior script 2023-04-14 15:59:13 -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