Skip to content

Commit 183476a

Browse files
committed
fixed tween issue; added audio
1 parent 5bc20b7 commit 183476a

18 files changed

+161
-73
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
/.godot

.godot/editor/board.tscn-editstate-016b6cc70976dcc916b189cd9f2ef45a.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Anim={
88
"grid_snap_active": false,
99
"grid_step": Vector2(8, 8),
1010
"grid_visibility": 1,
11-
"ofs": Vector2(-149.4, -99.2),
11+
"ofs": Vector2(-121.8, -50),
1212
"primary_grid_step": Vector2i(8, 8),
1313
"show_edit_locks": true,
1414
"show_guides": true,
1515
"show_helpers": false,
1616
"show_origin": true,
17-
"show_rulers": true,
17+
"show_rulers": false,
1818
"show_transformation_gizmos": true,
1919
"show_viewport": true,
2020
"show_zoom_control": true,
@@ -172,4 +172,4 @@ Anim={
172172
"zfar": 4000.01,
173173
"znear": 0.05
174174
}
175-
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Board/GridContainer")])
175+
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Game/Board")])

.godot/editor/create_recent.Node

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
AudioStreamPlayer
12
AnimationPlayer

.godot/editor/editor_layout.cfg

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,23 @@ dock_filesystem_split=0
1919
dock_filesystem_display_mode=0
2020
dock_filesystem_file_sort=0
2121
dock_filesystem_file_list_display_mode=1
22-
dock_filesystem_selected_paths=PackedStringArray("res://game_board/gem_cell.tscn")
23-
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://game_board/")
22+
dock_filesystem_selected_paths=PackedStringArray("res://game_board/GemControl.gd")
23+
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://assets/audio/")
2424
dock_3="Scene,Import"
2525
dock_4="FileSystem"
2626
dock_5="Inspector,Node,History"
2727

2828
[EditorNode]
2929

3030
open_scenes=PackedStringArray("res://game.tscn", "res://game_board/board.tscn", "res://game_board/gem_cell.tscn")
31-
current_scene="res://game_board/board.tscn"
31+
current_scene="res://game.tscn"
3232
center_split_offset=0
33-
selected_default_debugger_tab_idx=0
33+
selected_default_debugger_tab_idx=1
3434
selected_main_editor_idx=2
35-
selected_bottom_panel_item=0
3635

3736
[ScriptEditor]
3837

39-
open_scripts=["res://game_board/GameBoard.gd", "res://game_board/GemCell.gd"]
38+
open_scripts=["res://game.gd", "res://game_board/GameBoard.gd", "res://game_board/GemCell.gd", "res://game_board/GemControl.gd"]
4039
selected_script="res://game_board/GameBoard.gd"
4140
open_help=[]
4241
script_split_offset=70

.godot/editor/filesystem_cache8

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
ea4bc82a6ad023ab7ee23ee620429895
2-
::res://::1714883566
2+
::res://::1714926686
33
enums.gd::GDScript::-1::1714868986::0::1::::<>Node<>::
4-
game.tscn::PackedScene::4494476846276347104::1714883267::0::1::::<><>::uid://cnlqirgwr8d4::::res://assets/bkgd/Background.png<>uid://x4qq2j3l7nvb::::res://game_board/board.tscn<>uid://b8biy2iputyhe::::res://assets/gems/characters_0002.png<>uid://duau66qew6757::::res://assets/gems/characters_0001.png<>uid://vu6oui2n7024::::res://assets/gems/characters_0003.png
4+
game.tscn::PackedScene::4494476846276347104::1714926686::0::1::::<><>::uid://cnlqirgwr8d4::::res://assets/bkgd/Background.png<>uid://x4qq2j3l7nvb::::res://game_board/board.tscn<>uid://b8biy2iputyhe::::res://assets/gems/characters_0002.png<>uid://duau66qew6757::::res://assets/gems/characters_0001.png<>uid://vu6oui2n7024::::res://assets/gems/characters_0003.png<>uid://byliae6aa6ki2::::res://assets/gems/characters_0005.png<>uid://2vrsevjv4w43::::res://assets/gems/characters_0007.png
55
icon.svg::CompressedTexture2D::674237123037169249::1714852301::1714883568::1::::<><>::
66
README.md::TextFile::-1::1714883492::0::1::::<><>::
7-
::res://assets/::1714859125
8-
::res://assets/bkgd/::1714852894
7+
::res://assets/::1714927044
8+
::res://assets/audio/::1714927906
9+
Abstract2.ogg::AudioStreamOggVorbis::8486334472280171325::1632768764::1714927911::1::::<><>::
10+
::res://assets/bkgd/::1714883568
911
Background.png::CompressedTexture2D::167911504452945903::1489279988::1714883568::1::::<><>::
1012
Cloud_2.png::CompressedTexture2D::5130556488342921064::1489280862::1714883568::1::::<><>::
11-
::res://assets/gems/::1714852658
13+
::res://assets/gems/::1714883568
1214
characters_0001.png::CompressedTexture2D::8564310276459454580::1478985474::1714883568::1::::<><>::
1315
characters_0002.png::CompressedTexture2D::4705246927696000778::1478985474::1714883568::1::::<><>::
1416
characters_0003.png::CompressedTexture2D::1517161563441159111::1478985474::1714883568::1::::<><>::
1517
characters_0004.png::CompressedTexture2D::7809842875248450197::1478985474::1714883568::1::::<><>::
1618
characters_0005.png::CompressedTexture2D::4094147080226235275::1478985474::1714883568::1::::<><>::
1719
characters_0006.png::CompressedTexture2D::4241985004615440866::1478985474::1714883568::1::::<><>::
1820
characters_0007.png::CompressedTexture2D::1939515287201889126::1478985474::1714883568::1::::<><>::
19-
::res://assets/gui/::1714859125
21+
::res://assets/gui/::1714883568
2022
ButtonText_Large_Green_Round.png::CompressedTexture2D::1962195823638088373::1678656194::1714883568::1::::<><>::
21-
::res://game_board/::1714883329
22-
board.tscn::PackedScene::1675211836451078767::1714883267::0::1::::<><>::res://game_board/GameBoard.gd<>uid://bh2knk60qbton::::res://game_board/board_square_0.tscn<>uid://cry3vnlah6fkx::::res://game_board/board_square_1.tscn
23+
::res://game_board/::1714926686
24+
board.tscn::PackedScene::1675211836451078767::1714926686::0::1::::<><>::res://game_board/GameBoard.gd<>uid://bh2knk60qbton::::res://game_board/board_square_0.tscn<>uid://cry3vnlah6fkx::::res://game_board/board_square_1.tscn
2325
board_square_0.tscn::PackedScene::2934111748047137053::1714883329::0::1::::<><>::
24-
board_square_1.tscn::PackedScene::6017335052606630439::1714883267::0::1::::<><>::
25-
GameBoard.gd::GDScript::-1::1714883259::0::1::::GameBoard<>Node2D<>::
26-
GemCell.gd::GDScript::-1::1714869038::0::1::::GemCell<>Control<>::
26+
board_square_1.tscn::PackedScene::6017335052606630439::1714884034::0::1::::<><>::
27+
GameBoard.gd::GDScript::-1::1714926531::0::1::::GameBoard<>Node2D<>::
28+
GemCell.gd::GDScript::-1::1714885145::0::1::::GemCell<>Control<>::
2729
GemControl.gd::GDScript::-1::1714868421::0::1::::GemControl<>Control<>::
28-
gem_cell.tscn::PackedScene::5556057646695183519::1714883267::0::1::::<><>::res://game_board/GemCell.gd<>uid://duau66qew6757::::res://assets/gems/characters_0001.png<>res://game_board/GemControl.gd
30+
gem_cell.tscn::PackedScene::5556057646695183519::1714926686::0::1::::<><>::res://game_board/GemCell.gd<>uid://duau66qew6757::::res://assets/gems/characters_0001.png<>res://game_board/GemControl.gd

.godot/editor/filesystem_update4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ res://game.tscn
44
res://game_board/gem_cell.tscn
55
res://game_board/GemCell.gd
66
res://game_board/GameBoard.gd
7+
res://game.gd

.godot/editor/game.tscn-editstate-609f762188a68253d349ec58c4f3a8d3.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Anim={
88
"grid_snap_active": false,
99
"grid_step": Vector2(8, 8),
1010
"grid_visibility": 1,
11-
"ofs": Vector2(-105.79, -64.6483),
11+
"ofs": Vector2(-162.841, -115.071),
1212
"primary_grid_step": Vector2i(8, 8),
1313
"show_edit_locks": true,
1414
"show_guides": true,
@@ -32,7 +32,7 @@ Anim={
3232
"snap_rotation_step": 0.261799,
3333
"snap_scale": false,
3434
"snap_scale_step": 0.1,
35-
"zoom": 0.656273
35+
"zoom": 0.610033
3636
}
3737
3D={
3838
"fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
172172
"zfar": 4000.01,
173173
"znear": 0.05
174174
}
175-
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Board/GridContainer")])
175+
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Game/Board")])

.godot/editor/game.tscn-folding-609f762188a68253d349ec58c4f3a8d3.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
node_unfolds=[NodePath("Background"), PackedStringArray("Layout"), NodePath("VboxBkgd"), PackedStringArray("Layout", "Theme Overrides", "Layout/Container Sizing", "Layout/Transform"), NodePath("VBoxContainer"), PackedStringArray("Layout", "Theme Overrides", "Layout/Transform", "Theme Overrides/constants"), NodePath("VBoxContainer/HBoxContainer1"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/constants"), NodePath("VBoxContainer/HBoxContainer1/Control"), PackedStringArray("Layout"), NodePath("VBoxContainer/HBoxContainer1/Control/Sprite2D"), PackedStringArray("Transform", "Offset"), NodePath("VBoxContainer/HBoxContainer1/Label"), PackedStringArray("Layout", "Theme Overrides"), NodePath("VBoxContainer/HBoxContainer2"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/constants"), NodePath("VBoxContainer/HBoxContainer2/Control"), PackedStringArray("Layout"), NodePath("VBoxContainer/HBoxContainer2/Control/Sprite2D"), PackedStringArray("Transform", "Offset"), NodePath("VBoxContainer/HBoxContainer2/Label"), PackedStringArray("Layout", "Theme Overrides"), NodePath("VBoxContainer/HBoxContainer3"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/constants", "Layout/Transform"), NodePath("VBoxContainer/HBoxContainer3/Control"), PackedStringArray("Layout"), NodePath("VBoxContainer/HBoxContainer3/Control/Sprite2D"), PackedStringArray("Transform", "Offset"), NodePath("VBoxContainer/HBoxContainer3/Label"), PackedStringArray("Layout", "Theme Overrides"), NodePath("Board"), PackedStringArray("Transform"), NodePath("Panel"), PackedStringArray("Visibility", "Layout", "Theme Overrides")]
44
resource_unfolds=["res://game.tscn::StyleBoxFlat_k3sk6", PackedStringArray("Resource"), "res://game.tscn::StyleBoxFlat_imdoc", PackedStringArray("Resource")]
5-
nodes_folded=[NodePath("VBoxContainer/HBoxContainer1"), NodePath("VBoxContainer/HBoxContainer1/Control"), NodePath("VBoxContainer/HBoxContainer2"), NodePath("VBoxContainer/HBoxContainer2/Control"), NodePath("VBoxContainer/HBoxContainer3"), NodePath("VBoxContainer/HBoxContainer3/Control"), NodePath("VBoxContainer/HBoxContainer4"), NodePath("VBoxContainer/HBoxContainer5")]
5+
nodes_folded=[NodePath("VBoxContainer"), NodePath("VBoxContainer/HBoxContainer1"), NodePath("VBoxContainer/HBoxContainer1/Control"), NodePath("VBoxContainer/HBoxContainer2"), NodePath("VBoxContainer/HBoxContainer2/Control"), NodePath("VBoxContainer/HBoxContainer3"), NodePath("VBoxContainer/HBoxContainer3/Control"), NodePath("VBoxContainer/HBoxContainer4"), NodePath("VBoxContainer/HBoxContainer5")]

.godot/editor/gem_cell.tscn-editstate-ecbbc07c427c1df3d80b28303bbc358d.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@ Anim={
172172
"zfar": 4000.01,
173173
"znear": 0.05
174174
}
175-
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Board/GridContainer")])
175+
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Game/Board")])

.godot/editor/project_metadata.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[editor_metadata]
22

33
executable_path="/Applications/Godot.app/Contents/MacOS/Godot"
4+
use_advanced_connections=false
45

56
[debug_options]
67

@@ -10,7 +11,7 @@ run_reload_scripts=true
1011
[recent_files]
1112

1213
scenes=["res://game_board/gem_cell.tscn", "res://game_board/board_square_1.tscn", "res://game_board/board.tscn", "res://game.tscn"]
13-
scripts=["res://game_board/GemCell.gd", "res://game_board/GameBoard.gd"]
14+
scripts=["res://game_board/GemControl.gd", "res://game.gd", "res://game_board/GemCell.gd", "res://game_board/GameBoard.gd"]
1415

1516
[linked_properties]
1617

@@ -28,3 +29,7 @@ AnimationTrackKeyEdit:value=true
2829
[dialog_bounds]
2930

3031
create_new_node=Rect2(270, 100, 900, 700)
32+
33+
[script_setup]
34+
35+
last_selected_language="GDScript"

0 commit comments

Comments
 (0)