Merge branch 'develop' into 'main' (54eabd57) · Commits · Joey Docter / Social anxiety and me Vr

Commit 54eabd57 authored 3 years ago by

Joey Docter

Merge branch 'develop' into 'main'

Develop

See merge request !10

parents eb90b392 60f7392d

Branches

1 merge request!10Develop

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Social anxiety and me VR/Assets/New Post-processing Profile.asset 60 additions, 0 deletions

...nxiety and me VR/Assets/New Post-processing Profile.asset
Social anxiety and me VR/Assets/New Post-processing Profile.asset.meta 8 additions, 0 deletions

...y and me VR/Assets/New Post-processing Profile.asset.meta
Social anxiety and me VR/Assets/Prefabs/People.prefab 19 additions, 2 deletions

Social anxiety and me VR/Assets/Prefabs/People.prefab
Social anxiety and me VR/Assets/Prefabs/Player.prefab 63 additions, 1 deletion

Social anxiety and me VR/Assets/Prefabs/Player.prefab
Social anxiety and me VR/Assets/Prefabs/Post processing object.prefab 66 additions, 0 deletions

...ty and me VR/Assets/Prefabs/Post processing object.prefab
Social anxiety and me VR/Assets/Prefabs/Post processing object.prefab.meta 7 additions, 0 deletions

...d me VR/Assets/Prefabs/Post processing object.prefab.meta
Social anxiety and me VR/Assets/Scenes/Development Scene.unity 526 additions, 19 deletions

...l anxiety and me VR/Assets/Scenes/Development Scene.unity
Social anxiety and me VR/Assets/Scenes/Development Scene/NavMesh.asset 0 additions, 0 deletions

...y and me VR/Assets/Scenes/Development Scene/NavMesh.asset
Social anxiety and me VR/Assets/Scenes/Development Scene_Profiles.meta 8 additions, 0 deletions

...y and me VR/Assets/Scenes/Development Scene_Profiles.meta
Social anxiety and me VR/Assets/Scenes/Development Scene_Profiles/Post processing object Profile.asset 60 additions, 0 deletions

...pment Scene_Profiles/Post processing object Profile.asset
Social anxiety and me VR/Assets/Scenes/Development Scene_Profiles/Post processing object Profile.asset.meta 8 additions, 0 deletions

... Scene_Profiles/Post processing object Profile.asset.meta
Social anxiety and me VR/Assets/Scripts/Camera Scripts.meta 8 additions, 0 deletions

Social anxiety and me VR/Assets/Scripts/Camera Scripts.meta
Social anxiety and me VR/Assets/Scripts/Camera Scripts/FadingOut.cs 52 additions, 0 deletions

...iety and me VR/Assets/Scripts/Camera Scripts/FadingOut.cs
Social anxiety and me VR/Assets/Scripts/Camera Scripts/FadingOut.cs.meta 11 additions, 0 deletions

...and me VR/Assets/Scripts/Camera Scripts/FadingOut.cs.meta
Social anxiety and me VR/Assets/Scripts/Helper Scripts.meta 8 additions, 0 deletions

Social anxiety and me VR/Assets/Scripts/Helper Scripts.meta
Social anxiety and me VR/Assets/Scripts/Helper Scripts/EventSystem.cs 49 additions, 0 deletions

...ty and me VR/Assets/Scripts/Helper Scripts/EventSystem.cs
Social anxiety and me VR/Assets/Scripts/Helper Scripts/EventSystem.cs.meta 11 additions, 0 deletions

...d me VR/Assets/Scripts/Helper Scripts/EventSystem.cs.meta
Social anxiety and me VR/Assets/Scripts/People Scripts/MoveToSeat.cs 6 additions, 1 deletion

...ety and me VR/Assets/Scripts/People Scripts/MoveToSeat.cs
Social anxiety and me VR/Assets/Scripts/People Scripts/People.cs 32 additions, 2 deletions

...anxiety and me VR/Assets/Scripts/People Scripts/People.cs
Social anxiety and me VR/Assets/Scripts/Player Scripts/PlayerMovement.cs 16 additions, 0 deletions

...and me VR/Assets/Scripts/Player Scripts/PlayerMovement.cs

with 1018 additions and 25 deletions

Please register or to comment

Admin message

Merge branch 'develop' into 'main'