maverickdgg
56cda49ea7
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:01:20 +08:00
maverickdgg
82a20e49f7
updated buttons
2023-03-10 19:00:58 +08:00
Brandon Mak
801da75d87
Fixed shadows for animation
2023-03-10 18:37:28 +08:00
Glence
9b9cf1a1bb
WIP for animatons
2023-03-10 16:26:52 +08:00
Glence
2cf67a1378
Merge branch 'main' into PlayerController
2023-03-10 14:59:47 +08:00
Kah Wei
8c0ad47921
Added timescale for animation system
2023-03-10 14:55:49 +08:00
Glence
57d1adb292
animation for raccoon WIP
2023-03-10 00:16:38 +08:00
Glence
f706bd8188
updated level 1 &3 to have tree
2023-03-09 21:19:00 +08:00
Glence
2eee1d4ab7
camera offset rotation fix along with ai not hard hard for box collider
2023-03-09 18:47:06 +08:00
Glence
ec91bdb687
Merge branch 'main' into PlayerController
2023-03-09 18:38:08 +08:00
Kah Wei
8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
Xiao Qi
54e186063c
Changed to correct RIG
2023-03-09 15:20:40 +08:00
Kah Wei
bfbca68d50
Added more animation tests
2023-03-09 15:14:30 +08:00
Brandon Mak
bf08be045a
Solved bugs with shadows
...
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
Kah Wei
5669babc0f
Fixed animator components in scripts not being retrievable. Also added script for testing animations
2023-03-09 13:35:49 +08:00
Glence
73022cb8d6
update scene with new tween
2023-03-09 13:22:14 +08:00
Glence
66026ff926
jumppad done
2023-03-09 00:33:36 +08:00
Brandon Mak
4012eb97ba
Auto stash before merge of "SP3-1-Rendering" and "origin/main"
...
Solved shadow bugs and WIP trajectory
2023-03-08 21:23:03 +08:00
Diren D Bharwani
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
Glence
87f7b42ec3
made raccoon use capsule, setting for fov done
2023-03-08 17:00:43 +08:00
Xiao Qi
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
Diren D Bharwani
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
maverickdgg
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
Diren D Bharwani
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
Xiao Qi
5e6b68915b
Working Animations
2023-03-07 01:25:32 +08:00
Xiao Qi
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
Diren D Bharwani
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
Glence
8d6ef16625
Hot fix
...
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
2023-03-05 23:48:25 +08:00
Diren D Bharwani
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
Glence
e40346513c
Pause sfx fix
2023-03-05 22:27:35 +08:00
Glence
794f59ac48
Adjusted stair collision
2023-03-05 21:37:29 +08:00
Glence
5191eb529a
Update level 3 scene
2023-03-05 21:34:05 +08:00
Glence
9f57ed1ef1
small scene changes and reenable mouse centering and hiding
2023-03-05 21:11:24 +08:00
Glence
e27b143819
shift pic to avoid black alpha
2023-03-05 20:53:16 +08:00
Glence
808adaa5dd
level 2 go to the correct next scene now
2023-03-05 18:06:08 +08:00
Glence
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
Glence
3778ded1be
Merge branch 'main' into PlayerController
2023-03-05 14:49:46 +08:00
Glence
7a577ecd6b
Merge branch 'main' into PlayerController
2023-03-05 14:42:31 +08:00
Sri Sham Haran
e417ebdfcc
added missing colliders for level3
2023-03-05 14:22:24 +08:00
maverickdgg
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
maverickdgg
f10293e2d2
Fixed button sounds
2023-03-05 10:47:16 +08:00
Xiao Qi
6c396469d4
Recompiled files for testing
2023-03-05 04:22:27 +08:00
Glence
3f960509f1
scene changes
2023-03-05 02:51:11 +08:00
Glence
cc81eed630
Merge branch 'main' into PlayerController
2023-03-04 23:42:20 +08:00
Brandon Mak
7eb4921b33
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-04 15:50:10 +08:00
maverickdgg
e7ce3263b8
Level 2 Pause menu update
2023-03-04 13:12:02 +08:00
maverickdgg
f3908d3afb
Merge branch 'main' into SP3-20-UI-System
2023-03-04 13:09:06 +08:00
maverickdgg
c3a452a1c4
Pause Canvas Updated with correct button scales and button FX
2023-03-04 12:51:19 +08:00
XiaoQiDigipen
6cf8f03ff1
Merge branch 'main' into AIFixes
2023-03-04 12:50:13 +08:00
XiaoQiDigipen
90c9a0a959
Merge branch 'main' into AudioImplementation
2023-03-04 12:46:59 +08:00
maverickdgg
0a8f90ae80
Added Gameplay Canvas for Level 1
2023-03-04 12:44:58 +08:00
mushgunAX
28949b29ff
Level 1 AI start waypoint
2023-03-04 05:07:39 +08:00
mushgunAX
dc54ae92a2
AI gets sent to a waypoint of choice when caught
2023-03-04 04:57:59 +08:00
maverickdgg
3a60eee32f
merged
2023-03-04 03:17:20 +08:00
maverickdgg
6d1e179baf
UI doine
2023-03-04 02:46:56 +08:00
Brandon Mak
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
Xiao Qi
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00
mushgunAX
a5fe4bf0a0
New SFX and (supposedly) spatial SFX
2023-03-04 00:19:35 +08:00
Brandon Mak
166e13a339
Shadows WIP
...
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
Glence
27b00a6c4a
end cutscene done
2023-03-03 14:28:10 +08:00
maverickdgg
0984eee6bb
Gameplay UI WIP
2023-03-02 17:34:11 +08:00
Glence
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
Glence
2834414115
Merge branch 'main' into PlayerController
2023-03-02 13:05:28 +08:00
maverickdgg
381fe476be
Game UI WIP
2023-03-02 11:33:21 +08:00
maverickdgg
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
maverickdgg
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
maverickdgg
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +08:00
maverickdgg
e4345d4937
Changed all button textures and update win and lose screen to use buttonFX
2023-03-02 02:30:59 +08:00
Glence
2af19baccd
Added the transition back to the scene
2023-03-02 00:02:18 +08:00
Glence
b2c702c780
Merge branch 'main' into PlayerController
2023-03-02 00:01:34 +08:00
Glence
403df62a0b
cleaning up scenes and WIP for previewlevel camera
2023-03-01 18:05:42 +08:00
mushgunAX
1f5cfd36f7
Scene transitions done
2023-03-01 17:36:02 +08:00
mushgunAX
a65735e0b3
progress
2023-03-01 16:37:33 +08:00
Glence
d5c9010661
Clean up the scenes
2023-03-01 01:16:34 +08:00
Glence
ab92d56cf0
disable movement when pop out is in place
2023-03-01 00:51:57 +08:00
Glence
4e56061ebe
adjust text in cutscene
2023-02-28 22:53:54 +08:00
Glence
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
Glence
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
Glence
0bdab3b079
WIP for steal food pop up
2023-02-28 18:35:43 +08:00
Glence
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
Glence
2ab4981a43
renamed cutscene to cutsceneIntro and adjusted level 2
2023-02-28 15:06:19 +08:00
Glence
380de28358
cutscene for intro done
2023-02-28 01:57:00 +08:00
Glence
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
maverickdgg
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
Glence
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
Glence
c912dd2e4b
WIP for cutscene and added test for KW
2023-02-27 15:33:58 +08:00
maverickdgg
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
maverickdgg
08e4db134a
Tweaked main menu UI
2023-02-27 15:16:48 +08:00
maverickdgg
db8ed27cb7
main Menu layout complete for now
2023-02-27 10:05:30 +08:00
maverickdgg
949ade5775
Options Layout done
2023-02-27 09:55:54 +08:00
maverickdgg
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
maverickdgg
f23853c85c
Main Menu Canvas Layout with button FX and scalebounce
2023-02-27 07:32:26 +08:00
maverickdgg
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +08:00
Glence
efcca56c99
WIP foir silhouette, renamed scene files and fix breakable bug
2023-02-27 00:41:25 +08:00
Glence
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
Glence
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
XiaoQiDigipen
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
Brandon Mak
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
maverickdgg
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
Brandon Mak
f7bb8606be
Shader, text, asset manager events and generic data desc sets
...
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00