-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add level select script * Merge steam code from dev * rebase to dev * Add working steamsockets connection and basic lobby UI - Spawn players, albeit 1 too many (which should be fixed in #615 instead) - Add basic scene changing * Merge steam code from dev * rebase to dev * Add levelcard instantiation * Add temp code * Add working levelselect * Add improvements from review --------- Co-authored-by: chrisjk <[email protected]>
- Loading branch information
1 parent
bdec7fa
commit 28d74bb
Showing
35 changed files
with
2,414 additions
and
15 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Assets/Textures/PlayerSelect/Materials.meta → Assets/Materials/UI.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...Select/Materials/PlayingCardDirt.mat.meta → Assets/Materials/UI/CraterTown.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!114 &-5349779643657442628 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 11 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 0} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| version: 7 | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 8 | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: GrandCanyon | ||
| m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3} | ||
| m_Parent: {fileID: 0} | ||
| m_ModifiedSerializedProperties: 0 | ||
| m_ValidKeywords: | ||
| - MAIN_LIGHT_CALCULATE_SHADOWS | ||
| - _MAIN_LIGHT_SHADOWS_CASCADE | ||
| - _SHADOWS_SOFT | ||
| m_InvalidKeywords: [] | ||
| m_LightmapFlags: 4 | ||
| m_EnableInstancingVariants: 0 | ||
| m_DoubleSidedGI: 0 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| disabledShaderPasses: [] | ||
| m_LockedProperties: | ||
| m_SavedProperties: | ||
| serializedVersion: 3 | ||
| m_TexEnvs: | ||
| - _BaseMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _BumpMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailAlbedoMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailMask: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailNormalMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _EmissionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MainTex: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MetallicGlossMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Metallic_Texture: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Normal_Map: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _OcclusionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ParallaxMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _SpecGlossMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Texture: | ||
| m_Texture: {fileID: 2800000, guid: 94dceb2634a73c44b9b3cf47086beeae, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _Triplanar_8082379ce2a14f38b8de533a506ee294_Texture_1: | ||
| m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_Lightmaps: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_LightmapsInd: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_ShadowMasks: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Ints: [] | ||
| m_Floats: | ||
| - MAIN_LIGHT_CALCULATE_SHADOWS: 1 | ||
| - _AlphaClip: 0 | ||
| - _AlphaToMask: 0 | ||
| - _Blend: 0 | ||
| - _BlendModePreserveSpecular: 1 | ||
| - _BumpScale: 1 | ||
| - _ClearCoatMask: 0 | ||
| - _ClearCoatSmoothness: 0 | ||
| - _Cull: 2 | ||
| - _Cutoff: 0.5 | ||
| - _DetailAlbedoMapScale: 1 | ||
| - _DetailNormalMapScale: 1 | ||
| - _DstBlend: 0 | ||
| - _DstBlendAlpha: 0 | ||
| - _EnvironmentReflections: 1 | ||
| - _GlossMapScale: 0 | ||
| - _Glossiness: 0 | ||
| - _GlossyReflections: 0 | ||
| - _MAIN_LIGHT_SHADOWS_CASCADE: 1 | ||
| - _Metallic: 0 | ||
| - _OcclusionStrength: 1 | ||
| - _Parallax: 0.005 | ||
| - _QueueControl: 0 | ||
| - _QueueOffset: 0 | ||
| - _ReceiveShadows: 1 | ||
| - _SHADOWS_SOFT: 1 | ||
| - _Smoothness: 0.5 | ||
| - _SmoothnessTextureChannel: 0 | ||
| - _SpecularHighlights: 1 | ||
| - _SrcBlend: 1 | ||
| - _SrcBlendAlpha: 1 | ||
| - _Surface: 0 | ||
| - _Texture_Intensity: 1.8 | ||
| - _Use_Normal_Map: 0 | ||
| - _Use_Specular: 0 | ||
| - _WorkflowMode: 1 | ||
| - _ZWrite: 1 | ||
| m_Colors: | ||
| - _BaseColor: {r: 1, g: 1, b: 1, a: 1} | ||
| - _Color: {r: 1, g: 1, b: 1, a: 1} | ||
| - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
| - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | ||
| - _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0} | ||
| m_BuildTextureStacks: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.