mindfulminun/FebGameJam
1
0 Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-10-11 18:19:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
99 Commits 7 Branches 0 Tags
25e34ae059eea49d2e4b28660f0e26e95b19900e
Commit Graph
73 Commits
Author SHA1 Message Date
MindfulMinun 25e34ae059 Aquaphobia spirits 2022-02-25 06:49:01 -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
Rizvee 14c81c67d6 NPC AI 2022-02-25 01:00:32 -06:00
frizbee19 e62fe6ec5f Merge pull request #13 from frizbee19/Rizzz 
assets
 2022-02-24 23:51:40 -06:00
Rizvee afa872f11c assets 2022-02-24 23:50:59 -06:00
Zoe J 17cbf03b11 fixed the fonts 2022-02-24 23:40:32 -06:00
Zoe J fab44709f3 nya nya 2022-02-24 23:32:25 -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
MindfulMinun 160773c7c7 I didn't save the scene fuck me 2022-02-24 21:23:18 -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
Unknown 815bb4f6fa Iamdoa hsd;lqk ,sov nfk gk apms;k kjdod 
I was in the wrong keyboard format ;(
 2022-02-24 20:15:38 -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
Rizvee 71ea85379f fix background 2022-02-23 15:15:42 -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
Rizvee e6675b4a2c Adjusted UI placement 2022-02-22 15:26:12 -06:00
Rizvee 65e0fe9510 finished the talking animations 2022-02-22 15:21:38 -06:00
Zoe J e23a30e099 Added Pause Menu 2022-02-22 08:51:25 -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 8486b14d17 Added more platforms and ceiling camera change 
Added platforms and a ceiling camera change, need to  switch between cameras tmwr.
 2022-02-21 23:32:51 -06:00
Zoe J 70cbc01c25 fixed the fucky shit 2022-02-21 22:45:25 -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
MindfulMinun efe08d5f83 I forgot to save the scene lol 2022-02-21 21:50:06 -06:00
Benji d0fb1a31ed Merge branch 'main' into beni 2022-02-21 20:15:34 -06:00
MindfulMinun 2cb0a1b394 blebebeb 2022-02-21 20:14:49 -06:00
Zoe J 1bd8897d05 merge with riz worked! 2022-02-21 19:40:12 -06:00
frizbee19 44e4c7368f Merge pull request #3 from frizbee19/Rizzzzz 
Rizzzzz
 2022-02-21 19:27:48 -06:00
Rizvee 668924c0a8 pause implementation 2022-02-21 19:17:16 -06:00
MindfulMinun ba3b00fa8c Seiden's expressions 2022-02-21 17:45:32 -06:00