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

Merge branch 'master' into client-mod

Browse Source
This commit is contained in:
Brant Martin
2018-07-06 15:28:15 -04:00
parent ba98e0a15a 378905268d
commit 0c58655708
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@@ -50,7 +50,7 @@ node {
packageAndArchive(buildMode, "torch-server", "Torch.Client*") packageAndArchive(buildMode, "torch-server", "Torch.Client*")
packageAndArchive(buildMode, "torch-client", "Torch.Server*") /*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/
} }
/* Disabled because they fail builds more often than they detect actual problems /* Disabled because they fail builds more often than they detect actual problems
@@ -73,4 +73,4 @@ node {
]) ])
} }
*/ */
} }

4
Torch.Server/Views/ConfigControl.xaml
View File

@@ -26,8 +26,8 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<DockPanel Grid.Row="0"> <DockPanel Grid.Row="0">
<Label Content="World:" DockPanel.Dock="Left" /> <Label Content="World:" DockPanel.Dock="Left" />
<Button Content="Import World Config" Margin="3" DockPanel.Dock="Right" Click="ImportConfig_OnClick" ToolTip="Override the DS config with the one from the selected world."/> <Button Content="Import World Config" Margin="3" DockPanel.Dock="Right" Click="ImportConfig_OnClick" ToolTip="Override the DS config with the one from the selected world." IsEnabled="{Binding ElementName=WorldList, Path=Items.Count, Mode=OneWay}"/>
<ComboBox ItemsSource="{Binding Worlds}" SelectedItem="{Binding SelectedWorld}" Margin="3" <ComboBox x:Name="WorldList" ItemsSource="{Binding Worlds}" SelectedItem="{Binding SelectedWorld}" Margin="3"
SelectionChanged="Selector_OnSelectionChanged"> SelectionChanged="Selector_OnSelectionChanged">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate DataType="managers:WorldViewModel"> <DataTemplate DataType="managers:WorldViewModel">