mushgunAX
|
f9c90ece7e
|
Scene Transition Script
|
2023-02-27 15:28:05 +08:00 |
|
Glence
|
86b662c7dc
|
Merge branch 'main' into PlayerController
|
2023-02-23 19:45:38 +08:00 |
|
maverickdgg
|
c4db16bb95
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-23 13:44:12 +08:00 |
|
maverickdgg
|
69f2e678df
|
re-enabled scene change and disabled debug logs
|
2023-02-23 13:42:22 +08:00 |
|
maverickdgg
|
1b865b129b
|
Added finalizeChanges call and debug logs for hover enter
|
2023-02-23 12:50:42 +08:00 |
|
Glence
|
8d10c48645
|
Bug fixes and WIP for alpha
|
2023-02-21 19:31:50 +08:00 |
|
Glence
|
d7725f4e26
|
Pause is done
|
2023-02-21 00:47:20 +08:00 |
|
Glence
|
09d88b5a70
|
small bug fixes for text and serialization and added game pause
|
2023-02-20 19:53:22 +08:00 |
|
Glence
|
f2e9d3b349
|
Merge branch 'main' into PlayerController
|
2023-02-20 19:07:56 +08:00 |
|
Glence
|
dfe4d047e9
|
added a jumppad to the game
|
2023-02-18 22:21:23 +08:00 |
|
Kah Wei
|
916a7315da
|
Merge branch 'main' into SP3-6-CSharpStaticReset
|
2023-02-18 12:24:17 +08:00 |
|
Glence
|
670ddee65a
|
Added rayheight for pickandthrow
|
2023-02-04 16:02:59 +08:00 |
|
Glence
|
a97dfe7049
|
remove watermelon debug
|
2023-02-04 15:56:37 +08:00 |
|
Diren D Bharwani
|
ccd1d883d9
|
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
|
2023-02-04 15:18:22 +08:00 |
|
Diren D Bharwani
|
c0249531d3
|
Potential fix to physics collision states being incorrect
|
2023-02-04 15:18:15 +08:00 |
|
Glence
|
a594df5a4d
|
added physics fix and raycast change
called clear container in physicsSystem
move raycast of player higher
|
2023-02-04 15:17:58 +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 |
|
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 |
|
mushgunAX
|
6e8b2bc460
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 02:11:41 +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 |
|
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 |
|
mushgunAX
|
c7b99df2f6
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 00:31:23 +08:00 |
|
mushgunAX
|
49fadfed74
|
Dynamic BGM
|
2023-02-04 00:23:05 +08:00 |
|
Kah Wei
|
3cd1778d08
|
Fixed SHUIComponent serialization
|
2023-02-04 00:04:25 +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 |
|
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
|
2ee46f33df
|
update collision tag to have a save button and clamp raycast draw
|
2023-02-03 21:28:50 +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 |
|
Kah Wei
|
929bfa8a54
|
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
|
2023-02-03 17:05:56 +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 |
|
Diren D Bharwani
|
b81e71ed08
|
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
|
2023-02-03 02:03:12 +08:00 |
|
mushgunAX
|
d1a3214d41
|
Change banks
|
2023-02-03 00:40:22 +08:00 |
|
Glence
|
5bf3af2ed2
|
corrected transition to diff scenes
|
2023-02-03 00:03:05 +08:00 |
|
Glence
|
4af3440db7
|
added gameplay for level1 and multiplier combo is done
|
2023-02-02 22:44:48 +08:00 |
|
Diren D Bharwani
|
931f6fe5e2
|
Fixed almost everything. Ray debug drawing has a small bug
|
2023-02-02 20:56:55 +08:00 |