9218b7b993
player animation completed
2023-03-14 17:18:52 +08:00
3ca463aa21
Added serialisation of extra time multiplier field in animation clip asset
...
Fixed bug when creating animation clip
2023-03-14 16:47:08 +08:00
070f01bf67
Particles WIP
2023-03-14 10:55:53 +08:00
8fac6fd911
Particles WIP
2023-03-13 22:23:15 +08:00
2f4a316a09
Particles WIP
2023-03-13 11:41:23 +08:00
d0067b09c9
Minor bug fix
...
set animation dt back to default when retry or quit
2023-03-11 21:25:56 +08:00
e82dcdee20
fix audio not stopping between scene for non editor builds
2023-03-11 18:39:06 +08:00
b81cff4638
Fixed creation of audio handler with invalid path in endscene and main menu. remove set volume for homeowner detect sound. audio system now stops all instances before they are release when scene changes
2023-03-11 13:07:25 +08:00
b7520b6836
added animation for the other scenes
2023-03-11 11:07:21 +08:00
6dcee04077
remove unnecessary script
2023-03-11 02:19:42 +08:00
0f8d841f89
Re-enabled ai in L3
2023-03-10 23:33:59 +08:00
c31bb321ad
Camera Collision changes
2023-03-10 23:32:22 +08:00
af5268186c
Merge branch 'main' into PlayerController
2023-03-10 20:01:07 +08:00
9d15e19dca
UI Buttons Update
2023-03-10 19:50:34 +08:00
1b581aeb44
Merge branch 'main' into PlayerController
2023-03-10 19:41:06 +08:00
dc0d947dfb
WIP for animations
2023-03-10 19:40:48 +08:00
184155bec1
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:40:33 +08:00
1ca1926bcf
Merge pull request #420 from SHADE-DP/AudioImpl
...
Added cutscene audio
2023-03-10 19:39:42 +08:00
a839a0e596
UI Scene Update
2023-03-10 19:37:27 +08:00
715e136b29
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:32:17 +08:00
d5b50e7de3
Added a scale bounce effect for score and added offset adjustment for score
2023-03-10 19:31:23 +08:00
fb3c878683
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-10 19:22:57 +08:00
1d16bd2744
Fixed more shadows
2023-03-10 19:22:50 +08:00
f32903f87d
Merge branch 'main' into AudioImpl
2023-03-10 19:15:12 +08:00
062c11afa0
Merge pull request #418 from SHADE-DP/SP3-22-AnimationController
...
Added Animator events and fixed Animator pause bug
2023-03-10 19:07:36 +08:00
8602a60feb
Added cinematic audio
2023-03-10 19:07:10 +08:00
56cda49ea7
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:01:20 +08:00
82a20e49f7
updated buttons
2023-03-10 19:00:58 +08:00
e531a087f6
Added events for play, pause and finished animations
2023-03-10 18:53:40 +08:00
39bebd1db4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-10 18:37:39 +08:00
801da75d87
Fixed shadows for animation
2023-03-10 18:37:28 +08:00
3ef6fef289
fix for options slider
2023-03-10 18:07:40 +08:00
9a39e52939
Merge branch 'main' into AudioImpl
2023-03-10 17:46:09 +08:00
683ce6146a
Merge branch 'main' into SP3-1-Rendering
2023-03-10 17:29:24 +08:00
3f4674e38f
minor fix
2023-03-10 17:25:41 +08:00
a3318d500d
change old audio code
2023-03-10 17:21:49 +08:00
e9dee89b17
Accommodated animation when shadows are in the scene
2023-03-10 16:47:19 +08:00
9b9cf1a1bb
WIP for animatons
2023-03-10 16:26:52 +08:00
2cf67a1378
Merge branch 'main' into PlayerController
2023-03-10 14:59:47 +08:00
8c0ad47921
Added timescale for animation system
2023-03-10 14:55:49 +08:00
089eb9de26
Fixed bug where C# Asset implicit bool conversion operators were internal
2023-03-10 14:11:59 +08:00
57d1adb292
animation for raccoon WIP
2023-03-10 00:16:38 +08:00
f706bd8188
updated level 1 &3 to have tree
2023-03-09 21:19:00 +08:00
2eee1d4ab7
camera offset rotation fix along with ai not hard hard for box collider
2023-03-09 18:47:06 +08:00
ec91bdb687
Merge branch 'main' into PlayerController
2023-03-09 18:38:08 +08:00
8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
7f170deb27
Fixed animations not playing from the correct start point
2023-03-09 15:46:15 +08:00
54e186063c
Changed to correct RIG
2023-03-09 15:20:40 +08:00
bfbca68d50
Added more animation tests
2023-03-09 15:14:30 +08:00
bf08be045a
Solved bugs with shadows
...
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
6dd503daad
updated audio assets, fix scale for sfx & bgm sliders
2023-03-09 14:12:17 +08:00
5669babc0f
Fixed animator components in scripts not being retrievable. Also added script for testing animations
2023-03-09 13:35:49 +08:00
73022cb8d6
update scene with new tween
2023-03-09 13:22:14 +08:00
2c8eca4125
Added facility to create new animation clip container asset.
...
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset
Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
66026ff926
jumppad done
2023-03-09 00:33:36 +08:00
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
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
10555f646c
base for jumppad
2023-03-08 18:49:36 +08:00
87f7b42ec3
made raccoon use capsule, setting for fov done
2023-03-08 17:00:43 +08:00
6854c41614
setting up volume
2023-03-08 16:22:05 +08:00
79fe9ec43d
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Animation/SHAnimationClip.cpp
# SHADE_Engine/src/Animation/SHAnimationClip.h
# SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
# SHADE_Engine/src/Animation/SHAnimatorComponent.h
# SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
# SHADE_Engine/src/Assets/SHAssetMacros.h
# SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
4144fe0d4a
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
2023-03-07 20:30:47 +08:00
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
b6b2c75fc3
Implemented Shadows (f0kin finally)
2023-03-07 17:39:51 +08:00
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
5e6b68915b
Working Animations
2023-03-07 01:25:32 +08:00
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
826df94c96
Shadows WIP
2023-03-06 00:02:06 +08:00
52f61363c0
Build shiny highlight shader
2023-03-05 23:50:44 +08:00
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
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
e40346513c
Pause sfx fix
2023-03-05 22:27:35 +08:00
794f59ac48
Adjusted stair collision
2023-03-05 21:37:29 +08:00
5191eb529a
Update level 3 scene
2023-03-05 21:34:05 +08:00
c118ec136f
Call centering of mouse at the correct place and default DT on awake
2023-03-05 21:23:41 +08:00
9f57ed1ef1
small scene changes and reenable mouse centering and hiding
2023-03-05 21:11:24 +08:00
e27b143819
shift pic to avoid black alpha
2023-03-05 20:53:16 +08:00
808adaa5dd
level 2 go to the correct next scene now
2023-03-05 18:06:08 +08:00
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
3778ded1be
Merge branch 'main' into PlayerController
2023-03-05 14:49:46 +08:00
7a577ecd6b
Merge branch 'main' into PlayerController
2023-03-05 14:42:31 +08:00
e417ebdfcc
added missing colliders for level3
2023-03-05 14:22:24 +08:00
f52e5a1394
Changed pause menu to use onRelease instead of onClick
2023-03-05 14:01:30 +08:00
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
f10293e2d2
Fixed button sounds
2023-03-05 10:47:16 +08:00
6c396469d4
Recompiled files for testing
2023-03-05 04:22:27 +08:00
3f960509f1
scene changes
2023-03-05 02:51:11 +08:00
cc81eed630
Merge branch 'main' into PlayerController
2023-03-04 23:42:20 +08:00
73c5a0ff4a
Updated shadow shaders
2023-03-04 23:12:12 +08:00
13f28d6bdb
Fixed shiny highlight shaders
2023-03-04 15:55:04 +08:00
7eb4921b33
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-04 15:50:10 +08:00
e7ce3263b8
Level 2 Pause menu update
2023-03-04 13:12:02 +08:00
f3908d3afb
Merge branch 'main' into SP3-20-UI-System
2023-03-04 13:09:06 +08:00
c3a452a1c4
Pause Canvas Updated with correct button scales and button FX
2023-03-04 12:51:19 +08:00
6cf8f03ff1
Merge branch 'main' into AIFixes
2023-03-04 12:50:13 +08:00
90c9a0a959
Merge branch 'main' into AudioImplementation
2023-03-04 12:46:59 +08:00
0a8f90ae80
Added Gameplay Canvas for Level 1
2023-03-04 12:44:58 +08:00
28949b29ff
Level 1 AI start waypoint
2023-03-04 05:07:39 +08:00
dc54ae92a2
AI gets sent to a waypoint of choice when caught
2023-03-04 04:57:59 +08:00
3a60eee32f
merged
2023-03-04 03:17:20 +08:00
6d1e179baf
UI doine
2023-03-04 02:46:56 +08:00
17bb7a08eb
Fixed render to swapchain errors
2023-03-04 01:01:26 +08:00
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00
a5fe4bf0a0
New SFX and (supposedly) spatial SFX
2023-03-04 00:19:35 +08:00
166e13a339
Shadows WIP
...
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
beeeae99ca
SHRawAnimInspector can now generate incomplete animation clips
2023-03-03 18:53:59 +08:00
421016f4fc
Merge pull request #385 from SHADE-DP/SP3-129-AudioSystem
...
Add Set audio param with label functionality
2023-03-03 18:30:17 +08:00
dfc2a68dde
Add Set audio param with label functionality
2023-03-03 18:13:35 +08:00
0a224726b3
revert?
2023-03-03 17:25:09 +08:00
d65af97166
Revert of a previous commit for scene files
2023-03-03 17:24:27 +08:00
27b00a6c4a
end cutscene done
2023-03-03 14:28:10 +08:00
f7c33bc89a
Various null checks
2023-03-03 14:26:36 +08:00
81da3e501d
fix minor preview level bug
2023-03-03 00:40:16 +08:00
7763a969b2
Merge branch 'main' into SP3-10-input-management
2023-03-02 22:55:29 +08:00
0984eee6bb
Gameplay UI WIP
2023-03-02 17:34:11 +08:00
97db3b1021
Merge branch 'main' into PlayerController
2023-03-02 17:33:42 +08:00
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
61a877cee1
Fixed bug texture loading
...
- During mipmap transfer to GPU, height would sometimes be 0. Fixed it using std::max
2023-03-02 16:04:22 +08:00
6b42d78f16
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-02 15:49:36 +08:00
802924141a
Scene Fade In and Out Fixes
2023-03-02 15:47:00 +08:00
e2ef32f130
Fixed Trajectory Rendering
2023-03-02 15:29:24 +08:00
1e734b6006
Merge branch 'main' into SP3-10-input-management
2023-03-02 13:31:13 +08:00
2834414115
Merge branch 'main' into PlayerController
2023-03-02 13:05:28 +08:00
4124c74306
Merge pull request #381 from SHADE-DP/SP3-1-Rendering
...
Implemented serialization for text color and trajectory rendering
2023-03-02 12:47:35 +08:00
1e59b6436c
Merge branch 'main' into SP3-1-Rendering
2023-03-02 11:36:35 +08:00
381fe476be
Game UI WIP
2023-03-02 11:33:21 +08:00
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
4131c58c08
Modified calls to IsCursorVisible
2023-03-02 10:01:52 +08:00
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +08:00
e4345d4937
Changed all button textures and update win and lose screen to use buttonFX
2023-03-02 02:30:59 +08:00
2af19baccd
Added the transition back to the scene
2023-03-02 00:02:18 +08:00
b2c702c780
Merge branch 'main' into PlayerController
2023-03-02 00:01:34 +08:00
a04eee0a2f
mouse centering and visibility when appropriate
2023-03-01 23:56:40 +08:00
403df62a0b
cleaning up scenes and WIP for previewlevel camera
2023-03-01 18:05:42 +08:00
1f5cfd36f7
Scene transitions done
2023-03-01 17:36:02 +08:00
a65735e0b3
progress
2023-03-01 16:37:33 +08:00
bc17479284
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-01 16:33:30 +08:00
17a7db8a91
Merge branch 'main' into scenetransitions
2023-03-01 12:51:43 +08:00
2e7bfd8b28
Merge branch 'main' into SP3-1-Rendering
2023-03-01 08:56:45 +08:00
d5c9010661
Clean up the scenes
2023-03-01 01:16:34 +08:00
ab92d56cf0
disable movement when pop out is in place
2023-03-01 00:51:57 +08:00
4e56061ebe
adjust text in cutscene
2023-02-28 22:53:54 +08:00
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
Glence