From 0ff3605ae610cb3bbcbecaa6b8946e14bcebbae5 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 13 Mar 2018 03:01:34 -0400 Subject: [PATCH] Prepare auto-update for deployment --- .gitignore | 2 ++ export_presets.cfg | 68 ++++++++++++++++++++++++++++++++++++++++++++++------- icon.png | Bin 3498 -> 2743 bytes project.godot | 4 ++++ scenes/update.tscn | 13 +++++----- scripts/update.gd | 5 ++-- 6 files changed, 76 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index a522fb4..16cbcca 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,9 @@ nohup.out recordings ai release +vanagloria.pck ._* ehthumbs.db Thumbs.db + diff --git a/export_presets.cfg b/export_presets.cfg index 5dda3c6..16b7b7a 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -4,8 +4,9 @@ name="Windows Desktop" platform="Windows Desktop" runnable=false custom_features="" -export_filter="all_resources" -include_filter="" +export_filter="resources" +export_files=PoolStringArray( "res://default_env.tres", "res://scenes/update.tscn", "res://scripts/util.gd" ) +include_filter="/etc/ssl/certs/ca-certificates.crt" exclude_filter="" patch_list=PoolStringArray( ) @@ -17,11 +18,11 @@ texture_format/etc2=false binary_format/64_bits=true custom_template/release="" custom_template/debug="" -application/icon="" -application/file_version="" -application/product_version="" -application/company_name="" -application/product_name="" +application/icon="/hdd/documents/src/nv-moba/icon.png" +application/file_version="0.0.0" +application/product_version="0.0.0" +application/company_name="Cosine Gaming" +application/product_name="Vanagloria" application/file_description="" application/copyright="" application/trademarks="" @@ -32,12 +33,63 @@ name="Linux/X11" platform="Linux/X11" runnable=false custom_features="" +export_filter="resources" +export_files=PoolStringArray( "res://default_env.tres", "res://scenes/update.tscn", "res://scripts/util.gd" ) +include_filter="/etc/ssl/certs/ca-certificates.crt" +exclude_filter="" +patch_list=PoolStringArray( ) + +[preset.1.options] + +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +binary_format/64_bits=true +custom_template/release="" +custom_template/debug="" + +[preset.2] + +name="Mac OSX" +platform="Mac OSX" +runnable=false +custom_features="" +export_filter="resources" +export_files=PoolStringArray( "res://default_env.tres", "res://scenes/update.tscn", "res://scripts/util.gd" ) +include_filter="/etc/ssl/certs/ca-certificates.crt" +exclude_filter="" +patch_list=PoolStringArray( ) + +[preset.2.options] + +custom_package/debug="" +custom_package/release="" +application/name="Vanagloria" +application/info="Made with Godot Engine" +application/icon="res://icon.png" +application/identifier="com.cosinegaming.vanagloria" +application/signature="godotmacgame" +application/short_version="0.0" +application/version="0.0.0" +application/copyright="" +application/bits_mode=0 +display/high_res=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false + +[preset.3] + +name="Full PCK" +platform="Linux/X11" +runnable=false +custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" patch_list=PoolStringArray( ) -[preset.1.options] +[preset.3.options] texture_format/s3tc=true texture_format/etc=false diff --git a/icon.png b/icon.png index a0b64eee944cb4cfb2aa8dc0d8d78faf6ca44dc1..ac8eeb9bfdb92c519bd183b147cc7f17d399bb29 100644 GIT binary patch literal 2743 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 Y|LV|6es%hBO8@`>07*qoM6N<$f`}~Z-v9sr diff --git a/project.godot b/project.godot index e943465..d49c94c 100644 --- a/project.godot +++ b/project.godot @@ -55,6 +55,10 @@ hero_5_confirm_portal=[ Object(InputEventMouseButton,"resource_local_to_scene":f hero_5_remove_portal=[ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null) ] +[network] + +ssl/certificates="/etc/ssl/certs/ca-certificates.crt" + [rendering] environment/default_environment="res://default_env.tres" diff --git a/scenes/update.tscn b/scenes/update.tscn index ae86eb1..1e887f4 100644 --- a/scenes/update.tscn +++ b/scenes/update.tscn @@ -5,7 +5,7 @@ [sub_resource type="DynamicFont" id=1] -size = 0 +size = 50 use_mipmaps = false use_filter = false font_data = ExtResource( 2 ) @@ -81,21 +81,22 @@ anchor_left = 0.5 anchor_top = 0.0 anchor_right = 0.5 anchor_bottom = 0.0 -margin_left = -20.0 -margin_top = 56.0 -margin_right = 20.0 -margin_bottom = 70.0 +margin_left = -209.0 +margin_top = 70.0 +margin_right = 208.0 +margin_bottom = 136.0 rect_pivot_offset = Vector2( 0, 0 ) mouse_filter = 2 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 4 custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 1, 1, 1, 1 ) text = "VANAGLORIA" align = 1 percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -_sections_unfolded = [ "custom_fonts" ] +_sections_unfolded = [ "custom_colors", "custom_fonts" ] diff --git a/scripts/update.gd b/scripts/update.gd index 0a1fdb3..758e2a8 100644 --- a/scripts/update.gd +++ b/scripts/update.gd @@ -7,7 +7,7 @@ var time = 0 func _ready(): connect("request_completed", self, "_request_completed") # Check if we need an update - request("http://localhost:8080/vanagloria/version") + request("https://cosinegaming.com/vanagloria/version") set_process(true) func _request_completed(result, response_code, headers, body): @@ -18,7 +18,8 @@ func _request_completed(result, response_code, headers, body): if not is_update_payload: # Just checking if we need an update var server = JSON.parse(body.get_string_from_utf8()).result - if server.version == util.version: + # 0.0.0 -> Update-shell application, needs more resources + if server.version == util.version and util.version != "0.0.0": completed() else: is_update_payload = true