PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Most of these arnt even changes

Browse Source
This commit is contained in:
sirhamsteralot
2018-03-25 22:16:05 +02:00
committed by John Gross
parent 6c6ff18ec3
commit 18af85c4d7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Torch.Server/Views/Entities/VoxelMapView.xaml
View File

@@ -1,7 +1,7 @@
<UserControl x:Class="Torch.Server.Views.Entities.VoxelMapView" <UserControl x:Class="Torch.Server.Views.Entities.VoxelMapView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Torch.Server.Views.Entities" xmlns:local="clr-namespace:Torch.Server.Views.Entities"
xmlns:entities="clr-namespace:Torch.Server.ViewModels.Entities" xmlns:entities="clr-namespace:Torch.Server.ViewModels.Entities"
@@ -11,8 +11,8 @@
</UserControl.DataContext> </UserControl.DataContext>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Expander Grid.Row="0" Header="Attached Grids"> <Expander Grid.Row="0" Header="Attached Grids">
<ListView ItemsSource="{Binding AttachedGrids}" Margin="3"> <ListView ItemsSource="{Binding AttachedGrids}" Margin="3">
@@ -23,7 +23,7 @@
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
</Expander> </Expander>
<ScrollViewer Grid.Row="1" Margin="3" VerticalScrollBarVisibility="Auto"> <ScrollViewer Grid.Row="1" Margin="3" VerticalScrollBarVisibility="Auto">
<local:EntityControlsView DataContext="{Binding}"/> <local:EntityControlsView DataContext="{Binding}"/>
</ScrollViewer> </ScrollViewer>

4
Torch.Server/Views/TorchUI.xaml.cs
View File

@@ -49,10 +49,10 @@ namespace Torch.Server
PlayerList.BindServer(server); PlayerList.BindServer(server);
Plugins.BindServer(server); Plugins.BindServer(server);
LoadConfig((TorchConfig)server.Config);
Themes.uiSource = this; Themes.uiSource = this;
Themes.SetConfig(_config); Themes.SetConfig(_config);
LoadConfig((TorchConfig)server.Config);
} }
private void AttachConsole() private void AttachConsole()

2
Torch/Views/PropertyGrid.xaml
View File

@@ -11,7 +11,7 @@
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Row="0"> <Grid Grid.Row="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition/> <ColumnDefinition/>