Skip to content

Commit

Permalink
Patched android buttons not working
Browse files Browse the repository at this point in the history
  • Loading branch information
Killarexe committed Mar 12, 2023
1 parent c31f516 commit de476d3
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dock_5="Inspector,Node,History"

[EditorNode]

open_scenes=["res://scenes/levels/Level3.tscn"]
open_scenes=["res://scenes/levels/Level3.tscn", "res://scenes/prefabs/Player.tscn"]

[ScriptEditor]

Expand Down
34 changes: 17 additions & 17 deletions .godot/editor/filesystem_cache8
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bdbec74c6e5bd72edee867077d70896c
::res://::1678614119
default.tres::Theme::1063717133397856404::1678612382::0::1::::<><>::uid://dunc4gowcia1p
default_env.tres::Environment::7813324438461089486::1678614101::0::1::::<><>::
export_presets.cfg::TextFile::-1::1678525106::0::1::::<><>::
::res://::1678635536
default.tres::Theme::1063717133397856404::1678614151::0::1::::<><>::uid://dunc4gowcia1p
default_env.tres::Environment::7813324438461089486::1678634728::0::1::::<><>::
export_presets.cfg::TextFile::-1::1678634843::0::1::::<><>::
icon.png::CompressedTexture2D::3461950123066172032::1678285723::1678379965::1::::<><>::
icon_app.png::CompressedTexture2D::2215021175812661223::1678285723::1678379965::1::::<><>::
README.md::TextFile::-1::1678515721::0::1::::<><>::
Expand All @@ -14,7 +14,7 @@ search_label_animation.tres::Animation::-1::1678379931::0::1::::<><>::
splash_animation.tres::Animation::868450821512284263::1678388653::0::1::::<><>::
::res://build/::1677925984
::res://build/0.2a/::1677925533
::res://build/0.2a/android/::1678302291
::res://build/0.2a/android/::1678634839
::res://build/0.2a/linux/::1678301909
::res://build/0.2a/mac/::1678301932
::res://build/0.2a/web/::1678379969
Expand All @@ -30,10 +30,10 @@ pixel.ttf::FontFile::8590049394421432867::1677927495::1678388744::1::::<><>::
MusicPlayer.tscn::PackedScene::-1::1678379932::0::1::::<><>::
Overlay.tscn::PackedScene::5040028286695072001::1678476137::0::1::::<><>::uid://bjlm2webjkkfy
SceneTransition.tscn::PackedScene::1451279911353395603::1678524056::0::1::::<><>::res://scripts/ui/SceneTransition.gd
::res://scenes/levels/::1678614101
::res://scenes/levels/::1678634728
Level1.tscn::PackedScene::8000133984461168572::1678532349::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level2.tscn::PackedScene::8298672502516304725::1678614101::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level3.tscn::PackedScene::4918580571173344612::1678532350::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level2.tscn::PackedScene::8298672502516304725::1678616806::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level3.tscn::PackedScene::4918580571173344612::1678634728::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level4.tscn::PackedScene::8865472497228479479::1678518298::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level5.tscn::PackedScene::3077264793613026219::1678518326::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Level6.tscn::PackedScene::8104888663928668837::1678518322::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
Expand All @@ -45,20 +45,20 @@ Player.tscn::PackedScene::6357127384744182778::1678524211::0::1::::<><>::res://s
PoofParticle.tscn::PackedScene::8855095273391286233::1678479248::0::1::::<><>::
PrefabLevel.tscn::PackedScene::5201531443946129327::1678532053::0::1::::<><>::res://scripts/level/Level.gd<>uid://dcovkjpnowgl0
WinMenu.tscn::PackedScene::6308187310218653749::1678521460::0::1::::<><>::res://scripts/ui/WinMenu.gd<>uid://pfjjbicdjjbw
::res://scenes/ui/::1678613309
::res://scenes/ui/::1678615055
LevelEditor.tscn::PackedScene::-1::1678379932::0::1::::<><>::res://scripts/ui/Cursor.gd<>res://scenes/prefabs/Editor.tscn
LevelSelector.tscn::PackedScene::1968285503987442824::1678476137::0::1::::<><>::res://scripts/ui/LevelSelector.gd<>uid://pfjjbicdjjbw
MainMenu.tscn::PackedScene::2279081321951140711::1678613189::0::1::::<><>::res://scripts/ui/MainMenu.gd<>res://scripts/level/Level.gd<>uid://dcovkjpnowgl0<>uid://pfjjbicdjjbw<>uid://biadbjy7od47x<>uid://cwogeqa0fq21u
MainMenu.tscn::PackedScene::2279081321951140711::1678615055::0::1::::<><>::res://scripts/ui/MainMenu.gd<>res://scripts/level/Level.gd<>uid://dcovkjpnowgl0<>uid://pfjjbicdjjbw<>uid://biadbjy7od47x<>uid://cwogeqa0fq21u
PauseMenu.tscn::PackedScene::3789020859650093719::1678613309::0::1::::<><>::res://scripts/ui/PauseMenu.gd<>uid://pfjjbicdjjbw
Settings.tscn::PackedScene::-1::1678379932::0::1::::<><>::res://default.tres<>res://scripts/ui/Settings.gd
SkinShop.tscn::PackedScene::-1::1678379932::0::1::::<><>::res://fonts/default.tres<>res://textures/skins/player.png<>res://scripts/ui/SkinShop.gd
::res://scripts/::1678531510
Global.gd::GDScript::-1::1678531510::0::1::::<>Node<>::
::res://scripts/::1678634694
Global.gd::GDScript::-1::1678634694::0::1::::<>Node<>::
::res://scripts/discord/::1677479976
::res://scripts/level/::1678614098
Level.gd::GDScript::-1::1678531259::0::1::::<>Node2D<>::
::res://scripts/level/::1678634528
Level.gd::GDScript::-1::1678614350::0::1::::<>Node2D<>::
LevelGen.gd::GDScript::-1::1678517443::0::1::::<>Node2D<>::
Player.gd::GDScript::-1::1678614098::0::1::::<>CharacterBody2D<>::
Player.gd::GDScript::-1::1678634528::0::1::::<>CharacterBody2D<>::
PowerUp.gd::GDScript::-1::1678379931::0::1::::<>RefCounted<>::
::res://scripts/multiplayer/::1669917568
::res://scripts/multiplayer/local/::1670263781
Expand Down Expand Up @@ -88,10 +88,10 @@ die.wav::AudioStreamWAV::4257110969695159808::1616188415::1678379972::1::::<><>:
finish.wav::AudioStreamWAV::8119490121965849391::1616188470::1678379972::1::::<><>::
jump.wav::AudioStreamWAV::5237369258576183326::1616188404::1678379972::1::::<><>::
select.wav::AudioStreamWAV::1931839756275814664::1616188534::1678379972::1::::<><>::
::res://textures/::1678614102
::res://textures/::1678614191
light.png::CompressedTexture2D::454131877229240539::1649849404::1678379962::1::::<><>::
Tiles.png::CompressedTexture2D::6700578509420462745::1678614078::1678614082::1::::<><>::
Tilesets.tres::TileSet::7329834438191808279::1678614102::0::1::::<><>::uid://c2p2sw0f5k3xl
Tilesets.tres::TileSet::7329834438191808279::1678614191::0::1::::<><>::uid://c2p2sw0f5k3xl
::res://textures/skins/::1678384563
player.png::CompressedTexture2D::6172522353715128398::1625998559::1678384525::1::::<><>::
playerexe.png::CompressedTexture2D::6242635052509653997::1625998582::1678384532::1::::<><>::
Expand Down
7 changes: 1 addition & 6 deletions .godot/editor/filesystem_update4
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
res://default_env.tres
res://scenes/levels/Level2.tscn
res://scenes/prefabs/Player.tscn
res://textures/Tilesets.tres
res://default.tres
res://scripts/Global.gd
res://scripts/level/Level.gd
res://scripts/level/Player.gd
res://scenes/ui/MainMenu.tscn
res://scenes/levels/Level3.tscn
2 changes: 1 addition & 1 deletion .godot/editor/project_metadata.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ run_reload_scripts=true

