1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-31 17:53:32 +00:00
Fixed pulse/grow effects display in editor
Fixed crash that could occur on layer deslection
Updated Witcher 3 mod for 1.31
Updated almost all profiles to include a mousemat layer
Updated all windows profiles to include all device types
Added windows profiles to key waves and audio visualization
This commit is contained in:
SpoinkyNL 2016-09-19 19:39:32 +02:00
parent 50623eeb07
commit 7a79afad47
8 changed files with 10 additions and 9 deletions

View File

@ -40,7 +40,7 @@
<ProductName>Artemis</ProductName> <ProductName>Artemis</ProductName>
<PublisherName>Artemis</PublisherName> <PublisherName>Artemis</PublisherName>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.3.0.0</ApplicationVersion> <ApplicationVersion>1.3.4.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>

View File

@ -22,7 +22,7 @@
<Run Text="In case you're wondering where these effects went, they are now part of the layer system." /> <Run Text="In case you're wondering where these effects went, they are now part of the layer system." />
<LineBreak /> <LineBreak />
<Run Text="To use them, navigate to the Windows Profile effect and select one of these profiles:" /> <Run Text="To use them, navigate to the Windows Profile effect and select one of these profiles:" />
<LineBreak /><Run Text="• Default - Key waves" /><LineBreak /> <LineBreak /><Run Text="• Default - Type waves" /><LineBreak />
<Run Text="• Default - Audio visualization" /><LineBreak /><Run /><LineBreak /> <Run Text="• Default - Audio visualization" /><LineBreak /><Run /><LineBreak />
<Run Text="You can also add these effects to your own profile, even in games! " /><LineBreak /> <Run Text="You can also add these effects to your own profile, even in games! " /><LineBreak />
<Run <Run

View File

@ -12,8 +12,9 @@ namespace Artemis.Profiles.Layers.Animations
public void Update(LayerModel layerModel, bool updateAnimations) public void Update(LayerModel layerModel, bool updateAnimations)
{ {
// TODO: Generic implementation
// Reset animation progress if layer wasn't drawn for 100ms // Reset animation progress if layer wasn't drawn for 100ms
if (new TimeSpan(0, 0, 0, 0, 100) < DateTime.Now - layerModel.LastRender) if ((new TimeSpan(0, 0, 0, 0, 100) < DateTime.Now - layerModel.LastRender) && updateAnimations)
layerModel.Properties.AnimationProgress = 0; layerModel.Properties.AnimationProgress = 0;
var progress = layerModel.Properties.AnimationProgress; var progress = layerModel.Properties.AnimationProgress;

View File

@ -12,8 +12,9 @@ namespace Artemis.Profiles.Layers.Animations
public void Update(LayerModel layerModel, bool updateAnimations) public void Update(LayerModel layerModel, bool updateAnimations)
{ {
// TODO: Generic implementation
// Reset animation progress if layer wasn't drawn for 100ms // Reset animation progress if layer wasn't drawn for 100ms
if (new TimeSpan(0, 0, 0, 0, 100) < DateTime.Now - layerModel.LastRender) if ((new TimeSpan(0, 0, 0, 0, 100) < DateTime.Now - layerModel.LastRender) && updateAnimations)
layerModel.Properties.AnimationProgress = 0; layerModel.Properties.AnimationProgress = 0;
var progress = layerModel.Properties.AnimationProgress; var progress = layerModel.Properties.AnimationProgress;

View File

@ -72,9 +72,8 @@ namespace Artemis.Profiles.Layers.Models
{ {
LayerType.Update(this, dataModel, preview); LayerType.Update(this, dataModel, preview);
LayerAnimation?.Update(this, updateAnimations); LayerAnimation?.Update(this, updateAnimations);
if (!preview) LastRender = DateTime.Now;
LastRender = DateTime.Now;
} }
public void Draw(IDataModel dataModel, DrawingContext c, bool preview, bool updateAnimations) public void Draw(IDataModel dataModel, DrawingContext c, bool preview, bool updateAnimations)

View File

@ -52,5 +52,5 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.3.0")] [assembly: AssemblyVersion("1.3.4.0")]
[assembly: AssemblyFileVersion("1.3.3.0")] [assembly: AssemblyFileVersion("1.3.4.0")]