48 Commits

Include renames

Author	SHA1	Message	Date
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	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	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
Rizvee	14c81c67d6	NPC AI	2022-02-25 01:00:32 -06:00
Rizvee	276e36244d	bug fixes	2022-02-24 23:29:37 -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	e9af8f0fb5	Fix animations + jumping animation	2022-02-24 21:22:28 -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	cd92d52be2	Merge remote-tracking branch 'origin/main' into main	2022-02-23 21:27:39 -06:00
Unknown	0de7c077f7	Added Camera switching needs to be smoothed soon	2022-02-23 21:27:36 -06:00
frizbee19	9a8f763129	Merge pull request #8 from frizbee19/riz ... Riz	2022-02-23 20:17:25 -06:00
Rizvee	6a18528098	Finished Textbox interaction ... changed movement to pause it	2022-02-23 20:09:45 -06:00
Rizvee	3a81f1a122	Textboxes now instantiate on triggers, ish	2022-02-23 17:40:38 -06:00
Zoe J	a3e9ad6748	nya nya	2022-02-23 16:27:39 -06:00
Zoe J	57227244a8	Merge remote-tracking branch 'origin/main' into main	2022-02-23 16:25:33 -06:00
Rizvee	98755c008e	New Scene	2022-02-23 15:13:49 -06:00
frizbee19	01fdf8510d	Merge branch 'main' into riz	2022-02-23 14:21:42 -06:00
Unknown	ce568ed8e5	Moved Some stuff around before the merge ... I move stuff :)	2022-02-23 12:48:30 -06:00
Rizvee	8b5c99ae8d	worked on interactions	2022-02-23 02:16:40 -06:00
frizbee19	f06b70d20d	Update README_head.txt	2022-02-22 15:24:21 -06:00
Rizvee	65e0fe9510	finished the talking animations	2022-02-22 15:21:38 -06:00
frizbee19	8eb3e2870c	how to make headshots for text	2022-02-22 15:07:56 -06:00
Zoe J	9df04fd337	IT WORKS	2022-02-22 08:10:46 -06:00
Zoe J	78ba552c47	Added audio to textboxes	2022-02-22 07:31:48 -06:00
Zoe J	4c7900d435	hehe forgor to push double jump memes	2022-02-22 00:17:57 -06:00
Unknown	5e594b144d	Added Ray scanning ... Adds ray scanning which detects walls and currently triggers / platforms as well, needs to be fixed but should be an easy layer fix.	2022-02-21 22:10:15 -06:00
Benji	d0fb1a31ed	Merge branch 'main' into beni	2022-02-21 20:15:34 -06:00
Rizvee	668924c0a8	pause implementation	2022-02-21 19:17:16 -06:00
Unknown	43e756be25	Added Walls and Triggers for Wallso ... The walls update tm	2022-02-21 16:28:21 -06:00
Rizvee	7ba5981a03	Finished basics of textbox	2022-02-21 15:05:53 -06:00
MindfulMinun	f9c839fdf2	bofa	2022-02-21 14:27:59 -06:00
Rizvee	aa987078b6	Started individual char popup	2022-02-21 13:46:58 -06:00
Rizvee	6af09046ce	Worked on base movement for npcs and figured out activating/deactivating textbox	2022-02-21 12:07:17 -06:00
Rizvee	d53725e3f0	Branch + textbox pages	2022-02-20 23:24:26 -06:00
MindfulMinun	e2e8b36d02	AAAA imma figure this out tomorrow	2022-02-20 23:22:01 -06:00
Rizvee	f4560018ca	Worked on textbox stuff, still WIP	2022-02-20 22:43:40 -06:00
Rizvee	0d8bdb3ee3	Started NPC stuff or something	2022-02-20 21:26:21 -06:00
Zoe J	973f0153a3	Main Menu pog	2022-02-20 17:55:00 -06:00