DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Some release stuff & null reference fix

Browse Source
This commit is contained in:
SpoinkyNL 2016-02-21 23:14:43 +01:00
parent 121f3a5675
commit b488ddf8eb
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
View File

@ -12,8 +12,8 @@ namespace Artemis.KeyboardProviders
return new List<KeyboardProvider> return new List<KeyboardProvider>
{ {
new Orion(), new Orion(),
new CorsairRGB(), new CorsairRGB()
new BlackWidow() //new BlackWidow()
}; };
} }
} }

2
Artemis/Artemis/Models/MainModel.cs
View File

@ -228,7 +228,7 @@ namespace Artemis.Models
var sw = new Stopwatch(); var sw = new Stopwatch();
while (!_updateWorker.CancellationPending) while (!_updateWorker.CancellationPending)
{ {
if (ActiveKeyboard == null || Suspended) if (ActiveKeyboard == null || Suspended || _activeEffect == null)
{ {
Thread.Sleep(1000/_fps); Thread.Sleep(1000/_fps);
continue; continue;

6
Artemis/Artemis/Modules/Effects/AudioVisualizer/AudioVisualizerView.xaml
View File

@ -72,14 +72,14 @@
VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" /> VerticalAlignment="Center" Margin="0,5,-1,5" Height="22" />
<!-- Bar direction --> <!-- Bar direction -->
<TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" Width="116" VerticalAlignment="Center" <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"
Height="16" Margin="0,9,0,10"> Height="16" Margin="0,9,0,10">
Grow bars bottom Grow bars bottom (broken, sorry!)
</TextBlock> </TextBlock>
<controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}" <controls:ToggleSwitch IsChecked="{Binding Path=AudioVisualizerSettings.FromBottom, Mode=TwoWay}"
Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right" OnLabel="Yes"
OffLabel="No" OffLabel="No"
Margin="0,0,-5,0" Width="114" /> Margin="0,0,-5,0" Width="114" IsEnabled="False"/>
<!-- Bars amount --> <!-- Bars amount -->
<TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center"

2
Artemis/Artemis/Settings/GeneralSettings.cs
View File

@ -40,7 +40,7 @@ namespace Artemis.Settings
private void ApplyGamestatePort() private void ApplyGamestatePort()
{ {
// TODO: Restart Gamestate server // TODO: Restart Gamestate server with new port
} }
private void ApplyAutorun() private void ApplyAutorun()

4
Artemis/Artemis/ViewModels/EffectsViewModel.cs
View File

@ -17,7 +17,7 @@ namespace Artemis.ViewModels
public EffectsViewModel(MainModel mainModel) public EffectsViewModel(MainModel mainModel)
{ {
_typeWaveVm = new TypeWaveViewModel(mainModel) {DisplayName = "Type Waves"}; _typeWaveVm = new TypeWaveViewModel(mainModel) {DisplayName = "Type Waves"};
_typeHoleVm = new TypeHoleViewModel(mainModel) {DisplayName = "Type Holes (NYI)"}; //_typeHoleVm = new TypeHoleViewModel(mainModel) {DisplayName = "Type Holes (NYI)"};
_audioVisualizerVm = new AudioVisualizerViewModel(mainModel) {DisplayName = "Audio Visualization"}; _audioVisualizerVm = new AudioVisualizerViewModel(mainModel) {DisplayName = "Audio Visualization"};
_debugVm = new DebugEffectViewModel(mainModel) {DisplayName = "Debug Effect"}; _debugVm = new DebugEffectViewModel(mainModel) {DisplayName = "Debug Effect"};
} }
@ -27,7 +27,7 @@ namespace Artemis.ViewModels
base.OnActivate(); base.OnActivate();
ActivateItem(_typeWaveVm); ActivateItem(_typeWaveVm);
ActivateItem(_typeHoleVm); //ActivateItem(_typeHoleVm);
ActivateItem(_audioVisualizerVm); ActivateItem(_audioVisualizerVm);
ActivateItem(_debugVm); ActivateItem(_debugVm);
} }

4
Artemis/Artemis/ViewModels/GamesViewModel.cs
View File

@ -18,7 +18,7 @@ namespace Artemis.ViewModels
{ {
_rocketLeagueVm = new RocketLeagueViewModel(mainModel) {DisplayName = "Rocket League"}; _rocketLeagueVm = new RocketLeagueViewModel(mainModel) {DisplayName = "Rocket League"};
_counterStrikeVm = new CounterStrikeViewModel(mainModel) {DisplayName = "CS:GO"}; _counterStrikeVm = new CounterStrikeViewModel(mainModel) {DisplayName = "CS:GO"};
_dota2Vm = new Dota2ViewModel(mainModel) {DisplayName = "Dota 2 (NYI)"}; //_dota2Vm = new Dota2ViewModel(mainModel) {DisplayName = "Dota 2 (NYI)"};
_witcher3Vm = new Witcher3ViewModel(mainModel) {DisplayName = "The Witcher 3"}; _witcher3Vm = new Witcher3ViewModel(mainModel) {DisplayName = "The Witcher 3"};
} }
@ -28,7 +28,7 @@ namespace Artemis.ViewModels
ActivateItem(_rocketLeagueVm); ActivateItem(_rocketLeagueVm);
ActivateItem(_counterStrikeVm); ActivateItem(_counterStrikeVm);
ActivateItem(_dota2Vm); //ActivateItem(_dota2Vm);
ActivateItem(_witcher3Vm); ActivateItem(_witcher3Vm);
} }
} }