v0.6.0

Grix · Oct 6, 2015 · 6877a6f · RobQuistNL · Oct 7, 2015 · RobQuistNL
1 parent c09014d
commit 6877a6f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 3 deletions.
diff --git a/Configs/Default/windows/RunnerInstaller.nsi b/Configs/Default/windows/RunnerInstaller.nsi
@@ -27,11 +27,11 @@
 !endif
 
 !ifndef COPYRIGHT_TXT
-!define COPYRIGHT_TXT     "(c)Copyright 2013"
+!define COPYRIGHT_TXT     "(c)Copyright 2015"
 !endif
 
 !ifndef FILE_DESC
-!define FILE_DESC         "Created with GameMaker:Studio"
+!define FILE_DESC         "Virtual Reality Laser Show Simulator"
 !endif
 
 !ifndef LICENSE_NAME
@@ -75,7 +75,7 @@ BrandingText "${APP_NAME}"
 OutFile "${INSTALLER_FILENAME}"
 
 ; The default installation directory
-InstallDir "$PROFILE\${APP_NAME}"
+InstallDir "$PROGRAMFILES\${APP_NAME}"
 
 ; Registry key to check for directory (so if you install again, it will 
 ; overwrite the old one automatically)

diff --git a/VRLSS-0.5.0-Installer-Legacy.exe b/VRLSS-0.5.0-Installer-Legacy.exe
diff --git a/VRLSS-0.5.0-Installer.exe b/VRLSS-0.5.0-Installer.exe
diff --git a/VRLSS-0.6.0-Installer-Legacy.exe b/VRLSS-0.6.0-Installer-Legacy.exe
diff --git a/VRLSS-0.6.0-Installer.exe b/VRLSS-0.6.0-Installer.exe
diff --git a/objects/controller.object.gmx b/objects/controller.object.gmx
@@ -74,6 +74,7 @@ refresh_setup_surf = 1;
 
 alarm[1]=2;
 
+update_verbose = 0;
 dialog_open = 0;
 tooltip = "";
 frame = 0;
@@ -98,6 +99,30 @@ zpnrad = 0;
 skybox = 1;
 
 update_check();
+</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+    <event eventtype="2" enumb="4">
+      <action>
+        <libid>1</libid>
+        <id>603</id>
+        <kind>7</kind>
+        <userelative>0</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>2</exetype>
+        <functionname></functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>0</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>1</kind>
+            <string>///game end
+game_end();
 </string>
           </argument>
         </arguments>
@@ -356,6 +381,18 @@ if (new_id == getint)
             updateget = http_get("https://raw.githubusercontent.com/Grix/vrlss/master/version.txt");
             }
         }  
+ if ds_map_find_value(async_load, "status")
+        {
+        switch (dialog)
+            {
+            case "updatefound":
+                {
+                file = http_get_file("https://github.com/Grix/vrlss/raw/master/VRLSS-"+versionnew+"-Installer.exe","temp/update.exe");
+                show_message_async("Download started, installation will start shortly..");
+                break;
+                }  
+            }
+        }
     }
 </string>
           </argument>