Skip to content

Commit

Permalink
Merge pull request #18 from meoowe/fixStuff
Browse files Browse the repository at this point in the history
Fix stuff
  • Loading branch information
meoowe authored Dec 7, 2024
2 parents f08db13 + 8b07a49 commit e010354
Show file tree
Hide file tree
Showing 102 changed files with 2,876 additions and 153 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
3 changes: 3 additions & 0 deletions .godot/editor/create_recent.Node
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Label
TextureButton
LineEdit
TextEdit
CollisionShape2D
Area2D
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
20 changes: 10 additions & 10 deletions .godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ dock_split_2=0
dock_split_3=0
dock_hsplit_1=0
dock_hsplit_2=270
dock_hsplit_3=-270
dock_hsplit_3=-293
dock_hsplit_4=0
dock_filesystem_h_split_offset=240
dock_filesystem_v_split_offset=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://icon.PNG")
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://assets/", "res://assets/img/")
dock_filesystem_selected_paths=PackedStringArray()
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://assets/img/", "res://addons/")
dock_3="Scene,Import"
dock_4="FileSystem"
dock_5="Inspector,Node,History"

[EditorNode]

open_scenes=PackedStringArray("res://title.tscn", "res://game.tscn", "res://lost.tscn", "res://win.tscn")
current_scene="res://game.tscn"
open_scenes=PackedStringArray("res://title.tscn", "res://game.tscn", "res://lost.tscn", "res://win.tscn", "res://global.tscn")
current_scene="res://title.tscn"
center_split_offset=0
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
selected_default_debugger_tab_idx=1
selected_main_editor_idx=0
selected_bottom_panel_item=0

[EditorWindow]
Expand All @@ -41,9 +41,9 @@ size=Vector2i(1152, 648)

[ScriptEditor]

open_scripts=["res://scripts/balloon.gd", "res://scripts/cat.gd", "res://cat.gd"]
selected_script="res://scripts/balloon.gd"
open_help=[]
open_scripts=["res://scripts/balloon.gd", "res://scripts/cat.gd", "res://cat.gd", "res://scripts/dog.gd", "res://scripts/autoloads/Global.gd", "res://scripts/lost.gd", "res://scripts/title.gd", "res://scripts/win.gd"]
selected_script="res://scripts/title.gd"
open_help=["Node"]
script_split_offset=200
list_split_offset=0
zoom_factor=1.21429
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
143 changes: 82 additions & 61 deletions .godot/editor/filesystem_cache8

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions .godot/editor/filesystem_update4
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
res://lost.tscn
res://title.tscn
res://game.tscn
res://win.tscn
res://scripts/balloon.gd
res://cat.gd
res://scripts/autoloads/Global.gd
res://global.tscn
res://scripts/lost.gd
res://scripts/title.gd
res://scripts/win.gd
res://scripts/dog.gd
res://parallax_background.gd
res://addons/quiver_leaderboards/leaderboards.gd
res://addons/quiver_leaderboards/leaderboard_ui.gd
res://addons/quiver_leaderboards/plugin.gd
res://addons/quiver_player_accounts/player_accounts.gd
res://addons/quiver_player_accounts/plugin.gd
res://scripts/cat.gd
res://scripts/parallax_background.gd
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17792/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@9907/@VSplitContainer@9729/@HSplitContainer@9731/@HSplitContainer@9733/@Control@9734/@SubViewportContainer@9735/@SubViewport@9736/game")])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17792/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@9907/@VSplitContainer@9729/@HSplitContainer@9731/@HSplitContainer@9733/@Control@9734/@SubViewportContainer@9735/@SubViewport@9736/Control/TextureButton")])
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
[editor_states]

