fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
225 Commits 1 Branch 0 Tags 59 MiB
7d6eaae833
Commit Graph

214 Commits

Author SHA1 Message Date
Bryanna
afbcb920ac brasslands 2023-05-03 17:55:54 -07:00
Sam
3108c31489 added trumpet visual 2023-05-03 13:16:44 -07:00
allylikesfrogs
8d230a5a71 new dash 2023-05-03 12:06:29 -07:00
allylikesfrogs
f7d45185fa dash is working better! 2023-05-03 11:53:37 -07:00
Sam
6fda5e48b5 a few small things 
changed camera in brasslands and cave, made pin animation shorter
 2023-05-03 10:42:41 -07:00
Bryanna
ba8b17f4ed cloud color 2023-05-03 10:18:54 -07:00
allylikesfrogs
a833bdf0a1 clarinet check 2023-05-03 10:11:00 -07:00
allylikesfrogs
7ab17418bb trying dash things 2023-05-03 10:09:55 -07:00
allylikesfrogs
fba3f60354 hi 2023-05-03 10:03:43 -07:00
allylikesfrogs
6a910bd0d6 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-03 09:54:13 -07:00
allylikesfrogs
e0308905a3 more 2023-05-03 09:53:26 -07:00
Bryanna
76180cdcb4 brassland fix 2023-05-03 09:53:18 -07:00
Bryanna
f1844faea3 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-03 09:47:14 -07:00
Bryanna
8d0e65e080 scene addons 2023-05-03 09:45:55 -07:00
allylikesfrogs
e134dc039e Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-05-03 09:37:30 -07:00
allylikesfrogs
90e2f1ae26 more from me 2023-05-03 09:37:22 -07:00
Bryanna
598e8c1dba more scene additions 2023-05-03 09:16:38 -07:00
Bryanna
21a69ca2bb updates to my scenes 2023-05-03 08:45:30 -07:00
allylikesfrogs
f1e2de295f ugh2 2023-05-03 08:15:59 -07:00
allylikesfrogs
3aa0823bbe ugh 2023-05-03 00:35:59 -07:00
allylikesfrogs
ed72a093fb hello again 2023-05-02 23:32:12 -07:00
allylikesfrogs
36e5300300 periodic update for my own sanity 2023-05-02 22:04:18 -07:00
Sam
0b1e41fb61 added one line to fix a unity thing 2023-05-02 18:21:00 -07:00
allylikesfrogs
21dd2d889a nothing much starting to set up my scripts 2023-05-02 17:00:58 -07:00
Sam
163ead5f93 added transition images system 2023-05-02 16:41:07 -07:00
Sam
0cc0f292f1 added transition scene between tambourine and clarinet 2023-05-02 16:10:36 -07:00
Bryanna
493258f1f9 combined ch and gv scene, created bl scene 2023-05-01 18:58:39 -07:00
Sam
fc8c2e6062 ACTUALLY FIXED BROKEN COMMIT 
pull this one!
 2023-05-01 17:30:54 -07:00
Sam
071a9b43d4 FIXED BROKEN COMMIT 
for whatever reason the player animator was not being accessed, this should fix it
 2023-05-01 16:59:51 -07:00
Sam
347b1a0b2c fixed: tambourine ui resets properly on player death 2023-05-01 16:53:13 -07:00
Sam
cc694586a4 fixed ui 
also added the general game ui canvas to all scenes
 2023-05-01 16:36:09 -07:00
Sam
febbf21253 added some basic ui 
still work in progress, just a progress commit!
 2023-05-01 16:05:41 -07:00
Sam
d1528cc6ff fixed footsteps 
also @bryanna i moved the grapple poles in the village so they can be reached without the trumpet jump
 2023-05-01 15:06:45 -07:00
Sam
d2d10f064b added footsteps! 
need to move the call from OnMove to Run, still some bugfixing to do
 2023-05-01 14:22:46 -07:00
Sam
58222ed569 changed death animation, moved enemies 2023-05-01 13:35:45 -07:00
Sam
61939d5090 fixed double jump 
the player can no longer jump twice in the air if they walk off a ledge
 2023-05-01 02:12:06 -07:00
Sam
932af31dc9 player can only access items in correct scenes 2023-05-01 01:52:42 -07:00
Sam
d3893d3f0e improved tambourine behavior 
also worked a bit on level balancing, adding background details
 2023-05-01 01:15:21 -07:00
Sam
46f7cfe07e fixed: player jittering and death sliding 2023-04-30 23:53:52 -07:00
Sam
14a4de41cc bugfixing 
added canvas objects to all scenes (and event systems with them), game should be playable all the way through maybe!
 2023-04-30 22:01:55 -07:00
Bryanna
743dc3d38a added new transitions scenes for story 2023-04-30 16:01:33 -07:00
Sam
c51af3ce92 bugfixed tambourine and player death 
death still needs work!
 2023-04-30 14:16:29 -07:00
Sam
9f36564e67 add player death animation 
also bugfixed some tambourine stuff
 2023-04-30 13:58:04 -07:00
Sam
16a190949d created victory object and level progression 
also tried to create a way to launch the game from any scene, but it doesn't really work. don't use anything in the folder called "DEBUG"
 2023-04-30 13:34:02 -07:00
Sam
1b809cfa06 finished tambourine scene layout 
probably still needs some tweaking, not super tested. but it's done and it's late
 2023-04-30 02:07:49 -07:00
Sam
df97e9c5c1 add trumpet sound effect 2023-04-30 00:19:52 -07:00
slevy14
6ca3e3d44e level layout progress 2023-04-29 18:51:53 -07:00
slevy14
dd3d1386be edited some player data to make grapple and jump feel better 2023-04-29 18:22:26 -07:00
Sam
3318e11fd1 Added explosion on enemy defeat 
Also added a little force for when you land on an enemy, but sometimes it YEETS the player if done at the right moment with a trumpet jump
 2023-04-29 18:10:36 -07:00
Sam
3ec0e985fb Pulled Bryanna's changes (merge) 2023-04-29 17:24:40 -07:00
slevy14
8bcb35e8aa more progress on level layout 2023-04-29 17:21:56 -07:00
Bryanna
d0fb5f4999 added to village scene 2023-04-29 16:08:30 -07:00
Bryanna
fa22316d17 Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb 2023-04-29 14:53:30 -07:00
Bryanna
f2b44b6d96 npcs and one song 2023-04-29 14:52:39 -07:00
slevy14
405e20ca2f lots of small changes lol 
worked on tambourine level layout, improved tambourine throwing, created enemy respawn system
 2023-04-29 14:51:50 -07:00
slevy14
ed3fcf541c changed some tambourine behavior 
also working on level layout
 2023-04-28 22:07:28 -07:00
Bryanna
ac035cecf9 made some changes to double jump 2023-04-28 16:18:50 -07:00
allylikesfrogs
db0e7665f7 more layout stuff, still haven't written the script for clarinet or water though :( 2023-04-28 11:49:01 -07:00
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
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
Nicholas Novak
663c037af3 Added a movement controller, and added a demo scene 2023-04-09 23:09:21 -07:00
Nicholas Novak
082491c168 Moved assets folder to be recognized by Unity 2023-04-09 22:11:35 -07:00
Nicholas Novak
415a92cf24 Initial commit and start of project 2023-04-09 21:59:32 -07:00