Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .import/Add.png-bf5d734618ddee7dda3703e31724820f.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="72fc32b6ae26ed7d5bdfbbdf2dcbd025"
dest_md5="fcb44e58fea07d55d292bd8aeb47e848"

Binary file not shown.
3 changes: 3 additions & 0 deletions .import/Background.png-7391a40776e3657e5263266c671b71c8.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="cc264ecc8d1d929075d423fc41e7f3a9"
dest_md5="8ad2d1918ab8a4cdb96456c4760808e0"

Binary file not shown.
3 changes: 3 additions & 0 deletions .import/Dpad.png-c90c2f88038080a2e8830330a7d87c9f.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="ed7cf72c7a25272a6688220daa4455e5"
dest_md5="a77e7772c6fbce78d36fc9307e7f7b39"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="d4d1d8b37f6a6c24c2ea20d78169dc23"
dest_md5="6f9c9da9189c329aac0bd106c6f0a601"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="3e6e1456fcfc0d4ed381fab1ea44d686"
dest_md5="a99a2bf1d41fb78d8d0a8a7b45a55174"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="8806b0a7ba477b8c60a7de61c2a282f9"
dest_md5="f6fb9d78824b294eb731c855b043b5bd"

Binary file not shown.
3 changes: 3 additions & 0 deletions .import/Joystick.png-68312398402c9c23fc3c75ebe052ecfc.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="3d26dfa447cac50fce2b3dc3f529fc42"
dest_md5="3b55260a4b62d70f20dab9c87282c4ec"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="20779b947bbdeea50e183ed55e17b2bb"
dest_md5="d23a13705007a7eba626fd24d0af2251"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="4a9007ee448d9553423540fcb2f690f5"
dest_md5="8f4ab17bc81e899431557464a48ee230"

Binary file not shown.
3 changes: 3 additions & 0 deletions .import/Remove.png-4baa95dd1c4ac1284d7b636a19088af6.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="333840324d6e276068722cfde0bd260c"
dest_md5="4dd486988432102dac6cb8da165ad4d7"

