 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 |
|
|
Unknown
|
4bc46be0a6
|
Merge branch 'Jaco' into main
|
2022-02-23 12:49:52 -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
|
e4bb5027a5
|
staging some changes or something
|
2022-02-23 00:37:46 -06:00 |
|
|
Rizvee
|
e6675b4a2c
|
Adjusted UI placement
|
2022-02-22 15:26:12 -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
|
e19a363e42
|
Tweaked pause menu to stop and resume time
|
2022-02-22 09:01:41 -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 |
|
|
Benji
|
d23525e31a
|
Merge pull request #2 from frizbee19/beni
Add animations for player character
|
2022-02-21 21:54:46 -06:00 |
|
|
MindfulMinun
|
efe08d5f83
|
I forgot to save the scene lol
|
2022-02-21 21:50:06 -06:00 |
|
|
MindfulMinun
|
455d1c5008
|
Control emotes via an Animator, yay!
|
2022-02-21 21:49:35 -06:00 |
|