Merge pull request 'Resolve Conflicts' (#10) from dev-scene into dev-base

Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/10

.gitignore

@@ -1,2 +1,2 @@
 # Godot 4+ specific ignores
-.godot/
+.godot/**/*

.godot/editor/Test Scene.tscn-editstate-ebd81eb396e06c86f5fc85ab4bc2adc3.cfg

@@ -1,170 +0,0 @@
-[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(91.207, -8.80316),
-"primary_grid_steps": 8,
-"show_edit_locks": true,
-"show_guides": true,
-"show_helpers": false,
-"show_origin": 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": 2.66968
-}
-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,
-"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": 20,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"half_res": false,
-"information": false,
-"listener": true,
-"position": Vector3(0, 0, 0),
-"use_environment": false,
-"use_orthogonal": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 20,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"position": Vector3(0, 0, 0),
-"use_environment": false,
-"use_orthogonal": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 20,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"position": Vector3(0, 0, 0),
-"use_environment": false,
-"use_orthogonal": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 20,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"position": Vector3(0, 0, 0),
-"use_environment": false,
-"use_orthogonal": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}],
-"zfar": 4000.01,
-"znear": 0.05
-}

.godot/editor/Test Scene.tscn-folding-ebd81eb396e06c86f5fc85ab4bc2adc3.cfg

@@ -1,5 +0,0 @@
-[folding]
-
-node_unfolds=[]
-resource_unfolds=[]
-nodes_folded=[]

.godot/editor/Utres.tres-folding-a67111dcf35afa186d352bcd7fe05f34.cfg

@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()

.godot/editor/colony.tres-folding-a961a20b7d093312f2d20b9794d6303f.cfg

@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray("terrain_set__array", "terrain_set_0/terrain__array", "Resource", "custom_data_layer__array", "Rendering", "physics_layer__array")

.godot/editor/create_recent.Node

@@ -1 +0,0 @@
-TileMap

.godot/editor/create_recent.Resource

@@ -1 +0,0 @@
-TileSet

.godot/editor/editor_layout.cfg

@@ -1,26 +0,0 @@
-[docks]
-
-dock_filesystem_split=0
-dock_filesystem_display_mode=0
-dock_filesystem_file_sort=0
-dock_filesystem_file_list_display_mode=1
-dock_split_2=0
-dock_split_3=0
-dock_hsplit_1=0
-dock_hsplit_2=462
-dock_hsplit_3=-306
-dock_hsplit_4=0
-dock_3="Scene,Import"
-dock_4="FileSystem"
-dock_5="Inspector,Node,History"
-
-[EditorNode]
-
-open_scenes=["res://Scenes/Test Scene.tscn"]
-
-[ScriptEditor]
-
-open_scripts=[]
-open_help=[]
-script_split_offset=70
-list_split_offset=0

.godot/editor/filesystem_cache8

@@ -1,15 +0,0 @@
-0b7126e0c6e86d3ec295a72f5aa6e0bd
-::res://::1675163851
-default_env.tres::Environment::-1::1675162542::0::1::::<><>::
-README.md::TextFile::-1::1675151959::0::1::::<><>::
-::res://Assets/::1675151972
-::res://Assets/Sounds/::1675151972
-::res://Assets/Textures/::1675151972
-::res://Assets/Textures/Tilesets/::1675163491
-colony-db32.png::CompressedTexture2D::4404450484946637002::1675151972::1675163491::1::::<><>::
-colony.png::CompressedTexture2D::1480709910974171110::1675151972::1675163462::1::::<><>::
-::res://Assets/Tilesets/::1675163543
-colony.tres::TileSet::2791284901075920162::1675163543::0::1::::<><>::uid://vdjct0e80o51
-::res://Scenes/::1675163662
-Test Scene.tscn::PackedScene::1781344238643980781::1675163662::0::1::::<><>::uid://bf1eb4aogv8ru
-::res://Scripts/::1675162112

.godot/editor/filesystem_update4

@@ -1,2 +0,0 @@
-res://Scenes/Test Scene.tscn
-res://Assets/Tilesets/colony.tres

.godot/editor/project_metadata.cfg

@@ -1,21 +0,0 @@
-[editor_metadata]
-
-executable_path="/home/snoweuph/Downloads/Godot_v4.0-beta16_linux.x86_64"
-tile_source_sort=0
-
-[debug_options]
-
-run_live_debug=true
-run_reload_scripts=true
-
-[recent_files]
-
-scenes=["res://Scenes/Test Scene.tscn"]
-
-[color_picker]
-
-recent_presets=PackedColorArray(0.127554, 0.218971, 1, 1, 0, 0.382973, 0.721358, 1)
-
-[dialog_bounds]
-
-project_settings=Rect2(2434, 194, 900, 700)

.godot/editor/recent_dirs

@@ -1 +0,0 @@
-res://Assets/Tilesets/

.import/colony-db32.png-15441baa6f893f3d7ac9b44cad974223.md5

@@ -1,3 +1,3 @@
 source_md5="10ed520358153267dfc60bf74dd09ce5"
-dest_md5="c6360548508cdfe23051f001f0f6cea1"
+dest_md5="ef87b1b2e8d74065d19c8269155ef51a"
 

.import/colony.png-7e0f1c6e1f6ff8cbe6d6c840c822d3ba.md5

@@ -1,3 +1,3 @@
 source_md5="6eb78fe9767b4eba970e5e746fc22670"
-dest_md5="bc16d0d39e98b04f379f5debbf25e9ad"
+dest_md5="5bd7f492aa4701dde1ee2965b1d4897c"
 

.import/icon.png-a76b18217fa0a2958f4bbbc97d2a6070.md5

@@ -0,0 +1,3 @@
+source_md5="f2378d583d8e011487f50b3f6e434c55"
+dest_md5="d1875ea8b9cb6586a76da23ca3297804"
+