 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
|
ee5e646f97
|
Merge remote-tracking branch 'origin/main' into beni
|
2022-02-25 02:35:33 -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 |
|
|
Benji
|
ac8433a8e5
|
Merge pull request #14 from frizbee19/beni
Nyctophobia + Fuki emotes animation controller
|
2022-02-25 01:22:30 -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 |
|
|
Rizvee
|
276e36244d
|
bug fixes
|
2022-02-24 23:29:37 -06:00 |
|
|
MindfulMinun
|
1978ce2d7a
|
I"M SORRY I FUCKED IT UP I IDNDANDNUB MER
|
2022-02-24 23:20:45 -06:00 |
|
|
frizbee19
|
0f18816951
|
Merge pull request #12 from frizbee19/Rizzz
Worked on first level
|
2022-02-24 22:47:43 -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 |
|
|
Benji
|
b2efcd33b7
|
Merge pull request #11 from frizbee19/beni
Airborne animation for Fuki, fix prefab
|
2022-02-24 22:10:31 -06:00 |
|
|
MindfulMinun
|
ace1ed0ba9
|
Merge remote-tracking branch 'origin/main' into beni
|
2022-02-24 22:09:05 -06:00 |
|
|
MindfulMinun
|
fb200533d3
|
Airborne animation for Fuki, fix prefab
|
2022-02-24 22:03:43 -06:00 |
|
|
Benji
|
51444dd5f7
|
Merge pull request #10 from frizbee19/beni
Fix animations + jumping animation
|
2022-02-24 21:31:16 -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
|
27d037d96b
|
Merge pull request #9 from frizbee19/rizbone
worked on platforms/moving platforms
|
2022-02-24 20:26:30 -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 |
|
|
Unknown
|
80bf0b7702
|
Merge remote-tracking branch 'origin/main' into main
|
2022-02-23 16:32:25 -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 |
|
|
frizbee19
|
07a4b003b2
|
Merge pull request #7 from frizbee19/riz
fix background
|
2022-02-23 15:16:12 -06:00 |
|
|
Rizvee
|
71ea85379f
|
fix background
|
2022-02-23 15:15:42 -06:00 |
|
|
frizbee19
|
f87606268e
|
Merge pull request #6 from frizbee19/riz
New Scene
|
2022-02-23 15:14:25 -06:00 |
|
|
Rizvee
|
98755c008e
|
New Scene
|
2022-02-23 15:13:49 -06:00 |
|
|
frizbee19
|
96de181ea3
|
Merge pull request #5 from frizbee19/riz
Riz
|
2022-02-23 15:11:33 -06:00 |
|
|
frizbee19
|
01fdf8510d
|
Merge branch 'main' into riz
|
2022-02-23 14:21:42 -06:00 |
|