Skip to content

chore: disable modules tab #63

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

Closed
NathanFlurry wants to merge 1 commit into from
Closed

chore: disable modules tab #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Assets/Rivet/Editor/UI/Dock/Dock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void CreateGUI()
_settingsTabButton.RegisterCallback<ClickEvent>(ev => SetTab(MainTab.Settings));

// Set initial tab
SetTab(MainTab.Setup);
SetTab(MainTab.Develop);
}

public void OnEnable()
Expand Down
4 changes: 2 additions & 2 deletions Assets/Rivet/Editor/UI/Dock/Dock.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
</ui:VisualElement>
<ui:VisualElement name="Screens" style="flex-grow: 1;">
<ui:VisualElement name="TabBar" style="flex-grow: 0; flex-direction: row; flex-shrink: 0; justify-content: center; padding-top: 0; padding-bottom: 0; border-bottom-width: 1px; border-bottom-color: rgba(0, 0, 0, 0.25); padding-right: 0; padding-left: 0; height: 34px;">
<ui:Instance template="TabBarButton" name="Setup" class="active" style="flex-grow: 1;">
<ui:Instance template="TabBarButton" name="Setup" class="active" style="flex-grow: 1; display: none;">
<AttributeOverrides element-name="Label" text="Setup" />
</ui:Instance>
<ui:Instance template="TabBarButton" name="Develop" style="flex-grow: 1;">
<AttributeOverrides element-name="Label" text="Develop" />
</ui:Instance>
<ui:Instance template="TabBarButton" name="Modules" style="flex-grow: 1;">
<ui:Instance template="TabBarButton" name="Modules" style="flex-grow: 1; display: none;">
<AttributeOverrides element-name="Label" text="Modules" />
</ui:Instance>
<ui:Instance template="TabBarButton" name="Settings" style="flex-grow: 1;">
Expand Down
13 changes: 8 additions & 5 deletions Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
using UnityEngine;
using UnityEngine.UIElements;
using Rivet.Editor.UI.Dock;
using System.Runtime.InteropServices;
using System;

namespace Rivet.Editor.UI.TaskPanel
{
Expand Down Expand Up @@ -55,15 +57,16 @@ public void CreateGUI()

public void UpdateLogs()
{
// In case the singleton doesn't exist yet
if (TaskManager != null)
if (TaskManager != null && _logListView != null)
{
// Add logs
_logListView.itemsSource = TaskManager.LogEntries;

// Rebuild view
_logListView.Rebuild();
_logListView.ScrollToItem(-1);
}

// Rebuild view
_logListView.Rebuild();
_logListView.ScrollToItem(-1);
}

private void OnClearPressed()
Expand Down
2 changes: 0 additions & 2 deletions Assets/Rivet/Editor/Util/Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ public static string BuildDevDedicatedServer()
subtarget = (int)StandaloneBuildSubtarget.Server
};

return FindServerExecutablePath(buildPlayerOptions.locationPathName, buildPlayerOptions.target);

// Build the server
RivetLogger.Log("Building dedicated server...");
var report = BuildPipeline.BuildPlayer(buildPlayerOptions);
Expand Down