62 Commits

Include renames

Author	SHA1	Message	Date
MindfulMinun	a54abef641	Merge remote-tracking branch 'origin/main' into zoe	2022-02-27 02:57:34 -06:00
Zoe J	cbfc63c63f	gfgsdfg	2022-02-27 02:56:29 -06:00
Zoe J	69d09becac	ghf	2022-02-27 02:34:30 -06:00
Rizvee	094c89cb7e	game over man	2022-02-27 02:18:35 -06:00
MindfulMinun	71ede1885c	Fixed her arm glitching.	2022-02-26 22:51:25 -06:00
MindfulMinun	41456ba59d	Merge remote-tracking branch 'origin/main' into beni	2022-02-26 22:32:16 -06:00
MindfulMinun	8fa907025c	Merge remote-tracking branch 'origin/main' into rizzy	2022-02-26 22:24:11 -06:00
MindfulMinun	25a4e7be3c	idk what this is	2022-02-26 22:21:55 -06:00
Rizvee	6a3b521cb7	elevator yay	2022-02-26 20:00:18 -06:00
Rizvee	3af1373c33	im stuff	2022-02-26 19:29:22 -06:00
Rizvee	eb6f9cee3a	Merge remote-tracking branch 'origin/rizzy' into rizzy	2022-02-26 19:27:42 -06:00
Zoe J	11a2af2f5f	did a minor tweak	2022-02-26 18:45:46 -06:00
Rizvee	f7b1a377f1	something	2022-02-26 18:22:11 -06:00
MindfulMinun	d03fb5b99a	Cars are kinda hard	2022-02-26 16:04:10 -06:00
MindfulMinun	b8327e697e	Page 2 yeah!	2022-02-26 12:48:58 -06:00
MindfulMinun	138d4e83fb	Merge remote-tracking branch 'origin/main' into beni	2022-02-26 12:02:39 -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	e1da79c14e	RESPAWNER	2022-02-26 02:11:59 -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
MindfulMinun	8568174fce	AAA nyctophobia	2022-02-26 01:31:49 -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
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	1c2392e20b	Watersprit, car, lol	2022-02-25 22:25:25 -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
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
Zoe J	f3985d657e	Fixed Fonts Again	2022-02-25 08:42:47 -06:00
Rizvee	8191d4e79e	hopefully this doesnt break stuff	2022-02-25 07:42:07 -06:00
Rizvee	eae35b0657	conversation	2022-02-25 03:18:38 -06:00
MindfulMinun	0b967a6fc3	Merge Fuki emotes into one controller ... ( i hardly know her )	2022-02-25 02:33:59 -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
Rizvee	afa872f11c	assets	2022-02-24 23:50:59 -06:00
Zoe J	fab44709f3	nya nya	2022-02-24 23:32:25 -06:00
MindfulMinun	1978ce2d7a	I"M SORRY I FUCKED IT UP I IDNDANDNUB MER	2022-02-24 23:20:45 -06:00
MindfulMinun	ea193c2076	Resolving merge conflict...	2022-02-24 22:47:04 -06:00
Rizvee	973f496d53	Trigger prefab	2022-02-24 22:40:15 -06:00
Zoe J	9586240adb	Created Level Select Variable	2022-02-24 22:31:43 -06:00
frizbee19	76ce9ef694	Merge branch 'main' into Rizzz	2022-02-24 22:24:55 -06:00
Rizvee	b4521d989e	Worked on first level	2022-02-24 22:20:29 -06:00
MindfulMinun	fb200533d3	Airborne animation for Fuki, fix prefab	2022-02-24 22:03:43 -06:00
frizbee19	e07f1aa08f	Merge branch 'main' into rizbone	2022-02-24 20:26:18 -06:00
Rizvee	d10524a06a	worked on platforms/moving platforms	2022-02-24 18:50:19 -06:00
Zoe J	76ae6428c0	Set up the layout for real world	2022-02-24 09:06:40 -06:00
Unknown	0de7c077f7	Added Camera switching needs to be smoothed soon	2022-02-23 21:27:36 -06:00