Skip to content

feat: loading screen (GDC version) #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Mar 8, 2022
Merged

feat: loading screen (GDC version) #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7180d08
Split dungeon prefab in multiple parts
LPLafontaineB Nov 26, 2021
ef66b05
Added additive scene loading for BossRoom scene
LPLafontaineB Nov 26, 2021
382a1a7
rebaked lighting and cleaned up prefabs
LPLafontaineB Nov 30, 2021
591f480
Merge branch 'develop' into feature/additive-scene-loading
LPLafontaineB Dec 1, 2021
f08b957
reorganised sub-scene prefabs and added description to class Additive…
LPLafontaineB Dec 1, 2021
e90212e
Added support for disconnecting players to AdditiveSceneLoader
LPLafontaineB Dec 1, 2021
1073d7c
Moving static network objects to their respective sub-scene
LPLafontaineB Dec 2, 2021
1083bc1
Made the collider trigger for loading the transition area bigger
LPLafontaineB Dec 3, 2021
54ca6c2
Apply suggestions from code review
LPLafontaineB Dec 7, 2021
6a95ea1
Improving AdditiveSceneLoader usability
LPLafontaineB Dec 7, 2021
a2dc555
Zeroed root GameObjects in prefabs and removed unused GameObjects in …
LPLafontaineB Dec 7, 2021
45c3e0c
Removed NavigationSystem validation from ServerCharacterMovement
LPLafontaineB Dec 8, 2021
c70eede
Adding clarifying comments and renaming tag field
LPLafontaineB Dec 9, 2021
e27e48e
Adding clarifying comments
LPLafontaineB Dec 10, 2021
348df86
moving the update() code to OnTriggerEnter and Exit
LPLafontaineB Dec 10, 2021
a1ae252
Created loading screen
LPLafontaineB Dec 10, 2021
c4a81da
Added SceneState enum to consider states where scene is loading or un…
LPLafontaineB Dec 10, 2021
a7bea97
Added handling of when SceneManager cannot start load/unload event
LPLafontaineB Dec 13, 2021
4ea5d1e
Merge branch 'feature/additive-scene-loading' into feature/loading-sc…
LPLafontaineB Dec 13, 2021
558bee8
fixed naming conventions errors
LPLafontaineB Dec 13, 2021
af3e97c
Merge branch 'feature/additive-scene-loading' into feature/loading-sc…
LPLafontaineB Dec 13, 2021
378e5b9
Added time stopping during loading screen
LPLafontaineB Dec 13, 2021
06906e0
Added verification that ServerAdditiveSceneLoader is spawned in OnTri…
LPLafontaineB Dec 13, 2021
2639279
Fixing typo and adding more comments
LPLafontaineB Dec 14, 2021
3be25a7
Merge branch 'feature/additive-scene-loading' into feature/loading-sc…
LPLafontaineB Dec 14, 2021
13924d2
Removed NetworkObject from LoadingScreen
LPLafontaineB Dec 14, 2021
587085e
Removed handling of server-side events
LPLafontaineB Dec 14, 2021
85c8ac0
Preventing LoadingScreen from blocking clicks on what is behind it
LPLafontaineB Dec 14, 2021
ea625ac
Merge branch 'develop' into feature/loading-screen
LPLafontaineB Dec 14, 2021
9078db0
Merge branch 'develop' into feature/loading-screen
LPLafontaineB Dec 15, 2021
6b797f8
Added SceneLoader script
LPLafontaineB Dec 16, 2021
c6423e6
Added slight delay before starting to fade out to allow multiple sequ…
LPLafontaineB Dec 16, 2021
6c30be5
Tweaking SceneEvents handling
LPLafontaineB Dec 16, 2021
c2a1434
Added client RPC to stop loading screen after SynchronizeComplete
LPLafontaineB Dec 17, 2021
760bd1c
Fixed GlobalObjectIdHash for SceneLoader
LPLafontaineB Dec 17, 2021
183957b
Cleaning up and adding comments
LPLafontaineB Dec 17, 2021
435b6d6
adding class descriptions and checks for if scene management is enabled
LPLafontaineB Jan 5, 2022
c01974b
Simplified SceneLoader
LPLafontaineB Jan 5, 2022
2665564
Cleaning up and adding comments
LPLafontaineB Jan 6, 2022
40f54ec
Modified class name
LPLafontaineB Jan 6, 2022
4dd40e4
Renamed SceneLoader to SceneLoaderWrapper and moved the loading of Ch…
LPLafontaineB Jan 6, 2022
320500b
Merge branch 'develop' into feature/loading-screen
LPLafontaineB Jan 10, 2022
aeaa412
Added Single as default scene loading mode
LPLafontaineB Jan 11, 2022
167fb5f
Merge branch 'develop' into feature/loading-screen
LPLafontaineB Jan 21, 2022
dbb8a21
Merge branch 'develop' into feature/loading-screen
LPLafontaineB Feb 25, 2022
91d087d
fixed typo
LPLafontaineB Feb 25, 2022
f898a2c
Made SceneLoaderWrapper into a MonoBehavior and increased the delay b…
LPLafontaineB Mar 1, 2022
5f75bc9
Added condition to increase delay before fadeout only for late joins
LPLafontaineB Mar 1, 2022
13e4211
Merge branch 'release/GDC2022' into feature/gdc/loading-screen
LPLafontaineB Mar 7, 2022
ed4d12a
removed unused imports
LPLafontaineB Mar 8, 2022
dc9a2c0
reduced fadeout duration
LPLafontaineB Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions Assets/BossRoom/Prefabs/SceneLoader.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5970766024194302363
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7533068275093218427}
- component: {fileID: 2071498811241465156}
m_Layer: 0
m_Name: SceneLoader
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7533068275093218427
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5970766024194302363}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2071498811241465156
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5970766024194302363}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d202c9ed4a2c4a6fa83f21f1c21394ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ClientLoadingScreen: {fileID: 0}
m_NetworkManager: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/BossRoom/Prefabs/SceneLoader.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading