diff --git a/Assets/Scripts/Editor.cs b/Assets/Scripts/Editor.cs index b31037a8..3ba00946 100644 --- a/Assets/Scripts/Editor.cs +++ b/Assets/Scripts/Editor.cs @@ -996,6 +996,7 @@ private void Update() if (allowCancel && Input.GetKeyDown(KeyCode.Escape)) { + pointToEdit.filled = true; pointToEdit = null; Destroy(interactionEditor); SetEditorActive(true); diff --git a/InstallerScriptEditor.iss b/InstallerScriptEditor.iss index 8d5852af..2c7876b3 100644 --- a/InstallerScriptEditor.iss +++ b/InstallerScriptEditor.iss @@ -1,47 +1,47 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define MyAppName "Vivista Editor" -#define MyAppVersion "0.9.11" -#define MyAppPublisher "Hogeschool PXL" -#define MyAppExeName "VivistaEditor.exe" - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{CB02C572-011A-4604-988D-621F65B62C0A} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -DefaultDirName={autopf}\Vivista Editor -DefaultGroupName=Vivista -AllowNoIcons=yes -; Remove the following line to run in administrative install mode (install for all users.) -PrivilegesRequired=lowest -PrivilegesRequiredOverridesAllowed=commandline -OutputDir=C:\Users\Simon\Git\Vivista\builds\installers -OutputBaseFilename=VivistaEditor -Compression=lzma -SolidCompression=yes -WizardStyle=modern - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "C:\Users\Simon\Git\Vivista\builds\master\EditorWin\VivistaEditor.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Users\Simon\Git\Vivista\builds\master\EditorWin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Vivista Editor" +#define MyAppVersion "0.9.12" +#define MyAppPublisher "Hogeschool PXL" +#define MyAppExeName "VivistaEditor.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{CB02C572-011A-4604-988D-621F65B62C0A} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +DefaultDirName={autopf}\Vivista Editor +DefaultGroupName=Vivista +AllowNoIcons=yes +; Remove the following line to run in administrative install mode (install for all users.) +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=commandline +OutputDir=C:\Users\Simon\Git\Vivista\builds\installers +OutputBaseFilename=VivistaEditor +Compression=lzma +SolidCompression=yes +WizardStyle=modern + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "C:\Users\Simon\Git\Vivista\builds\master\EditorWin\VivistaEditor.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\Simon\Git\Vivista\builds\master\EditorWin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +