Skip to content

Commit

Permalink
polishing, update checking
Browse files Browse the repository at this point in the history
  • Loading branch information
@Grix
Grix committed Oct 6, 2015
1 parent 797e923 commit c09014d
Show file tree
Hide file tree
Showing 15 changed files with 298 additions and 225 deletions.
8 changes: 4 additions & 4 deletions Configs/Default.config.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<option_android_use_test_ads>0</option_android_use_test_ads>
<option_argumenterrors>True</option_argumenterrors>
<option_audioGroupCount>1</option_audioGroupCount>
<option_author></option_author>
<option_author>Gitle Mikkelsen</option_author>
<option_backimage>nil</option_backimage>
<option_borderless>False</option_borderless>
<option_changed>false</option_changed>
Expand Down Expand Up @@ -305,13 +305,13 @@
<option_tizen_usesplash>False</option_tizen_usesplash>
<option_use_new_audio>True</option_use_new_audio>
<option_variableerrors>False</option_variableerrors>
<option_version>100</option_version>
<option_version>0.6.0</option_version>
<option_version_build>0</option_version_build>
<option_version_company>Gitle Mikkelsen</option_version_company>
<option_version_copyright>MIT License</option_version_copyright>
<option_version_description>VRLSS</option_version_description>
<option_version_major>0</option_version_major>
<option_version_minor>5</option_version_minor>
<option_version_minor>6</option_version_minor>
<option_version_product>VRLSS</option_version_product>
<option_version_release>0</option_version_release>
<option_win8_advertising_appid></option_win8_advertising_appid>
Expand Down Expand Up @@ -358,7 +358,7 @@
<option_windows_enable_steam>0</option_windows_enable_steam>
<option_windows_game_icon>Configs\Default\windows\runner_icon.ico</option_windows_game_icon>
<option_windows_license>Configs\Default\windows\License.txt</option_windows_license>
<option_windows_mainor_version>5</option_windows_mainor_version>
<option_windows_mainor_version>6</option_windows_mainor_version>
<option_windows_major_version>0</option_windows_major_version>
<option_windows_nsis_file>Configs\Default\windows\RunnerInstaller.nsi</option_windows_nsis_file>
<option_windows_product_info>VRLSS</option_windows_product_info>
Expand Down
Binary file added VRLSS-0.6.0-Installer-Legacy.exe
View file
Binary file not shown.
Binary file added VRLSS-0.6.0-Installer.exe
View file
Binary file not shown.
23 changes: 21 additions & 2 deletions VRLSS.project.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Configs name="configs">
<Config>Configs\Default</Config>
</Configs>
<datafiles number="1" name="datafiles">
<datafiles number="2" name="datafiles">
<datafile>
<name>help.pdf</name>
<exists>-1</exists>
Expand All @@ -21,10 +21,28 @@
</ConfigOptions>
<filename>help.pdf</filename>
</datafile>
<datafile>
<name>msvcr120.dll</name>
<exists>-1</exists>
<size>970912</size>
<exportAction>2</exportAction>
<exportDir></exportDir>
<overwrite>0</overwrite>
<freeData>-1</freeData>
<removeEnd>0</removeEnd>
<store>0</store>
<ConfigOptions>
<Config name="Default">
<CopyToMask>9223372036854775807</CopyToMask>
</Config>
</ConfigOptions>
<filename>msvcr120.dll</filename>
</datafile>
</datafiles>
<NewExtensions>
<extension index="0">extensions\RiftExt</extension>
<extension index="1">extensions\Saudio Plus</extension>
<extension index="2">extensions\GMopen</extension>
</NewExtensions>
<sounds name="sound"/>
<sprites name="sprites">
Expand Down Expand Up @@ -71,7 +89,6 @@
<script>scripts\draw_setup.gml</script>
<script>scripts\draw_info.gml</script>
<script>scripts\draw_frame_2d.gml</script>
<script>scripts\draw_frame_3d_old.gml</script>
<script>scripts\draw_frame_3d.gml</script>
<script>scripts\draw_frame_3d_nohmd.gml</script>
<script>scripts\d3d_model_load_ext.gml</script>
Expand Down Expand Up @@ -145,6 +162,8 @@
<script>scripts\string_split.gml</script>
<script>scripts\string_split_ext.gml</script>
</scripts>
<script>scripts\dialog_yesno.gml</script>
<script>scripts\update_check.gml</script>
</scripts>
<shaders name="shaders">
<shader type="GLSLES">shaders\lasershader.shader</shader>
Expand Down
Binary file added datafiles/msvcr120.dll
View file
Binary file not shown.
56 changes: 56 additions & 0 deletions extensions/GMopen.extension.gmx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<extension>
<name>GMopen</name>
<version>1.0.0</version>
<packageID></packageID>
<ProductID></ProductID>
<date>27/07/15</date>
<license>Free to use, also for commercial games.</license>
<description></description>
<helpfile></helpfile>
<androidProps>0</androidProps>
<iosProps>0</iosProps>
<installdir></installdir>
<classname></classname>
<androidclassname></androidclassname>
<sourcedir></sourcedir>
<androidsourcedir></androidsourcedir>
<macsourcedir></macsourcedir>
<maclinkerflags></maclinkerflags>
<maccompilerflags></maccompilerflags>
<androidinject></androidinject>
<iosSystemFrameworks/>
<iosThirdPartyFrameworks/>
<androidPermissions/>
<IncludedResources/>
<files>
<file>
<filename>GMopen.dll</filename>
<origname>extensions\GMopen.dll</origname>
<init></init>
<final></final>
<kind>1</kind>
<uncompress>0</uncompress>
<ConfigOptions>
<Config name="Default">
<CopyToMask>810553408</CopyToMask>
</Config>
</ConfigOptions>
<ProxyFiles/>
<functions>
<function>
<name>open_in_explorer</name>
<externalName>open_in_explorer</externalName>
<kind>12</kind>
<help>open_in_explorer(path)</help>
<returnType>2</returnType>
<argCount>1</argCount>
<args>
<arg>1</arg>
</args>
</function>
</functions>
<constants/>
</file>
</files>
</extension>
Binary file added extensions/GMopen/GMopen.dll
View file
Binary file not shown.
127 changes: 126 additions & 1 deletion objects/controller.object.gmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,28 @@
<arguments>
<argument>
<kind>1</kind>
<string>version = "0.5.0";
<string>version = "0.6.0";
version_date = "2015-10-06";

