Skip to content

Commit

Permalink
update SRP logo
Browse files Browse the repository at this point in the history
  • Loading branch information
compujuckel committed Oct 7, 2023
1 parent 15b7b59 commit b9d1ed6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
Binary file added AssettoServer/Assets/srp-logo-new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed AssettoServer/Assets/srp_64.png
Binary file not shown.
4 changes: 2 additions & 2 deletions AssettoServer/AssettoServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<EmbeddedResource Include="Server\Lua\assettoserver.lua" />
<None Remove="Assets\logo_42.png" />
<EmbeddedResource Include="Assets\logo_42.png" />
<None Remove="Assets\srp_64.png" />
<EmbeddedResource Include="Assets\srp_64.png" />
<None Remove="Assets\srp-logo-new.png" />
<EmbeddedResource Include="Assets\srp-logo-new.png" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions AssettoServer/Network/Http/AssetsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public IActionResult GetLogo42()
return new FileStreamResult(Assembly.GetExecutingAssembly().GetManifestResourceStream("AssettoServer.Assets.logo_42.png")!, "image/png");
}

[HttpGet("srp_64.png")]
public IActionResult GetSRPLogo42()
[HttpGet("srp-logo-new.png")]
public IActionResult GetSRPLogoNew()
{
return new FileStreamResult(Assembly.GetExecutingAssembly().GetManifestResourceStream("AssettoServer.Assets.srp_64.png")!, "image/png");
return new FileStreamResult(Assembly.GetExecutingAssembly().GetManifestResourceStream("AssettoServer.Assets.srp-logo-new.png")!, "image/png");
}
}
11 changes: 3 additions & 8 deletions AssettoServer/Server/Lua/assettoserver.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ If you modify this Program, or any covered work, by linking or combining it with
local baseUrl = "http://" .. ac.getServerIP() .. ":" .. ac.getServerPortHTTP()
local configUrl = baseUrl .. "/api/configuration"
local logoUrl = baseUrl .. "/assets/logo_42.png"
local srpLogoUrl = baseUrl .. "/assets/srp_64.png"
local srpLogoUrl = baseUrl .. "/assets/srp-logo-new.png?3"
local configurationLoading = false
local configuration
local authHeaders = {}
Expand Down Expand Up @@ -66,7 +66,7 @@ end)
apiKeyEvent({ key = "" })

local logoSize = vec2(68, 42)
local srpLogoSize = vec2(64, 64)
local srpLogoSize = vec2(244, 64)
local isSRP = ac.getTrackID():find("^shuto_revival_project_beta") ~= nil

-- ui.textHyperlink not supported on <0.1.79
Expand Down Expand Up @@ -111,11 +111,6 @@ local function tab_About()
if isSRP then
ui.offsetCursorY(10)
ui.image(srpLogoUrl, srpLogoSize)
ui.sameLine()
ui.offsetCursorY(-3)
ui.pushFont(ui.Font.Huge)
ui.text("Shutoko Revival Project")
ui.popFont()

ui.offsetCursorY(5)
ui.textWrapped("This server is running the Shutoko Revival Project track.")
Expand All @@ -127,7 +122,7 @@ local function tab_About()

ui.text("")
ui.pushFont(ui.Font.Title)
ui.textWrapped("Support SRP development")
ui.textWrapped("Support Shutoko Revival Project development")
ui.popFont()
ui.textWrapped("Patreon:")
ui.sameLine()
Expand Down

0 comments on commit b9d1ed6

Please sign in to comment.