From 8a3d5b33f4d255a82c09c631cfa238338dbfb90f Mon Sep 17 00:00:00 2001 From: Dustin Date: Mon, 31 Mar 2025 09:48:08 -0700 Subject: [PATCH] Damn sync conflict files from android. --- ...sync-conflict-20250330-220824-MOVV2HN.tscn | 17 - ...ync-conflict-20250330-220824-MOVV2HN.godot | 292 ------------------ 2 files changed, 309 deletions(-) delete mode 100644 Main.sync-conflict-20250330-220824-MOVV2HN.tscn delete mode 100644 project.sync-conflict-20250330-220824-MOVV2HN.godot diff --git a/Main.sync-conflict-20250330-220824-MOVV2HN.tscn b/Main.sync-conflict-20250330-220824-MOVV2HN.tscn deleted file mode 100644 index cd5f3d1..0000000 --- a/Main.sync-conflict-20250330-220824-MOVV2HN.tscn +++ /dev/null @@ -1,17 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://src/actors/players/playerE/PlayerE.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/levels/TestBox.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/ui/HUD.tscn" type="PackedScene" id=3] - -[node name="Main" type="Node2D"] - -[node name="TestBox" parent="." instance=ExtResource( 2 )] -__meta__ = { -"_edit_lock_": true -} - -[node name="PlayerE" parent="." instance=ExtResource( 1 )] -position = Vector2( 112, 56 ) - -[node name="UI_Layer" parent="." instance=ExtResource( 3 )] diff --git a/project.sync-conflict-20250330-220824-MOVV2HN.godot b/project.sync-conflict-20250330-220824-MOVV2HN.godot deleted file mode 100644 index ac65692..0000000 --- a/project.sync-conflict-20250330-220824-MOVV2HN.godot +++ /dev/null @@ -1,292 +0,0 @@ -; Engine configuration file. -; It's best edited using the editor UI and not directly, -; since the parameters that go here are not all obvious. -; -; Format: -; [section] ; section goes between [] -; param=value ; assign values to parameters - -config_version=4 - -_global_script_classes=[ { -"base": "KinematicBody2D", -"class": "Actor", -"language": "GDScript", -"path": "res://lib/classes/actor.gd" -}, { -"base": "AnimatedSprite", -"class": "AnimatedSprite_StateReceiver", -"language": "GDScript", -"path": "res://lib/classes/animated_sprite_state_receiver.gd" -}, { -"base": "Reference", -"class": "DEPR_ModifierProperties", -"language": "GDScript", -"path": "res://lib/classes/DEPR_state_modifier_properties.gd" -}, { -"base": "Reference", -"class": "DumbOldStateModifier", -"language": "GDScript", -"path": "res://lib/classes/DEPR_state_modifier.gd" -}, { -"base": "", -"class": "GitAPI", -"language": "NativeScript", -"path": "res://addons/godot-git-plugin/git_api.gdns" -}, { -"base": "Node", -"class": "HealthComponent", -"language": "GDScript", -"path": "res://lib/components/Health_Component.gd" -}, { -"base": "Interactable", -"class": "HealthPickup", -"language": "GDScript", -"path": "res://src/Interactables/HealthPickup.gd" -}, { -"base": "Area2D", -"class": "Interactable", -"language": "GDScript", -"path": "res://lib/templates/Interactable/Interactable_Component.gd" -}, { -"base": "Node2D", -"class": "Interactable_Receiver", -"language": "GDScript", -"path": "res://lib/templates/Interactable/Interactable_Receiver.gd" -}, { -"base": "Node2D", -"class": "Level", -"language": "GDScript", -"path": "res://src/classes/Level.gd" -}, { -"base": "Node2D", -"class": "Modifier_Receiver", -"language": "GDScript", -"path": "res://lib/components/Modifier_Receiver.gd" -}, { -"base": "Node", -"class": "MovementComponent", -"language": "GDScript", -"path": "res://src/classes/movement_component.gd" -}, { -"base": "Node", -"class": "Movement_StateReceiver", -"language": "GDScript", -"path": "res://lib/classes/movement_state_receiver.gd" -}, { -"base": "Resource", -"class": "State", -"language": "GDScript", -"path": "res://lib/classes/state.gd" -}, { -"base": "State", -"class": "StateAnimatedActor", -"language": "GDScript", -"path": "res://lib/classes/state_animated_actor.gd" -}, { -"base": "Node", -"class": "StateMachine", -"language": "GDScript", -"path": "res://lib/classes/state_machine.gd" -}, { -"base": "StateMachine", -"class": "StateMachineAnimatedActor", -"language": "GDScript", -"path": "res://lib/classes/state_machine_animated_actor.gd" -}, { -"base": "Reference", -"class": "StateModifier", -"language": "GDScript", -"path": "res://lib/classes/state_modifier.gd" -}, { -"base": "StateModifier", -"class": "StateModifierAnimatedActor", -"language": "GDScript", -"path": "res://lib/classes/state_modifier_animation.gd" -}, { -"base": "CanvasLayer", -"class": "UIComponent", -"language": "GDScript", -"path": "res://src/ui/HUD.gd" -} ] -_global_script_class_icons={ -"Actor": "", -"AnimatedSprite_StateReceiver": "", -"DEPR_ModifierProperties": "", -"DumbOldStateModifier": "", -"GitAPI": "", -"HealthComponent": "", -"HealthPickup": "", -"Interactable": "", -"Interactable_Receiver": "", -"Level": "", -"Modifier_Receiver": "", -"MovementComponent": "", -"Movement_StateReceiver": "", -"State": "", -"StateAnimatedActor": "", -"StateMachine": "", -"StateMachineAnimatedActor": "", -"StateModifier": "", -"StateModifierAnimatedActor": "", -"UIComponent": "" -} - -[application] - -config/name="Attempt 2" -run/main_scene="res://Main.tscn" -run/delta_sync_after_draw=true -run/delta_smoothing=false -boot_splash/show_image=false -config/icon="res://icon.png" - -[aseprite] - -animation/layers/exclusion_pattern="-.*" -animation/layers/only_include_visible_layers_by_default=true - -[autoload] - -PlayerInfo="*res://lib/singleton_autoloads/PlayerInfo.gd" -UiManager="*res://lib/singleton_autoloads/UIManager.gd" -LevelInfo="*res://lib/singleton_autoloads/LevelInfo.gd" - -[debug] - -shapes/collision/shape_color=Color( 1, 1, 1, 0.419608 ) - -[display] - -window/size/width=320 -window/size/height=180 -window/size/resizable=false -window/size/test_width=960 -window/size/test_height=540 -window/stretch/mode="viewport" -window/stretch/aspect="keep" - -[editor_plugins] - -enabled=PoolStringArray( "res://addons/AsepriteWizard/plugin.cfg" ) - -[gui] - -common/drop_mouse_on_gui_input_disabled=true - -[importer_defaults] - -texture={ -"compress/bptc_ldr": 0, -"compress/hdr_mode": 0, -"compress/lossy_quality": 0.7, -"compress/mode": 0, -"compress/normal_map": 0, -"detect_3d": true, -"flags/anisotropic": false, -"flags/filter": false, -"flags/mipmaps": false, -"flags/repeat": 0, -"flags/srgb": 2, -"process/HDR_as_SRGB": false, -"process/fix_alpha_border": true, -"process/invert_color": false, -"process/normal_map_invert_y": false, -"process/premult_alpha": false, -"size_limit": 0, -"stream": false, -"svg/scale": 1.0 -} - -[input] - -ui_accept={ -"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":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) - ] -} -move_left_1={ -"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":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) - ] -} -move_right_1={ -"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":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) - ] -} -crouch_1={ -"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":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) - ] -} -jump_1={ -"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":0,"physical_scancode":32,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) - ] -} -dash_1={ -"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":78,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) - ] -} -attack_1={ -"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) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) - ] -} -attack_secondary_1={ -"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":0,"physical_scancode":44,"unicode":0,"echo":false,"script":null) - ] -} -move_left_2={ -"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) - ] -} -move_right_2={ -"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) - ] -} -jump_2={ -"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":74,"physical_scancode":0,"unicode":0,"echo":false,"script":null) - ] -} -shoot_2={ -"deadzone": 0.5, -"events": [ ] -} - -[layer_names] - -2d_physics/layer_1="World" -2d_physics/layer_2="Player" -2d_physics/layer_3="Enemies" -2d_physics/layer_5="PlayerHurtbox" -2d_physics/layer_6="EnemyHurtbox" -2d_physics/layer_7="PlayerHitbox" -2d_physics/layer_8="EnemyHitbox" -2d_physics/layer_11="Climbable" -common/enable_pause_aware_picking=true -2d/default_gravity=600 - -[physics] - -2d/default_gravity=280 -common/physics_interpolation=true - -[rendering] - -quality/driver/driver_name="GLES2" -vram_compression/import_etc=true