diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c1ebb4..856717e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ # Tanks of Freedom ## Changelog +### 0.7.1-beta +- updated SSL cert +- updated some translations +- fixed some typos in README +- fixed a runtime error + ### 0.7.0-beta - scripted map events in campaign - integrated RU language diff --git a/assets/czlowiekimadlo-pl.crt b/assets/czlowiekimadlo-pl.crt new file mode 100644 index 00000000..30aa9363 --- /dev/null +++ b/assets/czlowiekimadlo-pl.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 +WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu +ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc +h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ +0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U +A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW +T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH +B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC +B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv +KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn +OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn +jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw +qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI +rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq +hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ +3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK +NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 +ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur +TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC +jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc +oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq +4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA +mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d +emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- diff --git a/engine.cfg b/engine.cfg index cb07c2e1..47744c37 100644 --- a/engine.cfg +++ b/engine.cfg @@ -64,7 +64,7 @@ light_discard_enabled=true [ssl] -certificates="res://assets/dst.crt" +certificates="res://assets/czlowiekimadlo-pl.crt" [tof] diff --git a/game.xscn b/game.xscn index 49a5e406..06c91f96 100644 --- a/game.xscn +++ b/game.xscn @@ -1,5 +1,5 @@ - + diff --git a/gui/menu.tscn b/gui/menu.tscn index bdf29080..72216f09 100644 --- a/gui/menu.tscn +++ b/gui/menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=1] +[gd_scene load_steps=26 format=1] [ext_resource path="res://gui/font_16.tres" type="Theme" id=1] [ext_resource path="res://scripts/menu_controller.gd" type="Script" id=2] @@ -15,17 +15,14 @@ [ext_resource path="res://assets/gui/buttons/analog_size3_3.png" type="Texture" id=13] [ext_resource path="res://gui/font_14.tres" type="Theme" id=14] [ext_resource path="res://assets/branding/p1x_logo.png" type="Texture" id=15] -[ext_resource path="res://assets/gui/buttons/analog_size3_0.png" type="Texture" id=16] -[ext_resource path="res://assets/gui/buttons/analog_size3_1.png" type="Texture" id=17] -[ext_resource path="res://assets/gui/buttons/analog_size3_2.png" type="Texture" id=18] -[ext_resource path="res://assets/gui/buttons/analog_size3_4.png" type="Texture" id=19] -[ext_resource path="res://gui/small_gray_theme.tres" type="Theme" id=20] -[ext_resource path="res://assets/gui/buttons/analog_size2_0.png" type="Texture" id=21] -[ext_resource path="res://assets/gui/buttons/analog_size2_1.png" type="Texture" id=22] -[ext_resource path="res://assets/gui/buttons/analog_size2_2.png" type="Texture" id=23] -[ext_resource path="res://assets/gui/buttons/analog_size2_3.png" type="Texture" id=24] -[ext_resource path="res://assets/gui/buttons/analog_size2_4.png" type="Texture" id=25] -[ext_resource path="res://gui/stats.xscn" type="PackedScene" id=26] +[ext_resource path="res://assets/gui/buttons/analog_size3_4.png" type="Texture" id=16] +[ext_resource path="res://gui/small_gray_theme.tres" type="Theme" id=17] +[ext_resource path="res://assets/gui/buttons/analog_size2_0.png" type="Texture" id=18] +[ext_resource path="res://assets/gui/buttons/analog_size2_1.png" type="Texture" id=19] +[ext_resource path="res://assets/gui/buttons/analog_size2_2.png" type="Texture" id=20] +[ext_resource path="res://assets/gui/buttons/analog_size2_3.png" type="Texture" id=21] +[ext_resource path="res://assets/gui/buttons/analog_size2_4.png" type="Texture" id=22] +[ext_resource path="res://gui/stats.xscn" type="PackedScene" id=23] [sub_resource type="Animation" id=1] @@ -122,10 +119,6 @@ __meta__ = { [node name="vigette" parent="." instance=ExtResource( 3 )] editor/display_folded = true -margin/left = 0.0 -margin/top = 0.0 -margin/right = 0.0 -margin/bottom = 0.0 [node name="middle" type="CenterContainer" parent="."] @@ -482,11 +475,11 @@ margin/bottom = 64.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -523,11 +516,11 @@ margin/bottom = -64.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -566,7 +559,7 @@ textures/normal = ExtResource( 10 ) textures/pressed = ExtResource( 11 ) textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -601,11 +594,11 @@ margin/bottom = 64.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -696,11 +689,11 @@ margin/bottom = -32.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -735,11 +728,11 @@ margin/bottom = -32.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -774,11 +767,11 @@ margin/bottom = -32.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 16 ) -textures/pressed = ExtResource( 17 ) -textures/hover = ExtResource( 18 ) +textures/normal = ExtResource( 10 ) +textures/pressed = ExtResource( 11 ) +textures/hover = ExtResource( 12 ) textures/disabled = ExtResource( 13 ) -textures/focused = ExtResource( 19 ) +textures/focused = ExtResource( 16 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -806,7 +799,7 @@ focus/ignore_mouse = true focus/stop_mouse = true size_flags/horizontal = 2 size_flags/vertical = 0 -theme/theme = ExtResource( 20 ) +theme/theme = ExtResource( 17 ) margin/left = -277.0 margin/top = -32.0 margin/right = -127.0 @@ -823,7 +816,7 @@ focus/ignore_mouse = true focus/stop_mouse = true size_flags/horizontal = 2 size_flags/vertical = 0 -theme/theme = ExtResource( 20 ) +theme/theme = ExtResource( 17 ) margin/left = 120.0 margin/top = -32.0 margin/right = 270.0 @@ -848,11 +841,11 @@ margin/bottom = -32.0 toggle_mode = false enabled_focus_mode = 2 shortcut = null -textures/normal = ExtResource( 21 ) -textures/pressed = ExtResource( 22 ) -textures/hover = ExtResource( 23 ) -textures/disabled = ExtResource( 24 ) -textures/focused = ExtResource( 25 ) +textures/normal = ExtResource( 18 ) +textures/pressed = ExtResource( 19 ) +textures/hover = ExtResource( 20 ) +textures/disabled = ExtResource( 21 ) +textures/focused = ExtResource( 22 ) params/resize_mode = 0 params/scale = Vector2( 3, 3 ) params/stretch_mode = 0 @@ -874,7 +867,7 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="end_game" parent="." instance=ExtResource( 26 )] +[node name="end_game" parent="." instance=ExtResource( 23 )] visibility/visible = false diff --git a/scripts/game_logic.gd b/scripts/game_logic.gd index 89df29b0..32c0ea8e 100644 --- a/scripts/game_logic.gd +++ b/scripts/game_logic.gd @@ -1,6 +1,7 @@ extends Control -var version_name = "Version 0.7.0-BETA" +var version_name = "Version 0.7.1-BETA" +var version_visible = "0.7.1" var version_short = "0.7.0" var selector = preload('res://gui/selector.xscn').instance() diff --git a/scripts/language.gd b/scripts/language.gd index 8fa6a44e..d8e99be0 100644 --- a/scripts/language.gd +++ b/scripts/language.gd @@ -36,7 +36,7 @@ func reload_labels(): #TITLE SCREEN var title_screen = self.bag.controllers.menu_controller.get_node('middle/center/game_panel/under_logo') - title_screen.get_node('copy').set_text(tr('LABEL_VERSION') + ' ' + self.bag.root.version_short + '-BETA') + title_screen.get_node('copy').set_text(tr('LABEL_VERSION') + ' ' + self.bag.root.version_visible + '-BETA') self.reload_label(title_screen.get_node('title3'), 'MSG_GAME_DESCRIPTION_1') self.reload_label(title_screen.get_node('title5'), 'MSG_GAME_DESCRIPTION_2') self.reload_label(title_screen.get_node('title4'), 'MSG_FREE_AS_FREEDOM')