Skip to content

some improvements #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JezSonic merged 1 commit into from
May 12, 2022
Merged

some improvements #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions Scenes/Menu.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,6 @@ size_flags_horizontal = 3
size_flags_vertical = 3
text = "Downloadable Content"

[node name="UpdatePopup" type="Button" parent="VBoxContainer3"]
margin_right = 225.0
margin_bottom = 42.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Check for game updates"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="VBoxContainer2" type="VBoxContainer" parent="."]
anchor_left = 1.0
anchor_top = 1.0
Expand All @@ -141,14 +131,26 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="Achivements" type="Button" parent="VBoxContainer2"]
[node name="UpdatePopup" type="Button" parent="VBoxContainer2"]
margin_right = 225.0
margin_bottom = 42.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Check for game updates"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Achivements" type="Button" parent="VBoxContainer2"]
margin_top = 46.0
margin_right = 225.0
margin_bottom = 88.0
size_flags_horizontal = 3
size_flags_vertical = 3
text = "Achievements"

[node name="Editor" type="Button" parent="VBoxContainer2"]
visible = false
margin_top = 46.0
margin_right = 225.0
margin_bottom = 88.0
Expand Down Expand Up @@ -446,7 +448,7 @@ margin_bottom = -5.0
[connection signal="pressed" from="VBoxContainer3/Login" to="." method="_on_Login_pressed"]
[connection signal="pressed" from="VBoxContainer3/Logout" to="." method="_on_Logout_pressed"]
[connection signal="pressed" from="VBoxContainer3/DownloadableContent" to="." method="_on_DownloadableContent_pressed"]
[connection signal="pressed" from="VBoxContainer3/UpdatePopup" to="." method="_on_UpdatePopup_pressed"]
[connection signal="pressed" from="VBoxContainer2/UpdatePopup" to="." method="_on_UpdatePopup_pressed"]
[connection signal="pressed" from="VBoxContainer2/Achivements" to="." method="_on_Achivements_pressed"]
[connection signal="pressed" from="VBoxContainer2/Editor" to="." method="_on_Editor_pressed"]
[connection signal="pressed" from="VBoxContainer2/Options" to="." method="_on_Options_pressed"]
Expand Down
3 changes: 3 additions & 0 deletions Scripts/Globals.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,3 +704,6 @@ func encrypt_cfg(path, key, dest_path):
print("Found value: " + section_key_value)
new_cfg.set_value(section, section_key, section_key_value)
new_cfg.save_encrypted_pass(dest_path, key)

func reload_scene():
get_tree().reload_current_scene()
3 changes: 0 additions & 3 deletions addons/github_issues_bugtracker/IssuePrompt.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ func _get_labels():
func _on_LabelsRequest_request_completed(result, response_code, headers, body):
var labels_list = Array(JSON.parse(body.get_string_from_utf8()).result)
for i in labels_list:
print(i)
_add_label(i["name"], i["color"])

func _add_label(name_:String, color_:String):
Expand All @@ -36,10 +35,8 @@ func _add_label(name_:String, color_:String):
$GridContainer.add_child(l)
func _label_toggled(_name:String, pressed:bool):
if pressed:
print("Checked label: "+ _name)
_add_tag(_name)
else:
print("Unchecked label: "+ _name)
_remove_tag(_name)
print(_tags)

Expand Down
15 changes: 14 additions & 1 deletion addons/quentincaffeino-console/src/Misc/BaseCommands.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ func _init(console):
.set_description('The maximal framerate at which the application can run.')\
.add_argument('fps', self._console.IntRangeType.new(10, 1000))\
.register()
self._console.add_command('Globals.set', self, '_set_globals_variable')\
.set_description('Set variable in Globals')\
.add_argument('property', TYPE_STRING)\
.add_argument('variable', TYPE_STRING)\
.register()
self._console.add_command('reload_scene', self, '_reload_scene')\
.set_description('Reloads scene')\
.register()


# Display help message or display description for the command.
Expand Down Expand Up @@ -102,4 +110,9 @@ func _quit():
func _change_scene(path):
self._console.Log.warn('Changing scene to ' + path + '...')
BackgroundLoad.get_node("bgload").load_scene(path)


func _reload_scene():
Globals.reload_scene()

func _set_globals_variable(property, value):
Globals.set(property, value)
5 changes: 0 additions & 5 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,6 @@ ui_up2={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
console_toggle={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":true,"control":true,"meta":false,"command":true,"pressed":false,"scancode":67,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
screen={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
Expand Down
2 changes: 1 addition & 1 deletion version.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.2.4
v1.2.5