Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions engine/Sandbox.Engine/Systems/Filesystem/EngineFileSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ internal static void Initialize( string rootFolder, bool skipBaseFolderInit = fa
CoreContent.CreateAndMount( Root, "/core/" );

Assets.CreateAndMount( Root, "/core/" );
Assets.CreateAndMount( Root, "/addons/base/assets" );
Assets.CreateAndMount( Root, "/addons/base/Assets" );
}
else
{
CoreContent.CreateAndMount( Root, "/core/" );
CoreContent.CreateAndMount( Root, "/addons/base/assets/" );
CoreContent.CreateAndMount( Root, "/addons/citizen/assets/" );
CoreContent.CreateAndMount( Root, "/addons/base/Assets/" );
CoreContent.CreateAndMount( Root, "/addons/citizen/Assets/" );

Assets.CreateAndMount( Root, "/core/" );
Assets.CreateAndMount( Root, "/addons/base/assets/" );
Assets.CreateAndMount( Root, "/addons/citizen/assets/" );
Assets.CreateAndMount( Root, "/addons/base/Assets/" );
Assets.CreateAndMount( Root, "/addons/citizen/Assets/" );
}
}

Expand Down
8 changes: 4 additions & 4 deletions engine/Sandbox.GameInstance/GameInstanceDll.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ public void Bootstrap()
if ( Application.IsStandalone )
{
// In standalone, we don't ship code - only assets
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, $"/base/assets" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, $"/base/Assets" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Root, "/core/" );
}
else
{
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/base/assets/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/base/code/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/base/Assets/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/base/Code/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Root, "/core/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/citizen/assets/" );
FileSystem.Mounted.CreateAndMount( EngineFileSystem.Addons, "/citizen/Assets/" );
}
}

Expand Down
2 changes: 1 addition & 1 deletion engine/Sandbox.Tools/Theme.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static unsafe Theme()

private static void LoadFromFile()
{
var themeJson = FileSystem.Root.ReadAllText( "/addons/tools/assets/styles/theme.json" );
var themeJson = FileSystem.Root.ReadAllText( "/addons/tools/Assets/styles/theme.json" );
var theme = Json.Deserialize<Dictionary<string, string>>( themeJson );

TabBackground = Color.Parse( theme["TabBackground"] ) ?? Color.Parse( "#3b3b3b" ).Value;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.