Commit Graph

Select branches

Hide Pull Requests

Jaco

Jacob2.0

beni

fish

main

rizzy

zoe

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#34

#4

#5

#6

#7

#8

#9

Mono Color

• 39c2ec94da Auto stash before merge of "main" and "origin/main" Rizvee 2022-02-25 19:57:49 -06:00
• edcc7df8f6 Added Heights Level Zoe J 2022-02-25 19:52:26 -06:00
• ccb96f4d88 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-25 19:21:58 -06:00
• 2a787789fa Add more emotes to Fuki & Seiden heads MindfulMinun 2022-02-25 19:20:33 -06:00
• 4954204e99 fix triggers Rizvee 2022-02-25 18:46:30 -06:00
• efdde5d30e Worked on Acrophobia level Rizvee 2022-02-25 15:58:48 -06:00
• 38baefcf2d Clouds and Book triggers Rizvee 2022-02-25 15:06:43 -06:00
• ea2a88b5ea Merge pull request #17 from frizbee19/beni Benji 2022-02-25 13:13:08 -06:00
• 827588bb18 Health system + Water Spirit AI! MindfulMinun 2022-02-25 13:12:42 -06:00
• f3985d657e Fixed Fonts Again Zoe J 2022-02-25 08:42:47 -06:00
• 4360d8b2b8 Nya Zoe J 2022-02-25 08:32:04 -06:00
• 9233999432 Merge pull request #16 from frizbee19/beni Benji 2022-02-25 08:18:18 -06:00
• 9d6a027d25 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-25 08:17:52 -06:00
• 9f4c4bba9a Fucking i haven't slept all night and i got health and water spirits hell yeah MindfulMinun 2022-02-25 08:15:02 -06:00
• 8191d4e79e hopefully this doesnt break stuff Rizvee 2022-02-25 07:42:07 -06:00
• 13d7735ad8 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-25 06:49:50 -06:00
• 25e34ae059 Aquaphobia spirits MindfulMinun 2022-02-25 06:49:01 -06:00
• 2195ac327b Merge remote-tracking branch 'origin/main' into main Unknown 2022-02-25 05:23:06 -06:00
• 1cea56dbad It works because hard corder very odd but yeah Unknown 2022-02-25 05:23:03 -06:00
• eae35b0657 conversation Rizvee 2022-02-25 03:18:38 -06:00
• 6d43681db6 Merge remote-tracking branch 'origin/main' into main Unknown 2022-02-25 03:16:40 -06:00
• 499ac57c89 I am 28 commits behind master Unknown 2022-02-25 03:16:34 -06:00
• 27d25d344e Merge pull request #15 from frizbee19/beni Benji 2022-02-25 02:54:54 -06:00
• 1ab6c70a15 fixed textbox Rizvee 2022-02-25 02:47:23 -06:00
• ee5e646f97 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-25 02:35:33 -06:00
• 0b967a6fc3 Merge Fuki emotes into one controller ( i hardly know her ) MindfulMinun 2022-02-25 02:33:59 -06:00
• 68dbc1c349 Oops, I forgot to save my scene ! MindfulMinun 2022-02-25 01:23:42 -06:00
• ac8433a8e5 Merge pull request #14 from frizbee19/beni Benji 2022-02-25 01:22:30 -06:00
• 373a9c7435 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-25 01:21:45 -06:00
• 29184e2059 Nyctophobia + Fuki emotes animation controller MindfulMinun 2022-02-25 01:20:32 -06:00
• 719ec3b514 set up level 1 a bit Zoe J 2022-02-25 01:01:23 -06:00
• 14c81c67d6 NPC AI Rizvee 2022-02-25 01:00:32 -06:00
• e62fe6ec5f Merge pull request #13 from frizbee19/Rizzz frizbee19 2022-02-24 23:51:40 -06:00
• afa872f11c assets Rizvee 2022-02-24 23:50:59 -06:00
• 17cbf03b11 fixed the fonts Zoe J 2022-02-24 23:40:32 -06:00
• fab44709f3 nya nya Zoe J 2022-02-24 23:32:25 -06:00
• 276e36244d bug fixes Rizvee 2022-02-24 23:29:37 -06:00
• 1978ce2d7a I"M SORRY I FUCKED IT UP I IDNDANDNUB MER MindfulMinun 2022-02-24 23:20:45 -06:00
• 0f18816951 Merge pull request #12 from frizbee19/Rizzz frizbee19 2022-02-24 22:47:43 -06:00
• ea193c2076 Resolving merge conflict... MindfulMinun 2022-02-24 22:47:04 -06:00
• 973f496d53 Trigger prefab Rizvee 2022-02-24 22:40:15 -06:00
• 9586240adb Created Level Select Variable Zoe J 2022-02-24 22:31:43 -06:00
• 76ce9ef694 Merge branch 'main' into Rizzz frizbee19 2022-02-24 22:24:55 -06:00
• b4521d989e Worked on first level Rizvee 2022-02-24 22:20:29 -06:00
• b2efcd33b7 Merge pull request #11 from frizbee19/beni Benji 2022-02-24 22:10:31 -06:00
• ace1ed0ba9 Merge remote-tracking branch 'origin/main' into beni MindfulMinun 2022-02-24 22:09:05 -06:00
• fb200533d3 Airborne animation for Fuki, fix prefab MindfulMinun 2022-02-24 22:03:43 -06:00
• 51444dd5f7 Merge pull request #10 from frizbee19/beni Benji 2022-02-24 21:31:16 -06:00
• 160773c7c7 I didn't save the scene fuck me MindfulMinun 2022-02-24 21:23:18 -06:00
• e9af8f0fb5 Fix animations + jumping animation MindfulMinun 2022-02-24 21:22:28 -06:00
• 27d037d96b Merge pull request #9 from frizbee19/rizbone frizbee19 2022-02-24 20:26:30 -06:00
• e07f1aa08f Merge branch 'main' into rizbone frizbee19 2022-02-24 20:26:18 -06:00
• 815bb4f6fa Iamdoa hsd;lqk ,sov nfk gk apms;k kjdod Unknown 2022-02-24 20:15:38 -06:00
• d10524a06a worked on platforms/moving platforms Rizvee 2022-02-24 18:50:19 -06:00
• 76ae6428c0 Set up the layout for real world Zoe J 2022-02-24 09:06:40 -06:00
• cd92d52be2 Merge remote-tracking branch 'origin/main' into main Unknown 2022-02-23 21:27:39 -06:00
• 0de7c077f7 Added Camera switching needs to be smoothed soon Unknown 2022-02-23 21:27:36 -06:00
• 9a8f763129 Merge pull request #8 from frizbee19/riz frizbee19 2022-02-23 20:17:25 -06:00
• 6a18528098 Finished Textbox interaction Rizvee 2022-02-23 20:09:45 -06:00
• 3a81f1a122 Textboxes now instantiate on triggers, ish Rizvee 2022-02-23 17:40:38 -06:00
• 80bf0b7702 Merge remote-tracking branch 'origin/main' into main Unknown 2022-02-23 16:32:25 -06:00
• a3e9ad6748 nya nya Zoe J 2022-02-23 16:27:39 -06:00
• 57227244a8 Merge remote-tracking branch 'origin/main' into main Zoe J 2022-02-23 16:25:33 -06:00
• 07a4b003b2 Merge pull request #7 from frizbee19/riz frizbee19 2022-02-23 15:16:12 -06:00
• 71ea85379f fix background Rizvee 2022-02-23 15:15:42 -06:00
• f87606268e Merge pull request #6 from frizbee19/riz frizbee19 2022-02-23 15:14:25 -06:00
• 98755c008e New Scene Rizvee 2022-02-23 15:13:49 -06:00
• 96de181ea3 Merge pull request #5 from frizbee19/riz frizbee19 2022-02-23 15:11:33 -06:00
• 01fdf8510d Merge branch 'main' into riz frizbee19 2022-02-23 14:21:42 -06:00
• 4bc46be0a6 Merge branch 'Jaco' into main Unknown 2022-02-23 12:49:52 -06:00
• ce568ed8e5 Moved Some stuff around before the merge Jaco Unknown 2022-02-23 12:48:30 -06:00
• 8b5c99ae8d worked on interactions Rizvee 2022-02-23 02:16:40 -06:00
• e4bb5027a5 staging some changes or something Rizvee 2022-02-23 00:37:46 -06:00
• e6675b4a2c Adjusted UI placement Rizvee 2022-02-22 15:26:12 -06:00
• f06b70d20d Update README_head.txt frizbee19 2022-02-22 15:24:21 -06:00
• 65e0fe9510 finished the talking animations Rizvee 2022-02-22 15:21:38 -06:00
• 8eb3e2870c how to make headshots for text frizbee19 2022-02-22 15:07:56 -06:00
• e19a363e42 Tweaked pause menu to stop and resume time Zoe J 2022-02-22 09:01:41 -06:00
• e23a30e099 Added Pause Menu Zoe J 2022-02-22 08:51:25 -06:00
• 9df04fd337 IT WORKS Zoe J 2022-02-22 08:10:46 -06:00
• 78ba552c47 Added audio to textboxes Zoe J 2022-02-22 07:31:48 -06:00
• 4c7900d435 hehe forgor to push double jump memes Zoe J 2022-02-22 00:17:57 -06:00
• 8486b14d17 Added more platforms and ceiling camera change Unknown 2022-02-21 23:32:51 -06:00
• 70cbc01c25 fixed the fucky shit Zoe J 2022-02-21 22:45:25 -06:00
• 5e594b144d Added Ray scanning Unknown 2022-02-21 22:10:15 -06:00
• d23525e31a Merge pull request #2 from frizbee19/beni Benji 2022-02-21 21:54:46 -06:00
• efe08d5f83 I forgot to save the scene lol MindfulMinun 2022-02-21 21:50:06 -06:00
• 455d1c5008 Control emotes via an Animator, yay! MindfulMinun 2022-02-21 21:49:35 -06:00
• d0fb1a31ed Merge branch 'main' into beni Benji 2022-02-21 20:15:34 -06:00
• 2cb0a1b394 blebebeb MindfulMinun 2022-02-21 20:14:49 -06:00
• 1bd8897d05 merge with riz worked! Zoe J 2022-02-21 19:40:12 -06:00
• 44e4c7368f Merge pull request #3 from frizbee19/Rizzzzz frizbee19 2022-02-21 19:27:48 -06:00
• 668924c0a8 pause implementation Rizvee 2022-02-21 19:17:16 -06:00
• ba3b00fa8c Seiden's expressions MindfulMinun 2022-02-21 17:45:32 -06:00
• 20ecf26165 ~~Slide~~ Walk to the left MindfulMinun 2022-02-21 16:33:36 -06:00
• 43e756be25 Added Walls and Triggers for Wallso Unknown 2022-02-21 16:28:21 -06:00
• 7ba5981a03 Finished basics of textbox Rizvee 2022-02-21 15:05:53 -06:00
• f9c839fdf2 bofa MindfulMinun 2022-02-21 14:27:59 -06:00
• aa987078b6 Started individual char popup Rizvee 2022-02-21 13:46:58 -06:00
• 6af09046ce Worked on base movement for npcs and figured out activating/deactivating textbox Rizvee 2022-02-21 12:07:17 -06:00