Skip to content

Commit

Permalink
Merge pull request saucepleez#4 from saucepleez/development-branch
Browse files Browse the repository at this point in the history 
Development branch
  • Loading branch information
@saucepleez
saucepleez authored Jun 28, 2018
2 parents 616fb98 + 76b6af4 commit f072085
Show file tree
Hide file tree
Showing 20 changed files with 43,007 additions and 4,534 deletions.
8 changes: 4 additions & 4 deletions taskt-updater/frmUpdating.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44,514 changes: 41,561 additions & 2,953 deletions taskt-updater/frmUpdating.resx
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions taskt/Core/ApplicationSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,14 @@ public class EngineSettings
public bool ShowDebugWindow { get; set; }
public bool AutoCloseDebugWindow { get; set; }
public bool EnableDiagnosticLogging { get; set; }

public bool ShowAdvancedDebugOutput { get; set; }
public EngineSettings()
{
ShowDebugWindow = true;
AutoCloseDebugWindow = true;
EnableDiagnosticLogging = true;
}
ShowAdvancedDebugOutput = false;
}
}
/// <summary>
/// Defines application/client-level settings which can be managed by the user
Expand Down
2 changes: 1 addition & 1 deletion taskt/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.0.*")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
//[assembly: AssemblyVersion("0.0.0.2")]
//[assembly: AssemblyFileVersion("0.0.0.2")]
30 changes: 30 additions & 0 deletions taskt/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 19 additions & 10 deletions taskt/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
<data name="command_camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-camera.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_sequence" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-sequence.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_begin_if" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-begin-if.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down Expand Up @@ -154,6 +151,9 @@
<data name="command_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="header_backing_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\header_backing_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="action_bar_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action-bar-open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand All @@ -169,6 +169,9 @@
<data name="header_backing" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\header-backing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="robot-error" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\robot-error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="action_bar_variable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action-bar-variable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand All @@ -190,6 +193,9 @@
<data name="action_bar_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action-bar-new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_string" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-string.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_endloop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-endloop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand Down Expand Up @@ -220,25 +226,28 @@
<data name="command_files" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-files.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="robot-bouncing-transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\robot-bouncing-transparent.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_web" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-web.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_end_if" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-end-if.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_string" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-string.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="various-question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\various-question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="command_sequence" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\command-sequence.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="message" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\various-chat-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="various_record_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\various-record-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="various-question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\various-question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="header_backing_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\header_backing_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="robot source" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\robot source.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added taskt/Resources/robot source.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added taskt/Resources/robot-bouncing-transparent.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added taskt/Resources/robot-bouncing.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added taskt/Resources/robot-error.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added taskt/Resources/robot-error1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 0 additions & 18 deletions taskt/UI/Forms/Supplement Forms/frmAbout.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f072085

Please sign in to comment.