Anim={
"visible": false
}
2D={
"grid_offset": Vector2(0, 0),
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-165, -110),
"primary_grid_step": Vector2i(8, 8),
"show_group_gizmos": true,
"show_guides": true,
"show_helpers": false,
"show_lock_gizmos": true,
"show_origin": true,
"show_position_gizmos": true,
"show_rulers": true,
"show_transformation_gizmos": true,
"show_viewport": true,
"show_zoom_control": true,
"smart_snap_active": false,
"snap_guides": true,
"snap_node_anchors": true,
"snap_node_center": true,
"snap_node_parent": true,
"snap_node_sides": true,
"snap_other_nodes": true,
"snap_pixel": true,
"snap_relative": false,
"snap_rotation": false,
"snap_rotation_offset": 0.0,
"snap_rotation_step": 0.261799,
"snap_scale": false,
"snap_scale_step": 0.1,
"zoom": 1.0
}
3D={
"fov": 70.01,
"gizmos_status": {
"AudioListener3D": 0,
"AudioStreamPlayer3D": 0,
"CPUParticles3D": 0,
"CSGShape3D": 0,
"Camera3D": 0,
"CollisionObject3D": 0,
"CollisionPolygon3D": 0,
"CollisionShape3D": 0,
"Decal": 0,
"FogVolume": 0,
"GPUParticles3D": 0,
"GPUParticlesCollision3D": 0,
"Joint3D": 0,
"Light3D": 0,
"LightmapGI": 0,
"LightmapProbe": 0,
"Marker3D": 0,
"MeshInstance3DCustomAABB": 0,
"NavigationLink3D": 0,
"NavigationRegion3D": 0,
"OccluderInstance3D": 0,
"Path3D": 0,
"PhysicalBone3D": 0,
"RayCast3D": 0,
"ReflectionProbe": 0,
"ShapeCast3D": 0,
"Skeleton3D": 0,
"SoftBody3D": 0,
"SpringArm3D": 0,
"VehicleWheel3D": 0,
"VisibleOnScreenNotifier3D": 0,
"VoxelGI": 0
},
"local_coords": false,
"preview_sun_env": {
"environ_ao_enabled": false,
"environ_enabled": true,
"environ_energy": 1.0,
"environ_gi_enabled": false,
"environ_glow_enabled": true,
"environ_ground_color": Color(0.2, 0.169, 0.133, 1),
"environ_sky_color": Color(0.385, 0.454, 0.55, 1),
"environ_tonemap_enabled": true,
"sun_color": Color(1, 1, 1, 1),
"sun_enabled": true,
"sun_energy": 1.0,
"sun_max_distance": 100.0,
"sun_rotation": Vector2(-1.0472, 2.61799)
},
"rotate_snap": 15.0,
"scale_snap": 10.0,
"show_grid": true,
"show_origin": true,
"snap_enabled": false,
"translate_snap": 1.0,
"viewport_mode": 1,
"viewports": [{
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 22,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"grid": true,
"half_res": false,
"information": false,
"listener": true,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"transform_gizmo": true,
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 22,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"grid": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"transform_gizmo": true,
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 22,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"grid": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"transform_gizmo": true,
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}, {
"auto_orthogonal": false,
"auto_orthogonal_enabled": true,
"cinematic_preview": false,
"display_mode": 22,
"distance": 4.0,
"doppler": false,
"frame_time": false,
"gizmos": true,
"grid": true,
"half_res": false,
"information": false,
"listener": false,
"lock_rotation": false,
"orthogonal": false,
"position": Vector3(0, 0, 0),
"transform_gizmo": true,
"use_environment": false,
"view_type": 0,
"x_rotation": 0.5,
"y_rotation": -0.5
}],
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17792/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@9907/@VSplitContainer@9729/@HSplitContainer@9731/@HSplitContainer@9733/@Control@9734/@SubViewportContainer@9735/@SubViewport@9736/Control/TextureButton")])
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[folding]

node_unfolds=[]
resource_unfolds=["res://global.tscn::AudioStreamPlaylist_meubt", PackedStringArray("Resource")]
nodes_folded=[]
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[folding]

sections_unfolded=PackedStringArray()
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-165, -110),
"ofs": Vector2(-844.022, -500.715),
"primary_grid_step": Vector2i(8, 8),
"show_group_gizmos": true,
"show_guides": true,
Expand All @@ -34,7 +34,7 @@ Anim={
"snap_rotation_step": 0.261799,
"snap_scale": false,
"snap_scale_step": 0.1,
"zoom": 1.0
"zoom": 0.466507
}
3D={
"fov": 70.01,
Expand Down Expand Up @@ -183,4 +183,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17792/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@9907/@VSplitContainer@9729/@HSplitContainer@9731/@HSplitContainer@9733/@Control@9734/@SubViewportContainer@9735/@SubViewport@9736/game/balloon")])
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17792/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@EditorMainScreen@98/MainScreen/@CanvasItemEditor@9907/@VSplitContainer@9729/@HSplitContainer@9731/@HSplitContainer@9733/@Control@9734/@SubViewportContainer@9735/@SubViewport@9736/Control/TextureButton")])
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[folding]

node_unfolds=[NodePath("LostiMG"), PackedStringArray("Layout"), NodePath("Panel"), PackedStringArray("Layout", "Theme Overrides"), NodePath("Panel/VBoxContainer"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Label"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Label2"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Control"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Button"), PackedStringArray("Layout", "Textures"), NodePath("Panel/VBoxContainer/Control2"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Button2"), PackedStringArray("Layout")]
node_unfolds=[NodePath("LostiMG"), PackedStringArray("Layout"), NodePath("Panel"), PackedStringArray("Layout", "Theme Overrides"), NodePath("Panel/VBoxContainer"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Label"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Label2"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Control"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Button"), PackedStringArray("Layout", "Textures"), NodePath("Panel/VBoxContainer/Control2"), PackedStringArray("Layout"), NodePath("Panel/VBoxContainer/Button2"), PackedStringArray("Textures")]
resource_unfolds=["res://lost.tscn::StyleBoxFlat_1hoyf", PackedStringArray("Resource"), "res://lost.tscn::LabelSettings_v6w5r", PackedStringArray("Resource", "Font")]
nodes_folded=[]
8 changes: 4 additions & 4 deletions .godot/editor/project_metadata.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use_advanced_connections=false

[recent_files]

scenes=["res://title.tscn", "res://win.tscn", "res://lost.tscn", "res://game.tscn"]
scripts=["res://scripts/balloon.gd", "res://cat.gd", "res://scripts/cat.gd"]
scenes=["res://global.tscn", "res://title.tscn", "res://win.tscn", "res://lost.tscn", "res://game.tscn"]
scripts=["res://addons/addons/godot_firebase_lite/plugin.gd", "res://addons/godot-firebase/firebase/firebase.gd", "res://addons/godot-firebase/README.md", "res://scripts/dog.gd", "Node", "res://scripts/win.gd", "res://scripts/title.gd", "res://scripts/lost.gd", "res://scripts/autoloads/Global.gd", "res://scripts/balloon.gd"]

[dialog_bounds]

project_settings=Rect2(360, 190, 1200, 700)
project_settings=Rect2(671, 264, 1200, 700)
export=Rect2(510, 290, 900, 543)
editor_settings=Rect2(510, 190, 900, 700)
create_new_node=Rect2(510, 190, 900, 700)
Expand All @@ -26,4 +26,4 @@ last_selected_language="GDScript"

[export_options]

default_filename="ClickyCat-2.0.0"
default_filename="index"
3 changes: 2 additions & 1 deletion .godot/editor/recent_dirs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
C:/Users/Aarav/Documents/games/ClickyCat2/builds/linux
C:/Users/Aarav/Documents/games/ClickyCat2/builds/web
res://addons
C:/Users/Aarav/Documents/games/ClickyCat2/builds/linux
C:/Users/Aarav/Documents/games/ClickyCat2/builds/windows
res://
C:/Users/Aarav/Documents
Loading

0 comments on commit e010354

Please sign in to comment.