2724c58efb
Merge branch 'main' into Navigation
2023-03-22 19:17:03 +08:00
179740f4bf
updated scene and added traj
2023-03-21 17:55:19 +08:00
43984e8861
Merge pull request #434 from SHADE-DP/SP3-1-Rendering
...
Improved particles and tested on some objects
2023-03-21 15:30:13 +08:00
e951d275f9
Homeowner clips
2023-03-21 15:29:59 +08:00
7216c1c3dd
Particles test on level 1 food
2023-03-21 15:27:42 +08:00
9886250d19
scene merge
2023-03-21 14:47:14 +08:00
cb791b6390
Merge branch 'main' into SP3-20-UI-System
2023-03-21 14:41:14 +08:00
bc15721c0a
Updated Main Menu UI and gameplay UI
2023-03-21 14:40:30 +08:00
e7b128d521
Merge branch 'main' into SP3-1-Rendering
2023-03-21 14:35:32 +08:00
997c115043
Merge pull request #432 from SHADE-DP/SP3-13-Assets-Manager
...
Enhanced functionality of animation clip container creation
2023-03-21 14:31:16 +08:00
c73209ef62
Imported new homeowner texture
...
Replaced homeowner gltf file and recompiled
2023-03-21 14:29:13 +08:00
b97e123573
Removed test models
...
Changed new animation container list to only show models with animations
2023-03-21 14:24:49 +08:00
712c4c24b8
Color tinting and scripting support for particles
2023-03-20 20:43:50 +08:00
66986e179b
Merge branch 'main' into PlayerController
2023-03-20 17:34:26 +08:00
ae186e7d86
new scene changes
2023-03-20 17:05:43 +08:00
e88f5c9d1c
Main Menu update
2023-03-20 16:47:34 +08:00
dddc1c5542
Merge branch 'main' into SP3-20-UI-System
2023-03-20 15:55:52 +08:00
221e6bde85
Textures update
2023-03-20 15:55:50 +08:00
9fdfe17e9d
WIP Multiple root structures in animation rig
2023-03-20 15:15:52 +08:00
9ead2b6b12
Added if statement for particle texture check
2023-03-20 15:03:18 +08:00
b8a2e206f7
Added rotation and size decay support for particles
2023-03-20 12:19:27 +08:00
07a702c972
initial
2023-03-20 12:17:24 +08:00
aa0c9d08e0
Updated particle shaders to include rotation
...
- Fixed compute shader hot reloading
- Vertex/Fragment shader hot reloading still broken :/
2023-03-20 10:50:18 +08:00
6a1ae5fac8
SSAO shader looks better on racoon now
...
It still looks a little off but its better than before
2023-03-20 00:37:46 +08:00
468a032fad
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-19 20:11:36 +08:00
f787f2b782
particles WIP
2023-03-19 20:11:29 +08:00
7510f8aa5b
bug fixes
2023-03-17 00:31:30 +08:00
77907841b1
player floating when jumping
2023-03-16 17:14:57 +08:00
132629306e
clean up scene/scripts files and updates scene
2023-03-16 14:54:18 +08:00
2eed7428d8
Fixed emitting angles for particles
2023-03-16 10:44:03 +08:00
a08e538895
Added Texture support for particles
2023-03-16 09:34:42 +08:00
32ef4d8c55
Updated particle interfaces and added more barriers
2023-03-15 21:09:55 +08:00
e53636bc4a
tweening camera arm and picking
2023-03-15 19:39:12 +08:00
a633bd64d8
update scene 3 to have the bird nest and rubbish bin
2023-03-15 17:14:35 +08:00
ab2710da4b
Solved particles flickering (I hope)
...
- Good reminder how strict Vulkan is with memory accesses
2023-03-15 10:28:51 +08:00
0bfe350477
Particles WIP
2023-03-14 19:37:34 +08:00
69fc997361
Particles WIP
2023-03-14 19:34:26 +08:00
cc0116ac53
Merge branch 'main' into PlayerController
2023-03-14 17:19:26 +08:00
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
maverickdgg