diff --git a/addons/smoothing/plugin.cfg b/addons/smoothing/plugin.cfg index 09a6ba9..34b952e 100644 --- a/addons/smoothing/plugin.cfg +++ b/addons/smoothing/plugin.cfg @@ -3,5 +3,5 @@ name="Smoothing" description="Smoothing nodes for fixed timestep interpolation." author="Lawnjelly" -version="1.0.0" +version="1.0.3" script="smoothing_plugin.gd" diff --git a/addons/smoothing/smoothing.gd b/addons/smoothing/smoothing.gd index 6705153..73662ce 100644 --- a/addons/smoothing/smoothing.gd +++ b/addons/smoothing/smoothing.gd @@ -20,25 +20,25 @@ extends Spatial -export(NodePath) var target : NodePath setget set_target, get_target +export (NodePath) var target: NodePath setget set_target, get_target -var _m_Target : Spatial +var _m_Target: Spatial -var _m_trCurr : Transform -var _m_trPrev : Transform +var _m_trCurr: Transform +var _m_trPrev: Transform const SF_ENABLED = 1 << 0 const SF_TRANSLATE = 1 << 1 const SF_BASIS = 1 << 2 const SF_SLERP = 1 << 3 -const SF_DIRTY = 1 << 4 -const SF_INVISIBLE = 1 << 5 +const SF_INVISIBLE = 1 << 4 -export (int, FLAGS, "enabled", "translate", "basis", "slerp") var flags : int = SF_ENABLED | SF_TRANSLATE | SF_BASIS setget _set_flags, _get_flags +export (int, FLAGS, "enabled", "translate", "basis", "slerp") var flags: int = SF_ENABLED | SF_TRANSLATE | SF_BASIS setget _set_flags, _get_flags ########################################################################################## # USER FUNCS + # call this on e.g. starting a level, AFTER moving the target # so we can update both the previous and current values func teleport(): @@ -54,56 +54,63 @@ func teleport(): # resume old flags flags = temp_flags -func set_enabled(var bEnable : bool): + +func set_enabled(bEnable: bool): _ChangeFlags(SF_ENABLED, bEnable) _SetProcessing() + func is_enabled(): return _TestFlags(SF_ENABLED) - - ########################################################################################## func _ready(): _m_trCurr = Transform() _m_trPrev = Transform() + set_process_priority(100) + set_as_toplevel(true) + Engine.set_physics_jitter_fix(0.0) - if _m_Target == null: - push_error("A target must be defined for the Smoothing node to work.") func set_target(new_value): target = new_value if is_inside_tree(): _FindTarget() + func get_target(): return target + func _set_flags(new_value): flags = new_value # we may have enabled or disabled _SetProcessing() + func _get_flags(): return flags + func _SetProcessing(): var bEnable = _TestFlags(SF_ENABLED) if _TestFlags(SF_INVISIBLE): bEnable = false - set_process(bEnable); - set_physics_process(bEnable); + set_process(bEnable) + set_physics_process(bEnable) pass + func _enter_tree(): # might have been moved _FindTarget() pass + func _notification(what): match what: # invisible turns off processing @@ -112,32 +119,52 @@ func _notification(what): _SetProcessing() - func _RefreshTransform(): - _ClearFlags(SF_DIRTY); - if _HasTarget() == false: return _m_trPrev = _m_trCurr - _m_trCurr = _m_Target.transform - + _m_trCurr = _m_Target.global_transform func _FindTarget(): _m_Target = null + + # If no target has been assigned in the property, + # default to using the parent as the target. if target.is_empty(): + var parent = get_parent_spatial() + if parent: + _m_Target = parent return - _m_Target = get_node(target) + var targ = get_node(target) - if _m_Target is Spatial: + if ! targ: + printerr("ERROR SmoothingNode : Target " + target + " not found") return - _m_Target = null - #return false + if not targ is Spatial: + printerr("ERROR SmoothingNode : Target " + target + " is not spatial") + target = "" + return + # if we got to here targ is a spatial + _m_Target = targ -func _HasTarget()->bool: + # do a final check + # certain targets are disallowed + if _m_Target == self: + var msg = _m_Target.get_name() + " assigned to " + self.get_name() + "]" + printerr("ERROR SmoothingNode : Target should not be self [", msg) + + # error message + #OS.alert("Target cannot be a parent or grandparent in the scene tree.", "SmoothingNode") + _m_Target = null + target = "" + return + + +func _HasTarget() -> bool: if _m_Target == null: return false @@ -150,12 +177,9 @@ func _HasTarget()->bool: func _process(_delta): - if _TestFlags(SF_DIRTY): - _RefreshTransform() var f = Engine.get_physics_interpolation_fraction() - - var tr : Transform = Transform() + var tr: Transform = Transform() # translate if _TestFlags(SF_TRANSLATE): @@ -171,34 +195,32 @@ func _process(_delta): transform = tr - pass func _physics_process(_delta): - # take care of the special case where multiple physics ticks - # occur before a frame .. the data must flow! - if _TestFlags(SF_DIRTY): - _RefreshTransform() + _RefreshTransform() - _SetFlags(SF_DIRTY) - pass -func _LerpBasis(var from : Basis, var to : Basis, var f : float)->Basis: - var res : Basis = Basis() +func _LerpBasis(from: Basis, to: Basis, f: float) -> Basis: + var res: Basis = Basis() res.x = from.x.linear_interpolate(to.x, f) res.y = from.y.linear_interpolate(to.y, f) res.z = from.z.linear_interpolate(to.z, f) return res -func _SetFlags(var f): + +func _SetFlags(f): flags |= f -func _ClearFlags(var f): + +func _ClearFlags(f): flags &= ~f -func _TestFlags(var f): + +func _TestFlags(f): return (flags & f) == f -func _ChangeFlags(var f, var bSet): + +func _ChangeFlags(f, bSet): if bSet: _SetFlags(f) else: diff --git a/addons/smoothing/smoothing.png.import b/addons/smoothing/smoothing.png.import index 1a015f9..5394237 100644 --- a/addons/smoothing/smoothing.png.import +++ b/addons/smoothing/smoothing.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/addons/smoothing/smoothing_2d.gd b/addons/smoothing/smoothing_2d.gd index 2ed0eb1..6e283d0 100644 --- a/addons/smoothing/smoothing_2d.gd +++ b/addons/smoothing/smoothing_2d.gd @@ -20,18 +20,18 @@ extends Node2D -export(NodePath) var target : NodePath setget set_target, get_target +export (NodePath) var target: NodePath setget set_target, get_target -var _m_Target : Node2D +var _m_Target: Node2D -var m_Pos_curr : Vector2 = Vector2() -var m_Pos_prev : Vector2 = Vector2() +var m_Pos_curr: Vector2 = Vector2() +var m_Pos_prev: Vector2 = Vector2() -var m_Angle_curr : float -var m_Angle_prev : float +var m_Angle_curr: float +var m_Angle_prev: float -var m_Scale_curr : Vector2 = Vector2() -var m_Scale_prev : Vector2 = Vector2() +var m_Scale_curr: Vector2 = Vector2() +var m_Scale_prev: Vector2 = Vector2() const SF_ENABLED = 1 << 0 const SF_TRANSLATE = 1 << 1 @@ -39,14 +39,14 @@ const SF_ROTATE = 1 << 2 const SF_SCALE = 1 << 3 const SF_GLOBAL_IN = 1 << 4 const SF_GLOBAL_OUT = 1 << 5 -const SF_DIRTY = 1 << 6 -const SF_INVISIBLE = 1 << 7 +const SF_INVISIBLE = 1 << 6 -export (int, FLAGS, "enabled", "translate", "rotate", "scale", "global in", "global out") var flags : int = SF_ENABLED | SF_TRANSLATE setget _set_flags, _get_flags +export (int, FLAGS, "enabled", "translate", "rotate", "scale", "global in", "global out") var flags: int = SF_ENABLED | SF_TRANSLATE | SF_ROTATE | SF_SCALE | SF_GLOBAL_IN | SF_GLOBAL_OUT setget _set_flags, _get_flags ########################################################################################## # USER FUNCS + # call this on e.g. starting a level, AFTER moving the target # so we can update both the previous and current values func teleport(): @@ -64,55 +64,61 @@ func teleport(): # get back the old flags flags = temp_flags -func set_enabled(var bEnable : bool): + +func set_enabled(bEnable: bool): _ChangeFlags(SF_ENABLED, bEnable) _SetProcessing() + func is_enabled(): return _TestFlags(SF_ENABLED) - - ########################################################################################## func _ready(): m_Angle_curr = 0 m_Angle_prev = 0 + set_process_priority(100) + Engine.set_physics_jitter_fix(0.0) - if _m_Target == null: - push_error("A target must be defined for the Smoothing2D node to work.") func set_target(new_value): target = new_value if is_inside_tree(): _FindTarget() + func get_target(): return target + func _set_flags(new_value): flags = new_value # we may have enabled or disabled _SetProcessing() + func _get_flags(): return flags + func _SetProcessing(): var bEnable = _TestFlags(SF_ENABLED) if _TestFlags(SF_INVISIBLE): bEnable = false - set_process(bEnable); - set_physics_process(bEnable); - pass + set_process(bEnable) + set_physics_process(bEnable) + + set_as_toplevel(_TestFlags(SF_GLOBAL_OUT)) + func _enter_tree(): # might have been moved _FindTarget() - pass + func _notification(what): match what: @@ -122,9 +128,7 @@ func _notification(what): _SetProcessing() - func _RefreshTransform(): - _ClearFlags(SF_DIRTY); if _HasTarget() == false: return @@ -154,21 +158,33 @@ func _RefreshTransform(): m_Scale_prev = m_Scale_curr m_Scale_curr = _m_Target.get_scale() - func _FindTarget(): _m_Target = null + + # If no target has been assigned in the property, + # default to using the parent as the target. if target.is_empty(): + var parent = get_parent() + if parent and (parent is Node2D): + _m_Target = parent return - _m_Target = get_node(target) + var targ = get_node(target) - if _m_Target is Node2D: + if ! targ: + printerr("ERROR SmoothingNode2D : Target " + target + " not found") return - _m_Target = null + if not targ is Node2D: + printerr("ERROR SmoothingNode2D : Target " + target + " is not Node2D") + target = "" + return + + # if we got to here targ is correct type + _m_Target = targ -func _HasTarget()->bool: +func _HasTarget() -> bool: if _m_Target == null: return false @@ -181,66 +197,55 @@ func _HasTarget()->bool: func _process(_delta): - if _TestFlags(SF_DIRTY): - _RefreshTransform() var f = Engine.get_physics_interpolation_fraction() + # We can always use local position rather than set_global_position + # because even in global mode we are set_as_top_level, and the result + # will be the same. + + # translate + if _TestFlags(SF_TRANSLATE): + set_position(m_Pos_prev.linear_interpolate(m_Pos_curr, f)) - if _TestFlags(SF_GLOBAL_OUT): - # translate - if _TestFlags(SF_TRANSLATE): - set_global_position(m_Pos_prev.linear_interpolate(m_Pos_curr, f)) - - # rotate - if _TestFlags(SF_ROTATE): - var r = _LerpAngle(m_Angle_prev, m_Angle_curr, f) - set_global_rotation(r) - - if _TestFlags(SF_SCALE): - set_global_scale(m_Scale_prev.linear_interpolate(m_Scale_curr, f)) - else: - # translate - if _TestFlags(SF_TRANSLATE): - set_position(m_Pos_prev.linear_interpolate(m_Pos_curr, f)) - - # rotate - if _TestFlags(SF_ROTATE): - var r = _LerpAngle(m_Angle_prev, m_Angle_curr, f) - set_rotation(r) + # rotate + if _TestFlags(SF_ROTATE): + var r = _LerpAngle(m_Angle_prev, m_Angle_curr, f) + set_rotation(r) - if _TestFlags(SF_SCALE): - set_scale(m_Scale_prev.linear_interpolate(m_Scale_curr, f)) + if _TestFlags(SF_SCALE): + set_scale(m_Scale_prev.linear_interpolate(m_Scale_curr, f)) pass + func _physics_process(_delta): - # take care of the special case where multiple physics ticks - # occur before a frame .. the data must flow! - if _TestFlags(SF_DIRTY): - _RefreshTransform() + _RefreshTransform() - _SetFlags(SF_DIRTY) - pass -func _LerpAngle(var from : float, var to : float, var weight : float)->float: +func _LerpAngle(from: float, to: float, weight: float) -> float: return from + _ShortAngleDist(from, to) * weight -func _ShortAngleDist(var from : float, var to : float)->float: - var max_angle : float = 2 * PI - var diff : float = fmod(to-from, max_angle) + +func _ShortAngleDist(from: float, to: float) -> float: + var max_angle: float = 2 * PI + var diff: float = fmod(to - from, max_angle) return fmod(2.0 * diff, max_angle) - diff -func _SetFlags(var f): + +func _SetFlags(f): flags |= f -func _ClearFlags(var f): + +func _ClearFlags(f): flags &= ~f -func _TestFlags(var f): + +func _TestFlags(f): return (flags & f) == f -func _ChangeFlags(var f, var bSet): + +func _ChangeFlags(f, bSet): if bSet: _SetFlags(f) else: diff --git a/addons/smoothing/smoothing_2d.png.import b/addons/smoothing/smoothing_2d.png.import index 0edf5e5..5f2063b 100644 --- a/addons/smoothing/smoothing_2d.png.import +++ b/addons/smoothing/smoothing_2d.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/addons/smoothing/smoothing_plugin.gd b/addons/smoothing/smoothing_plugin.gd index fa0aacd..0d83ffb 100644 --- a/addons/smoothing/smoothing_plugin.gd +++ b/addons/smoothing/smoothing_plugin.gd @@ -1,6 +1,7 @@ tool extends EditorPlugin + func _enter_tree(): # Initialization of the plugin goes here # Add the new type with a name, a parent type, a script and an icon @@ -8,6 +9,7 @@ func _enter_tree(): add_custom_type("Smoothing2D", "Node2D", preload("smoothing_2d.gd"), preload("smoothing_2d.png")) pass + func _exit_tree(): # Clean-up of the plugin goes here # Always remember to remove it from the engine when deactivated diff --git a/game/background/nebulae.png.import b/game/background/nebulae.png.import index 5de3c5a..1ba26dc 100644 --- a/game/background/nebulae.png.import +++ b/game/background/nebulae.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/background/stars.png.import b/game/background/stars.png.import index 3b0fffb..23c6236 100644 --- a/game/background/stars.png.import +++ b/game/background/stars.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/ball/aura.png.import b/game/ball/aura.png.import index c97250a..21744ce 100644 --- a/game/ball/aura.png.import +++ b/game/ball/aura.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/ball/ball.png.import b/game/ball/ball.png.import index 6ee9cbf..595a0c3 100644 --- a/game/ball/ball.png.import +++ b/game/ball/ball.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/ball/ball.tscn b/game/ball/ball.tscn index 198527c..1a27cbe 100644 --- a/game/ball/ball.tscn +++ b/game/ball/ball.tscn @@ -329,9 +329,7 @@ tracks/0/keys = { "values": [ 0.0, 360.0 ] } -[node name="Ball" type="RigidBody2D" groups=[ -"ball", -]] +[node name="Ball" type="RigidBody2D" groups=["ball"]] collision_layer = 8 collision_mask = 31 mode = 2 @@ -369,7 +367,6 @@ texture = ExtResource( 5 ) spread = 180.0 gravity = Vector2( 0, 0 ) initial_velocity = 30.0 -angular_velocity = 2.80845e-06 scale_amount = 0.5 scale_amount_curve = SubResource( 5 ) @@ -385,7 +382,6 @@ emission_sphere_radius = 5.0 spread = 180.0 gravity = Vector2( 0, 0 ) initial_velocity = 30.0 -angular_velocity = 2.80845e-06 scale_amount = 0.35 scale_amount_curve = SubResource( 6 ) color = Color( 0.643137, 0.835294, 1, 0.12549 ) @@ -423,4 +419,5 @@ anims/spin = SubResource( 13 ) [node name="ResourcePreloader" type="ResourcePreloader" parent="."] resources = [ PoolStringArray( "bounce.0", "bounce.1", "bounce.2", "bounce.3" ), [ ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ) ] ] + [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_finished"] diff --git a/game/ball/bounce.0.wav.import b/game/ball/bounce.0.wav.import index 007a602..fb0417e 100644 --- a/game/ball/bounce.0.wav.import +++ b/game/ball/bounce.0.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/ball/bounce.1.wav.import b/game/ball/bounce.1.wav.import index f82a354..9ea7517 100644 --- a/game/ball/bounce.1.wav.import +++ b/game/ball/bounce.1.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/ball/bounce.2.wav.import b/game/ball/bounce.2.wav.import index 12f4b37..5ca3158 100644 --- a/game/ball/bounce.2.wav.import +++ b/game/ball/bounce.2.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/ball/bounce.3.wav.import b/game/ball/bounce.3.wav.import index cba5c18..4a86300 100644 --- a/game/ball/bounce.3.wav.import +++ b/game/ball/bounce.3.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/ball/spark.png.import b/game/ball/spark.png.import index b6f1f7f..6db0a4e 100644 --- a/game/ball/spark.png.import +++ b/game/ball/spark.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/ball/spinner.png.import b/game/ball/spinner.png.import index a3f01ea..44b62ef 100644 --- a/game/ball/spinner.png.import +++ b/game/ball/spinner.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/ball_launcher/ball_launcher.png.import b/game/ball_launcher/ball_launcher.png.import index eb74dd5..28b7a67 100644 --- a/game/ball_launcher/ball_launcher.png.import +++ b/game/ball_launcher/ball_launcher.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/ball_launcher/smoke_puff.png.import b/game/ball_launcher/smoke_puff.png.import index eaea2c4..974e6dd 100644 --- a/game/ball_launcher/smoke_puff.png.import +++ b/game/ball_launcher/smoke_puff.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/brick/aura.png.import b/game/brick/aura.png.import index 7caf8fd..9d974f2 100644 --- a/game/brick/aura.png.import +++ b/game/brick/aura.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/brick/brick.png.import b/game/brick/brick.png.import index 9f45208..f33a380 100644 --- a/game/brick/brick.png.import +++ b/game/brick/brick.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/brick/destroy.wav.import b/game/brick/destroy.wav.import index 805a687..db69de9 100644 --- a/game/brick/destroy.wav.import +++ b/game/brick/destroy.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/brick/spark.png.import b/game/brick/spark.png.import index afa433b..2a15585 100644 --- a/game/brick/spark.png.import +++ b/game/brick/spark.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/exit/exit.png.import b/game/exit/exit.png.import index 4798a23..6bfcaa5 100644 --- a/game/exit/exit.png.import +++ b/game/exit/exit.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/force_field/force_field.png.import b/game/force_field/force_field.png.import index c19cf04..79b4a18 100644 --- a/game/force_field/force_field.png.import +++ b/game/force_field/force_field.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/goal/aura.png.import b/game/goal/aura.png.import index 6f71d48..10cc5f7 100644 --- a/game/goal/aura.png.import +++ b/game/goal/aura.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/goal/close.wav.import b/game/goal/close.wav.import index e18998d..fcc63cd 100644 --- a/game/goal/close.wav.import +++ b/game/goal/close.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/goal/get_ball.wav.import b/game/goal/get_ball.wav.import index be02ea3..211e9bb 100644 --- a/game/goal/get_ball.wav.import +++ b/game/goal/get_ball.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=false -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/game/goal/spark.png.import b/game/goal/spark.png.import index aa4bfe1..e52ae6f 100644 --- a/game/goal/spark.png.import +++ b/game/goal/spark.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/hud/vignette.png.import b/game/hud/vignette.png.import index 0b83e17..01db5bb 100644 --- a/game/hud/vignette.png.import +++ b/game/hud/vignette.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/paddle/paddle.gd b/game/paddle/paddle.gd index 51ebf2e..5188afe 100644 --- a/game/paddle/paddle.gd +++ b/game/paddle/paddle.gd @@ -9,7 +9,7 @@ class_name Paddle const ACCELERATION = 2400 # The friction factor applied on each step -const FRICTION = 0.9 +const FRICTION = 0.625 const CAMERA_ZOOM_BASE = 1.5 @@ -23,8 +23,8 @@ var motion := Vector2() var can_move := false onready var game := $"/root/Game" as Node -onready var camera := $Smoothing2D/Camera2D as Camera2D -onready var tween := $Smoothing2D/Tween as Tween +onready var camera := $Camera2D as Camera2D +onready var tween := $Tween as Tween func _ready() -> void: diff --git a/game/paddle/paddle.png.import b/game/paddle/paddle.png.import index a9ffa85..f5a36e9 100644 --- a/game/paddle/paddle.png.import +++ b/game/paddle/paddle.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/paddle/paddle.tscn b/game/paddle/paddle.tscn index 164f11b..88be53e 100644 --- a/game/paddle/paddle.tscn +++ b/game/paddle/paddle.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://game/paddle/paddle.gd" type="Script" id=1] [ext_resource path="res://game/paddle/under_light.png" type="Texture" id=2] [ext_resource path="res://game/paddle/paddle.png" type="Texture" id=3] -[ext_resource path="res://addons/smoothing/smoothing_2d.gd" type="Script" id=4] [sub_resource type="PhysicsMaterial" id=1] friction = 0.0 @@ -23,22 +22,17 @@ script = ExtResource( 1 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] polygon = PoolVector2Array( -44, -36, -36, -44, 36, -44, 44, -36, 44, 36, 36, 44, -36, 44, -44, 36 ) -[node name="Smoothing2D" type="Node2D" parent="."] -script = ExtResource( 4 ) -target = NodePath("..") -flags = 51 - -[node name="UnderLight" type="Sprite" parent="Smoothing2D"] +[node name="UnderLight" type="Sprite" parent="."] modulate = Color( 1, 1, 1, 0.25098 ) material = SubResource( 2 ) scale = Vector2( 0.9, 0.9 ) texture = ExtResource( 2 ) -[node name="Sprite" type="Sprite" parent="Smoothing2D"] +[node name="Sprite" type="Sprite" parent="."] scale = Vector2( 0.9, 0.9 ) texture = ExtResource( 3 ) -[node name="Camera2D" type="Camera2D" parent="Smoothing2D"] +[node name="Camera2D" type="Camera2D" parent="."] current = true zoom = Vector2( 1.5, 1.5 ) smoothing_enabled = true @@ -48,4 +42,4 @@ drag_margin_top = 0.0 drag_margin_right = 0.0 drag_margin_bottom = 0.0 -[node name="Tween" type="Tween" parent="Smoothing2D"] +[node name="Tween" type="Tween" parent="."] diff --git a/game/paddle/under_light.png.import b/game/paddle/under_light.png.import index f94120c..cf8ba50 100644 --- a/game/paddle/under_light.png.import +++ b/game/paddle/under_light.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/pause_menu/pause_menu.tscn b/game/pause_menu/pause_menu.tscn index 142d4a1..f85348f 100644 --- a/game/pause_menu/pause_menu.tscn +++ b/game/pause_menu/pause_menu.tscn @@ -109,6 +109,7 @@ text = "Exit to Menu" [node name="AnimationPlayer" type="AnimationPlayer" parent="."] anims/fade_in = SubResource( 1 ) anims/fade_out = SubResource( 2 ) + [connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"] [connection signal="pressed" from="VBoxContainer/Continue" to="." method="_on_continue_pressed"] [connection signal="pressed" from="VBoxContainer/RestartLevel" to="." method="_on_restart_level_pressed"] diff --git a/game/tiles/background/base_floor.png.import b/game/tiles/background/base_floor.png.import index 3ba624b..01f2ad9 100644 --- a/game/tiles/background/base_floor.png.import +++ b/game/tiles/background/base_floor.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/base_floor_checker.png.import b/game/tiles/background/base_floor_checker.png.import index 5293b83..e542f57 100644 --- a/game/tiles/background/base_floor_checker.png.import +++ b/game/tiles/background/base_floor_checker.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/base_floor_tile.png.import b/game/tiles/background/base_floor_tile.png.import index 0ed438b..a8b011d 100644 --- a/game/tiles/background/base_floor_tile.png.import +++ b/game/tiles/background/base_floor_tile.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/glass_floor.png.import b/game/tiles/background/glass_floor.png.import index 1d4fa2e..6c42691 100644 --- a/game/tiles/background/glass_floor.png.import +++ b/game/tiles/background/glass_floor.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/grate.png.import b/game/tiles/background/grate.png.import index a3e2c1d..41fa0b8 100644 --- a/game/tiles/background/grate.png.import +++ b/game/tiles/background/grate.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/warning_floor_gray.png.import b/game/tiles/background/warning_floor_gray.png.import index 82f1630..728f0dc 100644 --- a/game/tiles/background/warning_floor_gray.png.import +++ b/game/tiles/background/warning_floor_gray.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/background/warning_floor_yellow.png.import b/game/tiles/background/warning_floor_yellow.png.import index 7f3befe..f71d2ed 100644 --- a/game/tiles/background/warning_floor_yellow.png.import +++ b/game/tiles/background/warning_floor_yellow.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/foreground/base_wall.png.import b/game/tiles/foreground/base_wall.png.import index fdb98c7..763d11e 100644 --- a/game/tiles/foreground/base_wall.png.import +++ b/game/tiles/foreground/base_wall.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/light/tile_cyan.png.import b/game/tiles/light/tile_cyan.png.import index 06edd00..77245ce 100644 --- a/game/tiles/light/tile_cyan.png.import +++ b/game/tiles/light/tile_cyan.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/light/tile_magenta.png.import b/game/tiles/light/tile_magenta.png.import index 456ad73..a102ca9 100644 --- a/game/tiles/light/tile_magenta.png.import +++ b/game/tiles/light/tile_magenta.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/light/tile_white.png.import b/game/tiles/light/tile_white.png.import index 3aaff01..7453a3a 100644 --- a/game/tiles/light/tile_white.png.import +++ b/game/tiles/light/tile_white.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/game/tiles/light/tile_yellow.png.import b/game/tiles/light/tile_yellow.png.import index 641a2ee..14d97b2 100644 --- a/game/tiles/light/tile_yellow.png.import +++ b/game/tiles/light/tile_yellow.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/icon.png.import b/icon.png.import index 96cbf46..a4c02e6 100644 --- a/icon.png.import +++ b/icon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/menu/click.wav.import b/menu/click.wav.import index 34c7658..0f6be88 100644 --- a/menu/click.wav.import +++ b/menu/click.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/menu/hover.wav.import b/menu/hover.wav.import index aaf5c21..261112b 100644 --- a/menu/hover.wav.import +++ b/menu/hover.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=false edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/menu/menu.gd b/menu/menu.gd index c3147fa..2d3ee79 100644 --- a/menu/menu.gd +++ b/menu/menu.gd @@ -45,8 +45,8 @@ func _input(event: InputEvent) -> void: motion += event.relative -func _physics_process(_delta: float) -> void: - motion *= 0.9 +func _process(_delta: float) -> void: + motion *= 0.95 background.scroll_offset += motion diff --git a/menu/menu.tscn b/menu/menu.tscn index 0c0d940..093fe14 100644 --- a/menu/menu.tscn +++ b/menu/menu.tscn @@ -105,7 +105,6 @@ __meta__ = { resources = [ PoolStringArray( "click", "hover" ), [ ExtResource( 9 ), ExtResource( 10 ) ] ] [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -playback_process_mode = 0 anims/change_menu = SubResource( 1 ) anims/fade_in = SubResource( 2 ) diff --git a/menu/theme.tres b/menu/theme.tres index f64738a..d1777b2 100644 --- a/menu/theme.tres +++ b/menu/theme.tres @@ -113,7 +113,7 @@ Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = ExtResource( 1 ) Button/styles/disabled = SubResource( 1 ) Button/styles/focus = SubResource( 2 ) Button/styles/hover = SubResource( 3 ) @@ -135,7 +135,7 @@ LineEdit/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) LineEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 1 ) LineEdit/icons/clear = null LineEdit/styles/focus = SubResource( 2 ) LineEdit/styles/normal = SubResource( 10 ) diff --git a/project.godot b/project.godot index 376b1e7..de3c594 100644 --- a/project.godot +++ b/project.godot @@ -89,48 +89,43 @@ gdscript/warnings/return_value_discarded=false [display] window/dpi/allow_hidpi=true -window/vsync/use_vsync=false window/stretch/mode="2d" window/stretch/aspect="expand" -[editor_plugins] - -enabled=PoolStringArray( "smoothing" ) - [input] ui_cancel={ "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":16777217,"unicode":0,"echo":false,"script":null) +"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":16777217,"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) ] } ui_focus_next={ "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":16777218,"unicode":0,"echo":false,"script":null) +"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":16777218,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"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":16777234,"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":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } ui_focus_prev={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"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":16777232,"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":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } ui_left={ "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,"unicode":0,"echo":false,"script":null) +"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) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } ui_right={ "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,"unicode":0,"echo":false,"script":null) +"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) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] @@ -145,48 +140,48 @@ ui_down={ } move_left={ "deadzone": 0.15, -"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,"unicode":0,"echo":false,"script":null) +"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(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } move_right={ "deadzone": 0.15, -"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,"unicode":0,"echo":false,"script":null) +"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(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } move_down={ "deadzone": 0.15, -"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,"unicode":0,"echo":false,"script":null) +"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) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } move_up={ "deadzone": 0.15, -"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":16777232,"unicode":0,"echo":false,"script":null) +"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":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) ] } toggle_fullscreen={ "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":16777254,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) +"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":16777254,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } toggle_hud={ "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":16777244,"unicode":0,"echo":false,"script":null) +"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":16777244,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } toggle_pause={ "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":16777217,"unicode":0,"echo":false,"script":null) +"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":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) ] } take_screenshot={ "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":16777255,"unicode":0,"echo":false,"script":null) +"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":16777255,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } @@ -205,6 +200,7 @@ locale_filter=[ 0, [ ] ] [physics] +common/physics_fps=10 common/physics_jitter_fix=0.0 [rendering] diff --git a/splash.png.import b/splash.png.import index 9b827bd..fab3fd8 100644 --- a/splash.png.import +++ b/splash.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true