diff --git a/.sbproj b/.sbproj index 2b74a91..f199a17 100644 --- a/.sbproj +++ b/.sbproj @@ -8,7 +8,7 @@ "HasAssets": true, "AssetsPath": "", "Resources": null, - "MenuResources": null, + "MenuResources": "\nfonts/*\nUI/mainmenu/*\nsounds/ui/*\nui/*\nsounds/test/*", "HasCode": true, "CodePath": "/code/", "PackageReferences": [], @@ -96,6 +96,7 @@ "Description": "Jumper is a challenging platformer style game where you must work your way to the top.\n\n\nScore and Progress only save in non-tools mode.", "Public": true, "CsProjName": "", - "HttpAllowList": null + "HttpAllowList": null, + "TickRate": 50 } } \ No newline at end of file diff --git a/code/UI/mainmenu/FrontPage.razor b/code/UI/mainmenu/FrontPage.razor index b1ce440..1083e5d 100644 --- a/code/UI/mainmenu/FrontPage.razor +++ b/code/UI/mainmenu/FrontPage.razor @@ -41,7 +41,7 @@ { var options = new Sandbox.Modals.ServerListModalOptions(); options.ModalTitle = "Find Game"; - options.TargetGame = "facepunch.platformer"; + options.TargetGame = "facepunch.jumper"; options.OnSelected = (server) => { Game.Menu.ConnectToServer(server.SteamId); diff --git a/models/frogfella/frog_test_subject_01a.vmdl_c b/models/frogfella/frog_test_subject_01a.vmdl_c index c3ca6d6..b5b33f8 100644 Binary files a/models/frogfella/frog_test_subject_01a.vmdl_c and b/models/frogfella/frog_test_subject_01a.vmdl_c differ diff --git a/models/frogfella/materials/frog_test_subject_01.vmat b/models/frogfella/materials/frog_test_subject_01.vmat index c53d422..af4ad0d 100644 --- a/models/frogfella/materials/frog_test_subject_01.vmat +++ b/models/frogfella/materials/frog_test_subject_01.vmat @@ -1,45 +1,23 @@ -// THIS FILE IS AUTO-GENERATED - -Layer0 +"Layer0" { - shader "complex.vfx" - - //---- PBR ---- - F_SPECULAR 1 - - //---- Ambient Occlusion ---- - g_flAmbientOcclusionDirectDiffuse "1.000" - g_flAmbientOcclusionDirectSpecular "1.000" - TextureAmbientOcclusion "models/frogfella/materials/frog_test_subject_01_ao.png" - - //---- Color ---- - g_flModelTintAmount "1.000" - g_vColorTint "[1.000000 1.000000 1.000000 0.000000]" - TextureColor "models/frogfella/materials/frog_test_subject_01_color.png" - - //---- Fade ---- - g_flFadeExponent "1.000" - - //---- Fog ---- - g_bFogEnabled "1" - - //---- Lighting ---- - g_flDirectionalLightmapMinZ "0.050" - g_flDirectionalLightmapStrength "1.000" - - //---- Metalness ---- - g_flMetalness "0.000" - - //---- Normal ---- - TextureNormal "models/frogfella/materials/frog_test_subject_01_normal.png" - - //---- Roughness ---- - TextureRoughness "models/frogfella/materials/frog_test_subject_01_rough.png" - - //---- Texture Coordinates ---- - g_nScaleTexCoordUByModelScaleAxis "0" - g_nScaleTexCoordVByModelScaleAxis "0" - g_vTexCoordOffset "[0.000 0.000]" - g_vTexCoordScale "[1.000 1.000]" - g_vTexCoordScrollSpeed "[0.000 0.000]" -} \ No newline at end of file + "shader" "shaders/complex.shader" + "F_SPECULAR" "1" + "g_flAmbientOcclusionDirectDiffuse" "1.000000" + "g_flAmbientOcclusionDirectSpecular" "1.000000" + "TextureAmbientOcclusion" "models/frogfella/materials/frog_test_subject_01_ao.png" + "g_flModelTintAmount" "1.000000" + "g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]" + "TextureColor" "models/frogfella/materials/frog_test_subject_01_color.png" + "g_flFadeExponent" "1.000000" + "g_bFogEnabled" "1" + "g_flDirectionalLightmapMinZ" "0.050000" + "g_flDirectionalLightmapStrength" "1.000000" + "g_flMetalness" "0.000000" + "TextureNormal" "models/frogfella/materials/frog_test_subject_01_normal.png" + "TextureRoughness" "models/frogfella/materials/frog_test_subject_01_rough.png" + "g_nScaleTexCoordUByModelScaleAxis" "0" + "g_nScaleTexCoordVByModelScaleAxis" "0" + "g_vTexCoordOffset" "[0.000 0.000]" + "g_vTexCoordScale" "[1.000 1.000]" + "g_vTexCoordScrollSpeed" "[0.000 0.000]" +} diff --git a/models/frogfella/materials/frog_test_subject_01.vmat_c b/models/frogfella/materials/frog_test_subject_01.vmat_c index 4f8c6bf..30409cb 100644 Binary files a/models/frogfella/materials/frog_test_subject_01.vmat_c and b/models/frogfella/materials/frog_test_subject_01.vmat_c differ diff --git a/models/frogfella/materials/frog_test_subject_01_eyes.vmat b/models/frogfella/materials/frog_test_subject_01_eyes.vmat index 410e16d..92045eb 100644 --- a/models/frogfella/materials/frog_test_subject_01_eyes.vmat +++ b/models/frogfella/materials/frog_test_subject_01_eyes.vmat @@ -1,49 +1,29 @@ -// THIS FILE IS AUTO-GENERATED - -Layer0 +"Layer0" { - shader "eyeball.vfx" - - //---- Specular ---- - F_SPECULAR_CUBE_MAP 1 // In-game Cube Map - - //---- Color ---- - g_flModelTintAmount "1.000" - g_vColorTint "[1.000000 1.000000 1.000000 0.000000]" - TextureColor "models/frogfella/materials/frog_test_subject_01_eyes_color.png" - - //---- Fade ---- - g_flFadeExponent "1.000" - - //---- Fog ---- - g_bFogEnabled "1" - - //---- Iris ---- - g_flIrisBumpStrength "1.000" - g_flParallaxStrength "0.035" - IrisNormal "[0.501961 0.501961 1.000000 0.000000]" - IrisRoughness "models/frogfella/materials/frog_test_subject_01_eyes_rough.png" - TextureIrisMask "models/frogfella/materials/frog_test_subject_01_eyes_rough.png" - - //---- Lighting ---- - g_vReflectanceRange "[0.000 1.000]" - TextureReflectance "materials/default/default_refl.tga" - - //---- Normal ---- - g_flCorneaScleraBumpStrength "1.000" - g_flScleraDiffuseExponent "1.500" - g_flScleraDiffuseWrap "0.300" - TextureNormal "[0.501961 0.501961 1.000000 0.000000]" - - //---- Occlusion ---- - g_flOcclusionStrength "0.750" - g_flOcclusionWidth "3.000" - TextureOcclusion "materials/default/default_color.tga" - - //---- Texture Coordinates ---- - g_nScaleTexCoordUByModelScaleAxis "0" - g_nScaleTexCoordVByModelScaleAxis "0" - g_vTexCoordOffset "[0.000 0.000]" - g_vTexCoordScale "[1.000 1.000]" - g_vTexCoordScrollSpeed "[0.000 0.000]" -} \ No newline at end of file + "shader" "shaders/eyeball.shader" + "F_SPECULAR_CUBE_MAP" "1" + "g_flModelTintAmount" "1.000000" + "g_vColorTint" "[1.000000 1.000000 1.000000 0.000000]" + "TextureColor" "models/frogfella/materials/frog_test_subject_01_eyes_color.png" + "g_flFadeExponent" "1.000000" + "g_bFogEnabled" "1" + "g_flIrisBumpStrength" "1.000000" + "g_flParallaxStrength" "0.035000" + "IrisNormal" "[0.501961 0.501961 1.000000 0.000000]" + "IrisRoughness" "models/frogfella/materials/frog_test_subject_01_eyes_rough.png" + "TextureIrisMask" "models/frogfella/materials/frog_test_subject_01_eyes_rough.png" + "g_vReflectanceRange" "[0.000 1.000]" + "TextureReflectance" "materials/default/default_refl.tga" + "g_flCorneaScleraBumpStrength" "1.000000" + "g_flScleraDiffuseExponent" "1.500000" + "g_flScleraDiffuseWrap" "0.300000" + "TextureNormal" "[0.501961 0.501961 1.000000 0.000000]" + "g_flOcclusionStrength" "0.750000" + "g_flOcclusionWidth" "3.000000" + "TextureOcclusion" "materials/default/default_color.tga" + "g_nScaleTexCoordUByModelScaleAxis" "0" + "g_nScaleTexCoordVByModelScaleAxis" "0" + "g_vTexCoordOffset" "[0.000 0.000]" + "g_vTexCoordScale" "[1.000 1.000]" + "g_vTexCoordScrollSpeed" "[0.000 0.000]" +} diff --git a/models/frogfella/materials/frog_test_subject_01_eyes.vmat_c b/models/frogfella/materials/frog_test_subject_01_eyes.vmat_c index a0cbb39..28df321 100644 Binary files a/models/frogfella/materials/frog_test_subject_01_eyes.vmat_c and b/models/frogfella/materials/frog_test_subject_01_eyes.vmat_c differ