[recent_files]

scenes=["res://scenes/levels/Level2.tscn", "res://scenes/levels/Level3.tscn", "res://scenes/ui/MainMenu.tscn", "res://scenes/ui/PauseMenu.tscn", "res://scenes/prefabs/Player.tscn", "res://scenes/prefabs/PrefabLevel.tscn", "res://scenes/levels/Level1.tscn", "res://scenes/instances/SceneTransition.tscn", "res://scenes/prefabs/WinMenu.tscn", "res://scenes/levels/Level6.tscn"]
scenes=["res://scenes/prefabs/Player.tscn", "res://scenes/levels/Level3.tscn", "res://scenes/levels/Level2.tscn", "res://scenes/ui/MainMenu.tscn", "res://scenes/ui/PauseMenu.tscn", "res://scenes/prefabs/PrefabLevel.tscn", "res://scenes/levels/Level1.tscn", "res://scenes/instances/SceneTransition.tscn", "res://scenes/prefabs/WinMenu.tscn", "res://scenes/levels/Level6.tscn"]
scripts=["TileMap", "CharacterBody2D", "Dictionary", "Node", "res://scripts/level/LevelGen.gd", "res://scripts/level/LevelMap.gd", "res://README.md", "res://scripts/ui/WinMenu.gd", "res://scripts/ui/Settings.gd", "res://scripts/ui/SkinShop.gd"]

