Full touchscreen support

Author: danielzting

CREDITS.md

@@ -10,5 +10,8 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # [FreeType](https://www.freetype.org)
-Portions of this software are copyright © 2019 The FreeType
-Project (www.freetype.org). All rights reserved.
+Portions of this software are copyright © 2019 The FreeType Project (www.freetype.org). All rights reserved.
+
+# [Hack](https://github.com/source-foundry/Hack)
+
+The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License

assets/theme.theme

@@ -33,8 +33,6 @@ func _input(event):
     if event is InputEventKey and event.is_pressed():
         return next(event.as_text())
     if event is InputEventMouseButton and event.is_pressed():
-        print(event.position)
-        print(get_viewport().size)
         if event.position.x < ProjectSettings.get_setting("display/window/size/width") / 2:
             return next("Left")
         else:

levels/comparison_sort.gd

@@ -173,41 +173,6 @@ ui_down={
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
-faster={
-"deadzone": 0.5,
-"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":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
-slower={
-"deadzone": 0.5,
-"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":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
-bigger={
-"deadzone": 0.5,
-"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)
- ]
-}
-smaller={
-"deadzone": 0.5,
-"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":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
-toggle_sound={
-"deadzone": 0.5,
-"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":77,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
-change_data={
-"deadzone": 0.5,
-"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":67,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
-big_preview={
-"deadzone": 0.5,
-"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":66,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
 
 [rendering]
 

project.godot

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://assets/theme.theme" type="Theme" id=1]
 [ext_resource path="res://scripts/credits.gd" type="Script" id=2]
+[ext_resource path="res://scripts/border.gd" type="Script" id=3]
 
 [node name="MarginContainer" type="MarginContainer"]
 anchor_right = 1.0
@@ -11,15 +12,19 @@ custom_constants/margin_right = 40
 custom_constants/margin_top = 30
 custom_constants/margin_left = 40
 custom_constants/margin_bottom = 30
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
-[node name="Credits" type="Label" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="."]
 margin_left = 40.0
 margin_top = 30.0
-margin_right = 1880.0
-margin_bottom = 1050.0
+margin_right = 1240.0
+margin_bottom = 690.0
+script = ExtResource( 3 )
+
+[node name="Credits" type="Label" parent="MarginContainer"]
+margin_left = 20.0
+margin_top = 20.0
+margin_right = 1180.0
+margin_bottom = 640.0
 size_flags_vertical = 3
 autowrap = true
 script = ExtResource( 2 )

scenes/credits.tscn

@@ -27,28 +27,43 @@ margin_top = 20.0
 margin_right = 1220.0
 margin_bottom = 39.0
 
+[node name="Back" type="Button" parent="Levels/NamesContainer/Names"]
+margin_right = 170.0
+margin_bottom = 19.0
+text = "BACK TO MAIN MENU"
+
 [node name="Previous" type="Button" parent="Levels/NamesContainer/Names"]
-margin_right = 557.0
+margin_left = 178.0
+margin_right = 562.0
 margin_bottom = 19.0
 size_flags_horizontal = 3
 text = "<--"
-align = 0
+align = 2
 
 [node name="Current" type="Button" parent="Levels/NamesContainer/Names"]
-margin_left = 565.0
-margin_right = 635.0
+margin_left = 570.0
+margin_right = 640.0
 margin_bottom = 19.0
 focus_neighbour_left = NodePath(".")
+focus_neighbour_top = NodePath("../BigPicture")
 focus_neighbour_right = NodePath(".")
 text = "CURRENT"
 
 [node name="Next" type="Button" parent="Levels/NamesContainer/Names"]
-margin_left = 643.0
-margin_right = 1200.0
+margin_left = 648.0
+margin_right = 1032.0
 margin_bottom = 19.0
 size_flags_horizontal = 3
 text = "-->"
-align = 2
+align = 0
+
+[node name="BigPicture" type="Button" parent="Levels/NamesContainer/Names"]
+margin_left = 1040.0
+margin_right = 1200.0
+margin_bottom = 19.0
+focus_neighbour_top = NodePath("../../../Level/Right/Info/ScoresContainer/Scores/Controls/Faster")
+focus_neighbour_bottom = NodePath("../Current")
+text = "BIG PICTURE MODE"
 
 [node name="Level" type="HBoxContainer" parent="Levels"]
 margin_top = 67.0
@@ -84,16 +99,16 @@ size_flags_horizontal = 3
 
 [node name="Display" type="MarginContainer" parent="Levels/Level/Right"]
 margin_right = 616.0
-margin_bottom = 475.0
+margin_bottom = 477.0
 size_flags_vertical = 3
 script = ExtResource( 3 )
 
 [node name="TypesContainer" type="MarginContainer" parent="Levels/Level/Right/Display"]
 visible = false
 margin_left = 288.0
-margin_top = 217.0
+margin_top = 218.0
 margin_right = 328.0
-margin_bottom = 257.0
+margin_bottom = 258.0
 size_flags_horizontal = 4
 size_flags_vertical = 4
 script = ExtResource( 3 )
@@ -102,16 +117,16 @@ script = ExtResource( 3 )
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 596.0
-margin_bottom = 455.0
+margin_bottom = 457.0
 
 [node name="Info" type="HBoxContainer" parent="Levels/Level/Right"]
-margin_top = 483.0
+margin_top = 485.0
 margin_right = 616.0
 margin_bottom = 613.0
 
 [node name="ControlsContainer" type="MarginContainer" parent="Levels/Level/Right/Info"]
 margin_right = 405.0
-margin_bottom = 130.0
+margin_bottom = 128.0
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 2.0
 script = ExtResource( 3 )
@@ -120,64 +135,113 @@ script = ExtResource( 3 )
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 385.0
-margin_bottom = 110.0
+margin_bottom = 108.0
 size_flags_vertical = 1
 text = "These are the controls for the level."
 autowrap = true
 
 [node name="ScoresContainer" type="MarginContainer" parent="Levels/Level/Right/Info"]
 margin_left = 413.0
 margin_right = 616.0
-margin_bottom = 130.0
+margin_bottom = 128.0
 size_flags_horizontal = 3
 script = ExtResource( 3 )
 
 [node name="Scores" type="VBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer"]
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 183.0
-margin_bottom = 110.0
+margin_bottom = 108.0
+custom_constants/separation = 4
 
-[node name="Header" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+[node name="Easy" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
 margin_right = 163.0
 margin_bottom = 19.0
 
-[node name="Size" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Header"]
-margin_right = 40.0
+[node name="Button" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Easy"]
+margin_right = 125.0
 margin_bottom = 19.0
-text = "SIZE"
+size_flags_horizontal = 3
+text = "EASY"
+align = 0
 
-[node name="Time" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Header"]
-margin_left = 48.0
+[node name="Time" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Easy"]
+margin_left = 133.0
 margin_right = 163.0
 margin_bottom = 19.0
-size_flags_horizontal = 3
-text = "HIGH SCORE"
+text = "INF"
 align = 2
+uppercase = true
 
-[node name="Data" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
-margin_top = 27.0
+[node name="Medium" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+margin_top = 23.0
 margin_right = 163.0
-margin_bottom = 90.0
+margin_bottom = 42.0
 
-[node name="Sizes" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Data"]
-margin_right = 20.0
-margin_bottom = 63.0
-text = "16
-32
-64"
+[node name="Button" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Medium"]
+margin_right = 125.0
+margin_bottom = 19.0
+size_flags_horizontal = 3
+text = "MEDIUM"
+align = 0
+
+[node name="Time" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Medium"]
+margin_left = 133.0
+margin_right = 163.0
+margin_bottom = 19.0
+text = "INF"
+align = 2
+uppercase = true
 
-[node name="Times" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Data"]
-margin_left = 28.0
+[node name="Hard" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+margin_top = 46.0
 margin_right = 163.0
-margin_bottom = 63.0
+margin_bottom = 65.0
+
+[node name="Button" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Hard"]
+margin_right = 125.0
+margin_bottom = 19.0
 size_flags_horizontal = 3
-text = "INF
-INF
-INF"
+text = "HARD"
+align = 0
+
+[node name="Time" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Hard"]
+margin_left = 133.0
+margin_right = 163.0
+margin_bottom = 19.0
+text = "INF"
 align = 2
 uppercase = true
 
+[node name="Controls" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+margin_top = 69.0
+margin_right = 163.0
+margin_bottom = 88.0
+
+[node name="Custom" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Controls"]
+margin_right = 107.0
+margin_bottom = 19.0
+focus_neighbour_bottom = NodePath("../Slower")
+size_flags_horizontal = 3
+text = "CUSTOM..."
+align = 0
+
+[node name="Slower" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Controls"]
+margin_left = 115.0
+margin_right = 135.0
+margin_bottom = 19.0
+focus_neighbour_top = NodePath("../Custom")
+focus_neighbour_bottom = NodePath("../Faster")
+text = "<<"
+
+[node name="Faster" type="Button" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Controls"]
+margin_left = 143.0
+margin_right = 163.0
+margin_bottom = 19.0
+focus_neighbour_top = NodePath("../Slower")
+focus_neighbour_bottom = NodePath("../../../../../../../NamesContainer/Names/BigPicture")
+text = ">>"
+
 [node name="BigDisplay" type="MarginContainer" parent="Levels"]
 visible = false
 margin_top = 640.0
@@ -203,7 +267,12 @@ margin_bottom = 20.0
 
 [node name="Timer" type="Timer" parent="Levels"]
 
+[connection signal="pressed" from="Levels/NamesContainer/Names/Back" to="Levels" method="_on_Back_pressed"]
 [connection signal="pressed" from="Levels/NamesContainer/Names/Previous" to="Levels" method="_on_Previous_pressed"]
 [connection signal="pressed" from="Levels/NamesContainer/Names/Current" to="Levels" method="_on_Current_pressed"]
 [connection signal="pressed" from="Levels/NamesContainer/Names/Next" to="Levels" method="_on_Next_pressed"]
+[connection signal="pressed" from="Levels/NamesContainer/Names/BigPicture" to="Levels" method="_on_BigPicture_pressed"]
+[connection signal="pressed" from="Levels/Level/Right/Info/ScoresContainer/Scores/Controls/Custom" to="Levels" method="_on_Custom_pressed"]
+[connection signal="pressed" from="Levels/Level/Right/Info/ScoresContainer/Scores/Controls/Slower" to="Levels" method="_on_Slower_pressed"]
+[connection signal="pressed" from="Levels/Level/Right/Info/ScoresContainer/Scores/Controls/Faster" to="Levels" method="_on_Faster_pressed"]
 [connection signal="timeout" from="Levels/Timer" to="Levels" method="_on_Timer_timeout"]