Binary file not shown.
3 changes: 3 additions & 0 deletions .import/SSMM_Lobby.png-5557c848b3a42614b1ba4780bda08647.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="8c8ea9b193c0d7a2aa458feccbc2ae24"
dest_md5="7074fa861abc72dfadfe39aad0557e05"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="ce78ab37511f0c89a32ee1e19256cb64"
dest_md5="a6580cfb7ae812f3fcae53671f791a0e"

Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 5 additions & 5 deletions Scenes/LicenseKeyVaildator.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ __meta__ = {
[node name="Label" type="Label" parent="VBoxContainer"]
margin_right = 441.0
margin_bottom = 14.0
text = "KEY_LICENSES_ADD_NEW_KEY"
text = "Assign license key"
align = 1
valign = 1

Expand All @@ -41,15 +41,15 @@ margin_top = 18.0
margin_right = 441.0
margin_bottom = 42.0
clear_button_enabled = true
placeholder_text = "KEY_LICENSES_TYPE_LICENSE_KEY"
placeholder_text = "Type license key..."

[node name="AddKeyButton" type="Button" parent="VBoxContainer"]
margin_left = 111.0
margin_left = 193.0
margin_top = 46.0
margin_right = 329.0
margin_right = 247.0
margin_bottom = 66.0
size_flags_horizontal = 4
text = "KEY_LICENSES_ADD_LICENSE_KEY"
text = "Assign"

[node name="result" type="Label" parent="VBoxContainer"]
margin_top = 70.0
Expand Down
6 changes: 3 additions & 3 deletions Scenes/Stages/poziom_1.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ frame = 3
position = Vector2( 7952.18, 2014.06 )

[node name="MovingPlatform" parent="." instance=ExtResource( 8 )]
position = Vector2( 3548.06, 879.581 )
position = Vector2( 3724.61, 607.43 )
waypoints_path = NodePath("../Waypoints")

[node name="Waypoints" parent="." instance=ExtResource( 5 )]
Expand Down Expand Up @@ -1077,7 +1077,7 @@ position = Vector2( 1.60899, 82.6017 )
position = Vector2( 1.8043, 42.6301 )

[node name="MovingPlatform2" parent="." instance=ExtResource( 8 )]
position = Vector2( 4819.57, 310.332 )
position = Vector2( 4307.6, 341.671 )
waypoints_path = NodePath("../Waypoints2")

[node name="Waypoints2" parent="." instance=ExtResource( 5 )]
Expand Down Expand Up @@ -1129,7 +1129,7 @@ position = Vector2( -122.167, 532.46 )
position = Vector2( -126.167, 6.46002 )

[node name="MovingPlatform3" parent="." instance=ExtResource( 9 )]
position = Vector2( 5433.14, 1894.76 )
position = Vector2( 5350.02, 1472.28 )
waypoints_path = NodePath("../Waypoints3")

[node name="Waypoints3" parent="." instance=ExtResource( 5 )]
Expand Down
22 changes: 21 additions & 1 deletion Scenes/options.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ __meta__ = {
}

[node name="Graphics" type="Tabs" parent="tabs"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
Expand Down Expand Up @@ -246,7 +247,6 @@ items = [ "MONO", null, false, 0, null, "STEREO", null, false, 1, null, "QUAD",
selected = 1

[node name="Controls" type="Tabs" parent="tabs"]
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
Expand Down Expand Up @@ -316,6 +316,24 @@ __meta__ = {
"_edit_use_anchors_": false
}

[node name="AddController" type="Button" parent="tabs/Controls"]
margin_right = 207.0
margin_bottom = 54.0
text = "Add controller (App)"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="ControllerSearchLabel" type="Label" parent="tabs/Controls"]
margin_left = 3.0
margin_top = 57.0
margin_right = 210.0
margin_bottom = 76.0
text = "Ready to search for controller"
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Other" type="Tabs" parent="tabs"]
visible = false
anchor_right = 1.0
Expand Down Expand Up @@ -358,6 +376,7 @@ __meta__ = {
}

[node name="BugReportP" parent="." instance=ExtResource( 4 )]
visible = false
mouse_filter = 1

[connection signal="toggled" from="tabs/Graphics/Options/side_left/VSync" to="." method="_on_VSync_toggled"]
Expand All @@ -374,6 +393,7 @@ mouse_filter = 1
[connection signal="pressed" from="tabs/Controls/HBoxContainer/PS_Button" to="tabs/Controls" method="_on_PS_Button_pressed"]
[connection signal="pressed" from="tabs/Controls/HBoxContainer/XBOX_Button" to="tabs/Controls" method="_on_XBOX_Button_pressed"]
[connection signal="pressed" from="tabs/Controls/HBoxContainer/PC_Button" to="tabs/Controls" method="_on_PC_Button_pressed"]
[connection signal="pressed" from="tabs/Controls/AddController" to="." method="_on_AddController_pressed"]
[connection signal="toggled" from="tabs/Other/DSDK" to="." method="_on_DSDK_toggled"]
[connection signal="pressed" from="tabs/Other/BugReport" to="." method="_on_BugReport_pressed"]
[connection signal="pressed" from="SAVE" to="." method="_on_SAVE_pressed"]
35 changes: 35 additions & 0 deletions Scripts/options.gd
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@ var file = File.new()
var tr_en_fallback = [
"EN_US"
]
signal player_disconnected(player_name)

var players = {}
var mod_names = {}
#var dlc_web_avaliable = Globals.get_dlcs_avaliable()
func _ready():
# warning-ignore:return_value_discarded
GamePad.connect("gamepad_connected", self, "_on_GamePad_controller_connected")
# warning-ignore:return_value_discarded
GamePad.connect("gamepad_disconnected", self, "_on_GamePad_controller_disconnected")
$BugReportP.hide()
$tabs.set_tab_title(0, "Graphics")
$tabs.set_tab_title(1, "Audio")
Expand Down Expand Up @@ -270,3 +277,31 @@ func _on_ItemList_item_selected(index):
func _on_BugReport_pressed():
$BugReportP.show()
$BugReportP/IssuePrompt.popup_centered()


func _on_AddController_pressed():
GamePad.search_for_controllers()
$tabs/Controls/ControllerSearchLabel.text = "Searching for controller..."

func _on_GamePad_controller_connected(id):
var player_name
var values = []
for player in players:
values.append(players.get(player))

for i in range(1, 4):
var test_player = "player %s" % str(i)
if !test_player in values:
player_name = test_player
break
players[id] = player_name
$tabs/Controls/ControllerSearchLabel.text = "Controller connected!"
GamePad.stop_search_for_controllers()

func _on_GamePad_controller_disconnected(id):
print(players)
emit_signal("player_disconnected", players.get(id))
players.erase(id)
print(players)


Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/readme-font.png-5a18e7ce514435b80a15dc5058cd11c0.stex"
path="res://.import/Add.png-bf5d734618ddee7dda3703e31724820f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://readme-font.png"
dest_files=[ "res://.import/readme-font.png-5a18e7ce514435b80a15dc5058cd11c0.stex" ]
source_file="res://addons/GodotGamePad/LayoutConfiguration/AddOn_Images/Add.png"
dest_files=[ "res://.import/Add.png-bf5d734618ddee7dda3703e31724820f.stex" ]

[params]

Expand All @@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=false
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/Background.png-7391a40776e3657e5263266c671b71c8.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/GodotGamePad/LayoutConfiguration/AddOn_Images/GamePadImages/Background.png"
dest_files=[ "res://.import/Background.png-7391a40776e3657e5263266c671b71c8.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/Dpad.png-c90c2f88038080a2e8830330a7d87c9f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/GodotGamePad/LayoutConfiguration/AddOn_Images/GamePadImages/Dpad.png"
dest_files=[ "res://.import/Dpad.png-c90c2f88038080a2e8830330a7d87c9f.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/Joystick.png-68312398402c9c23fc3c75ebe052ecfc.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/GodotGamePad/LayoutConfiguration/AddOn_Images/GamePadImages/Joystick.png"
dest_files=[ "res://.import/Joystick.png-68312398402c9c23fc3c75ebe052ecfc.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/SingleButton_Unpressed.png-66addbbc9450d009d5335085b81f4ca2.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://addons/GodotGamePad/LayoutConfiguration/AddOn_Images/GamePadImages/SingleButton_Unpressed.png"
dest_files=[ "res://.import/SingleButton_Unpressed.png-66addbbc9450d009d5335085b81f4ca2.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Loading