[dialog_bounds]
Expand Down
4 changes: 2 additions & 2 deletions .godot/editor/script_editor_cache.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 23,
"scroll_position": 4.0,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 5,
"selection_from_line": 23,
Expand All @@ -53,7 +53,7 @@ state={
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 65,
"scroll_position": 49.0,
"scroll_position": 88.5,
"selection": false,
"syntax_highlighter": "GDScript"
}
Expand Down
10 changes: 2 additions & 8 deletions scenes/prefabs/Player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Script" path="res://scripts/level/Player.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://ct7asn2gaf03k" path="res://textures/skins/player.png" id="2"]
[ext_resource type="PackedScene" path="res://scenes/ui/PauseMenu.tscn" id="3"]
[ext_resource type="PackedScene" uid="uid://bt8ovcxrwq832" path="res://scenes/ui/PauseMenu.tscn" id="3"]
[ext_resource type="Texture2D" uid="uid://cmhgpoqfmqr74" path="res://textures/uis/pause.png" id="4"]
[ext_resource type="Texture2D" uid="uid://cx3f83u0o6e0r" path="res://textures/uis/right.png" id="6_rs64t"]
[ext_resource type="Texture2D" uid="uid://bgp7ryii753ys" path="res://textures/uis/left.png" id="7_u6isg"]
Expand Down Expand Up @@ -45,10 +45,6 @@ position_smoothing_enabled = true
[node name="GUI" type="CanvasLayer" parent="."]

[node name="PauseMenu" parent="GUI" instance=ExtResource("3")]
layout_mode = 3
anchors_preset = 15
grow_horizontal = 2
grow_vertical = 2

[node name="DeathCount" type="Label" parent="GUI"]
offset_right = 896.0
Expand All @@ -69,7 +65,6 @@ wait_time = 0.01
autostart = true

[node name="PauseButton" type="TextureButton" parent="GUI"]
process_mode = 2
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
Expand All @@ -78,17 +73,16 @@ offset_right = -80.0
offset_bottom = 40.0
scale = Vector2(3, 3)
texture_normal = ExtResource("4")
stretch_mode = 0

[node name="RightButton" type="TouchScreenButton" parent="GUI"]
process_mode = 2
position = Vector2(216, 870)
scale = Vector2(13, 13)
texture_normal = ExtResource("6_rs64t")
shape = SubResource("4")
passby_press = true

[node name="LeftButton" type="TouchScreenButton" parent="GUI"]
process_mode = 2
position = Vector2(0, 870)
scale = Vector2(13, 13)
texture_normal = ExtResource("7_u6isg")
Expand Down

0 comments on commit de476d3

Please sign in to comment.