Commit Graph
124 Commits
Author SHA1 Message Date
MindfulMinun 138d4e83fb Merge remote-tracking branch 'origin/main' into beni 2022-02-26 12:02:39 -06:00
MindfulMinun e34186c189 First page maze 2022-02-26 12:02:24 -06:00
Zoe J 57c3a95d52 Added some funnies 2022-02-26 08:07:06 -06:00
Zoe J 343386a124 Added literally like everything in overworld
CHECK WITH ME IF SOMETHING CONFLICTS PLEASE
2022-02-26 07:34:47 -06:00
Rizvee 0629824797 progress recovered 2022-02-26 01:54:10 -06:00
Rizvee d49638100e Auto stash before revert of "Merge remote-tracking branch 'origin/main' into main" 2022-02-26 01:53:09 -06:00
Rizvee e3bfa843e5 Merge remote-tracking branch 'origin/main' into main 2022-02-26 01:32:29 -06:00
MindfulMinun aec8258a59 Merge remote-tracking branch 'origin/main' into beni 2022-02-26 01:31:56 -06:00
MindfulMinun 8568174fce AAA nyctophobia 2022-02-26 01:31:49 -06:00
Unknown efd8a2bc3f I'm tired, I'm sleeping
Hey if someone could expand on this that'd be great I think
2022-02-26 00:58:16 -06:00
Zoe J 8539237c26 Cat 2022-02-25 23:15:55 -06:00
MindfulMinun bf6c926d61 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 23:10:34 -06:00
MindfulMinun de77327c9d Benji's Scene is basically just a bunch of animations lol 2022-02-25 23:10:26 -06:00
Unknown 023b003cbe Ceiling Trigger made easy as a prefab
Should work just fine, use the sliders to determine how far you want the char to go.
2022-02-25 22:52:58 -06:00
MindfulMinun 3c45111974 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 22:25:47 -06:00
MindfulMinun 1c2392e20b Watersprit, car, lol 2022-02-25 22:25:25 -06:00
Rizvee 8508016312 Merge remote-tracking branch 'origin/main' into main 2022-02-25 22:02:40 -06:00
MindfulMinun ec0baa6a53 Update animation controllers to be interruptible 2022-02-25 21:50:20 -06:00
Unknown 0d8b440f57 Ghosts Added (Jumpscare Warning)
This is a very scary update which adds ghosts and ghost ais, next step would be to make it into a prefab (maybe?)
2022-02-25 21:41:56 -06:00
Rizvee 2e2ebebefe Merge remote-tracking branch 'origin/main' into main 2022-02-25 21:39:17 -06:00
MindfulMinun 7a16dc24d2 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 21:02:59 -06:00
MindfulMinun 5938fdbb30 birds lol 2022-02-25 21:02:18 -06:00
Rizvee 4532c5d472 started level design 2022-02-25 20:13:38 -06:00
Rizvee 39c2ec94da Auto stash before merge of "main" and "origin/main" 2022-02-25 19:57:49 -06:00
Zoe J edcc7df8f6 Added Heights Level 2022-02-25 19:52:26 -06:00
MindfulMinun ccb96f4d88 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 19:21:58 -06:00
MindfulMinun 2a787789fa Add more emotes to Fuki & Seiden heads 2022-02-25 19:20:33 -06:00
Rizvee 4954204e99 fix triggers 2022-02-25 18:46:30 -06:00
Rizvee efdde5d30e Worked on Acrophobia level 2022-02-25 15:58:48 -06:00
Rizvee 38baefcf2d Clouds and Book triggers 2022-02-25 15:06:43 -06:00
MindfulMinun 827588bb18 Health system + Water Spirit AI! 2022-02-25 13:12:42 -06:00
Zoe J f3985d657e Fixed Fonts Again 2022-02-25 08:42:47 -06:00
Zoe J 4360d8b2b8 Nya 2022-02-25 08:32:04 -06:00
MindfulMinun 9d6a027d25 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 08:17:52 -06:00
MindfulMinun 9f4c4bba9a Fucking i haven't slept all night and i got health and water spirits hell yeah 2022-02-25 08:15:02 -06:00
Rizvee 8191d4e79e hopefully this doesnt break stuff 2022-02-25 07:42:07 -06:00
MindfulMinun 13d7735ad8 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 06:49:50 -06:00
MindfulMinun 25e34ae059 Aquaphobia spirits 2022-02-25 06:49:01 -06:00
Unknown 2195ac327b Merge remote-tracking branch 'origin/main' into main 2022-02-25 05:23:06 -06:00
Unknown 1cea56dbad It works because hard corder very odd but yeah
it works sorta yeah sorta.
2022-02-25 05:23:03 -06:00
Rizvee eae35b0657 conversation 2022-02-25 03:18:38 -06:00
Unknown 6d43681db6 Merge remote-tracking branch 'origin/main' into main 2022-02-25 03:16:40 -06:00
Unknown 499ac57c89 I am 28 commits behind master
:) I have been working for a while ;(
2022-02-25 03:16:34 -06:00
Benji 27d25d344e Merge pull request #15 from frizbee19/beni
Merge Fuki emotes into one controller
2022-02-25 02:54:54 -06:00
Rizvee 1ab6c70a15 fixed textbox 2022-02-25 02:47:23 -06:00
MindfulMinun 0b967a6fc3 Merge Fuki emotes into one controller
( i hardly know her )
2022-02-25 02:33:59 -06:00
MindfulMinun 68dbc1c349 Oops, I forgot to save my scene ! 2022-02-25 01:23:42 -06:00
MindfulMinun 373a9c7435 Merge remote-tracking branch 'origin/main' into beni 2022-02-25 01:21:45 -06:00
MindfulMinun 29184e2059 Nyctophobia + Fuki emotes animation controller 2022-02-25 01:20:32 -06:00
Zoe J 719ec3b514 set up level 1 a bit 2022-02-25 01:01:23 -06:00