Init();

//setup file handling system
FStemp = game_save_id+"temp\";
if (directory_exists("temp"))
{
while (1)
{
file = file_find_first("temp\*", 0);
show_debug_message(file)
if (file == "") or is_undefined(file) or !is_string(file)
break;
if (!file_delete("temp\"+file))
break;
}
}
else
directory_create("temp");

templist = ds_list_create();
scan_list = ds_list_create();
draw_list = ds_list_create();
Expand Down Expand Up @@ -56,6 +74,7 @@ refresh_setup_surf = 1;

alarm[1]=2;

dialog_open = 0;
tooltip = "";
frame = 0;
framefloat = 0;
Expand All @@ -77,6 +96,8 @@ xpnrad = 0;
ypnrad = 0;
zpnrad = 0;
skybox = 1;

update_check();
</string>
</argument>
</arguments>
Expand Down Expand Up @@ -295,6 +316,109 @@ if (rdy)

}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="7" enumb="63">
<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>dialog_open = 0;

//Get integer
var new_id = ds_map_find_value(async_load, "id");
if (new_id == getint)
{
if (dialog == "update")
{
updatecheckenabled = ds_map_find_value(async_load, "status");
ini_filename = "settings.ini";
ini_open(ini_filename);
ini_write_real("main","updatecheck",updatecheckenabled);
ini_close();
if (updatecheckenabled)
{
updateget = http_get("https://raw.githubusercontent.com/Grix/vrlss/master/version.txt");
}
}
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="7" enumb="62">
<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>if ds_map_find_value(async_load, "id") == updateget
{
if ds_map_find_value(async_load, "status") == 0
{
versionnew = ds_map_find_value(async_load, "result");
show_debug_message("Checking version");
if (versionnew != version)
{
dialog_yesno("updatefound","New version available: "+versionnew+"##Would you like to download and install the update?");
}
else if (update_verbose == 1)
{
show_message_async("Current version is up to date.");
}
}
}
else if ds_map_find_value(async_load, "id") == file
{
if ds_map_find_value(async_load, "status") == 0
{
if (file_exists("temp/update.exe"))
{
if (alarm[4] == -1)
{
show_message_async("Launching installer");
open_in_explorer(FStemp+"update.exe")
alarm[4] = 60;
}
}
else
{
if (updatereceived == 0)
{
show_message_async("Failed to automatically download update. Opening download website..");
open_in_explorer("https://github.com/Grix/vrlss/releases");
updatereceived = 1;
}
}
}
}
</string>
</argument>
</arguments>
Expand Down Expand Up @@ -324,6 +448,7 @@ if (rdy)
}
else if (room == rm_2d)
{
refreshframe = 1;
end3D();
window_set_cursor(cr_default);

Expand Down
Loading

0 comments on commit c09014d

Please sign in to comment.