Diren D Bharwani
|
c0249531d3
|
Potential fix to physics collision states being incorrect
|
2023-02-04 15:18:15 +08:00 |
|
Diren D Bharwani
|
7cf5ef4b81
|
Solved merge conflicts from main
|
2023-02-04 14:21:40 +08:00 |
|
Glence
|
a4ceffcfad
|
Small changes for publish build
Level1 ai fix
Ai speed fix
item vel reset back when return
player hard set rotation
can go to nesxt scene correctly now
scoring now checks for trigger
|
2023-02-04 14:11:16 +08:00 |
|
Sri Sham Haran
|
e41c161202
|
Adjusted lighting a bit cuz it looked janky at one portion
Hide and clip mouse cursor for builds without editor (only when window is active)
|
2023-02-04 11:21:25 +08:00 |
|
mushgunAX
|
d1bad74791
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 02:45:09 +08:00 |
|
Glence
|
d1ae9b3756
|
Fix camera arm and win scene issue
|
2023-02-04 02:42:30 +08:00 |
|
XiaoQiDigipen
|
f617a1a984
|
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
Camera Collision fix. Still have some minor bugs
|
2023-02-04 02:39:55 +08:00 |
|
Xiao Qi
|
1f7f86dd01
|
Merge remote-tracking branch 'origin/main' into main
|
2023-02-04 02:39:37 +08:00 |
|
Xiao Qi
|
33807de93d
|
Pushed scene change and animator component bug fix for models without rigs
|
2023-02-04 02:32:35 +08:00 |
|
maverickdgg
|
c5296db6f6
|
Camera Collision fix
|
2023-02-04 02:20:42 +08:00 |
|
mushgunAX
|
6e8b2bc460
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 02:11:41 +08:00 |
|
maverickdgg
|
5b6217f923
|
Merge branch 'main' into SP3-141-Camera-System
|
2023-02-04 02:10:16 +08:00 |
|
maverickdgg
|
94fe055aa9
|
fixed collision
|
2023-02-04 02:10:08 +08:00 |
|
Glence
|
0c455c55f6
|
correct collision tag issue and fix player controller keypress
|
2023-02-04 02:05:32 +08:00 |
|
mushgunAX
|
1866d4ba40
|
SFX for item scoring
|
2023-02-04 01:45:34 +08:00 |
|
mushgunAX
|
a7238c6eba
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 01:45:09 +08:00 |
|
mushgunAX
|
23f7812a70
|
Fix StopAllSounds
|
2023-02-04 01:44:00 +08:00 |
|
maverickdgg
|
44e28f0d3f
|
Merge branch 'main' into SP3-141-Camera-System
|
2023-02-04 01:20:45 +08:00 |
|
Glence
|
9d73806573
|
Merge branch 'main' into PlayerController
|
2023-02-04 01:11:56 +08:00 |
|
Glence
|
436846d03c
|
Fix level1 and fix ontrigger calling twice
|
2023-02-04 01:11:47 +08:00 |
|
maverickdgg
|
81d63f9776
|
Merge branch 'main' into SP3-141-Camera-System
|
2023-02-04 00:43:41 +08:00 |
|
maverickdgg
|
63a546b7aa
|
Merge branch 'main' into SP3-141-Camera-System
|
2023-02-04 00:32:41 +08:00 |
|
mushgunAX
|
c7b99df2f6
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 00:31:23 +08:00 |
|
maverickdgg
|
4de32341e1
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-04 00:24:59 +08:00 |
|
mushgunAX
|
49fadfed74
|
Dynamic BGM
|
2023-02-04 00:23:05 +08:00 |
|
maverickdgg
|
c88ce23d45
|
WIP collision
|
2023-02-04 00:17:29 +08:00 |
|
Kah Wei
|
3cd1778d08
|
Fixed SHUIComponent serialization
|
2023-02-04 00:04:25 +08:00 |
|
Xiao Qi
|
0281446538
|
Merge remote-tracking branch 'origin/main' into main
|
2023-02-03 23:50:40 +08:00 |
|
Xiao Qi
|
1bae1c97d6
|
Added demo animation objects
|
2023-02-03 23:50:35 +08:00 |
|
Kah Wei
|
7ded7a0706
|
Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
# Conflicts:
# Assets/Editor/Layouts/UserLayout.ini
|
2023-02-03 23:33:40 +08:00 |
|
Kah Wei
|
940c55d665
|
Fixed Renderables not being removed from a batch if their modifiable material was retrieved
|
2023-02-03 23:33:23 +08:00 |
|
maverickdgg
|
21695fd4f3
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-03 23:28:17 +08:00 |
|
maverickdgg
|
fdacaf5036
|
Added reminaing buttons for win and lose screens
|
2023-02-03 23:28:08 +08:00 |
|
Diren D Bharwani
|
7a79cda729
|
Reworked Collision Tag Interface and Logic
|
2023-02-03 23:22:21 +08:00 |
|
mushgunAX
|
136d86dce3
|
Fix Item Score SFX
|
2023-02-03 23:19:12 +08:00 |
|
mushgunAX
|
d71790022f
|
Merge branch 'main' into AudioImplementation
|
2023-02-03 23:16:47 +08:00 |
|
maverickdgg
|
b15b5eadbc
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-03 22:59:56 +08:00 |
|
maverickdgg
|
ebf1ab39cf
|
Added some buttons to lose screen
|
2023-02-03 22:59:49 +08:00 |
|
Diren D Bharwani
|
c61be35da0
|
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
|
2023-02-03 22:44:58 +08:00 |
|
maverickdgg
|
382a2d0f6a
|
Added start game button. Texture changing for buttons now only change when necessary
|
2023-02-03 22:44:02 +08:00 |
|
Glence
|
e00b891bf7
|
added lights to level 2
|
2023-02-03 22:03:55 +08:00 |
|
Glence
|
5284066cee
|
Merge branch 'main' into PlayerController
|
2023-02-03 21:29:02 +08:00 |
|
Glence
|
2ee46f33df
|
update collision tag to have a save button and clamp raycast draw
|
2023-02-03 21:28:50 +08:00 |
|
Brandon Mak
|
6cde511b36
|
Shadows update
Made it less dark
|
2023-02-03 20:16:42 +08:00 |
|
maverickdgg
|
a6290d9c8f
|
Added texture, modifiable material fix
|
2023-02-03 20:12:48 +08:00 |
|
mushgunAX
|
a6bc9ed2b4
|
Updates on audio
|
2023-02-03 19:37:18 +08:00 |
|
Diren D Bharwani
|
36de32447d
|
Fixed some bugs with serialisation
|
2023-02-03 18:40:45 +08:00 |
|
mushgunAX
|
60fa4335a0
|
Merge branch 'main' into AudioImplementation
|
2023-02-03 17:01:11 +08:00 |
|
Glence
|
6b5bd43110
|
Merge branch 'main' into PlayerController
|
2023-02-03 16:48:51 +08:00 |
|
Diren D Bharwani
|
c73275f2d3
|
Added temporary use of collision layers to C# and fixed raycast drawing
|
2023-02-03 16:11:30 +08:00 |