Skip to content

Commit b1b3193

Browse files
authored
Merge pull request #83 from fenix-hub/dev
Dev
2 parents 1da8fac + 62677b7 commit b1b3193

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This plugin is now supported in [Godot Extended Library Discord](https://discord
1212
A complete GitHub integration for your Godot Editor! Manage your project without even opening your browser.
1313

1414
Author: *"Nicolo (fenix) Santilio"*
15-
Version: *1.3.6*
15+
Version: *1.3.7*
1616
Wiki: *[supported](https://github.com/fenix-hub/godot-engine.github-integration/wiki)*
1717
Godot Version: *3.2.3stable*
1818

addons/github-integration/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
name="GitHub integration"
44
description="Plugin to integrate GitHub requests directly via Godot Engine Editor"
55
author="Nicolo (fenix) Santilio"
6-
version="1.3.6"
6+
version="1.3.7"
77
script="scripts/github-integration.gd"

addons/github-integration/scripts/Commit.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func connect_signals():
116116
func request_completed(result, response_code, headers, body ):
117117
get_parent().print_debug_message("REQUEST TO API : Request exited with code %s" % response_code)
118118
if response_code == 422:
119-
get_parent().print_debug_message(str(JSON.parse(body.get_string_from_utf8()).result))
119+
get_parent().print_debug_message(JSON.parse(body.get_string_from_utf8()).result)
120120
if result == 0:
121121
match requesting:
122122
REQUESTS.UPLOAD:
@@ -209,7 +209,7 @@ func request_completed(result, response_code, headers, body ):
209209
Loading.hide()
210210

211211

212-
func load_branches(br : Array, s_r : RepositoryItem, ct : Array, gitignore : Dictionary) :
212+
func load_branches(br : Array, s_r : PanelContainer, ct : Array, gitignore : Dictionary) :
213213
_branch.clear()
214214
repo_selected = s_r._repository
215215
branches_contents = ct

addons/github-integration/scripts/Notifications.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func _on_timeout():
106106
request_notifications()
107107

108108
func request_notifications() -> void:
109-
if not PluginSettings.auto_update_notifications:
110-
return
109+
if not PluginSettings.auto_update_notifications: return
110+
if UserData.USER == {} : return
111111
get_parent().print_debug_message("loading notifications, please wait...")
112112
emit_signal("add_notifications",-get_parent().Header.notifications)
113113
RestHandler.request_invitations_list()

addons/github-integration/scripts/Repo.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var contributor_class : PackedScene = load("res://addons/github-integration/scen
6868
enum REQUESTS { REPOS = 0, GISTS = 1, UP_REPOS = 2, UP_GISTS = 3, DELETE = 4, COMMIT = 5, BRANCHES = 6, CONTENTS = 7, TREES = 8, DELETE_RESOURCE = 9, END = -1 , FILE_CONTENT = 10 ,NEW_BRANCH = 11 , PULLING = 12, COLLABORATOR = 13 }
6969
var requesting
7070

71-
var current_repo : RepositoryItem
71+
var current_repo : PanelContainer
7272
var html : String
7373
var current_branch
7474
var branches = []
@@ -146,7 +146,7 @@ func load_icons(r : Dictionary):
146146
git_lfs.set_button_icon(IconLoaderGithub.load_icon_from_name("git_lfs-gray"))
147147
add_collaborator_btn.set_button_icon(IconLoaderGithub.load_icon_from_name("add-gray"))
148148

149-
func open_repository(repository_item : RepositoryItem) -> void:
149+
func open_repository(repository_item : PanelContainer) -> void:
150150
_clear()
151151

152152
# Load repository's info ....

addons/github-integration/scripts/UserPanel.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func new_repo():
161161
RepoDialog.popup()
162162

163163
# Items clicked ...............................
164-
func repo_clicked(clicked_repo : RepositoryItem):
164+
func repo_clicked(clicked_repo : PanelContainer):
165165
for repository in repository_list:
166166
if repository!=clicked_repo:
167167
repository.deselect()
@@ -172,7 +172,7 @@ func gist_clicked(clicked_gist : GistItem):
172172
gist.deselect()
173173

174174
# Items selected ...............................
175-
func repo_selected(repository : RepositoryItem):
175+
func repo_selected(repository : PanelContainer):
176176
get_parent().print_debug_message("opening selected repository...")
177177
get_parent().loading(true)
178178
get_parent().Repo.open_repository(repository)

addons/github-integration/scripts/user_data.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var directory : String = ""
2020
var file_name : String = "user_data.ud"
2121
var avatar_name : String = "avatar"
2222

23-
var USER : Dictionary
23+
var USER : Dictionary = {}
2424

2525
# --- on the USER usage
2626
# login = username

0 commit comments

Comments
 (0)