diff --git a/2d/bullet_shower/project.pandemonium b/2d/bullet_shower/project.pandemonium index af0c6f7..4a34de8 100644 --- a/2d/bullet_shower/project.pandemonium +++ b/2d/bullet_shower/project.pandemonium @@ -32,7 +32,6 @@ common/enable_pause_aware_picking=true [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=0 vram_compression/import_etc=true diff --git a/2d/bullet_shower/shower.tscn b/2d/bullet_shower/shower.tscn index a0eba78..0088b99 100644 --- a/2d/bullet_shower/shower.tscn +++ b/2d/bullet_shower/shower.tscn @@ -9,7 +9,7 @@ animations = [ { "frames": [ ExtResource( 3 ), ExtResource( 4 ) ], "loop": true, -"name": "default", +"name": @"default", "speed": 5.0 } ] diff --git a/2d/dodge_the_creeps/Player.tscn b/2d/dodge_the_creeps/Player.tscn index 67c7188..d89299a 100644 --- a/2d/dodge_the_creeps/Player.tscn +++ b/2d/dodge_the_creeps/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Player.gd" type="Script" id=1] [ext_resource path="res://art/playerGrey_walk1.png" type="Texture" id=2] @@ -10,12 +10,12 @@ animations = [ { "frames": [ ExtResource( 2 ), ExtResource( 3 ) ], "loop": true, -"name": "right", +"name": @"right", "speed": 5.0 }, { "frames": [ ExtResource( 4 ), ExtResource( 5 ) ], "loop": true, -"name": "up", +"name": @"up", "speed": 5.0 } ] @@ -23,27 +23,11 @@ animations = [ { radius = 26.1701 height = 14.822 -[sub_resource type="Gradient" id=3] -colors = PoolColorArray( 1, 1, 1, 0.501961, 1, 1, 1, 0 ) - -[sub_resource type="GradientTexture" id=4] -gradient = SubResource( 3 ) - [sub_resource type="Curve" id=5] _data = [ Vector2( 0.00501098, 0.5 ), 0.0, 0.0, 0, 0, Vector2( 0.994989, 0.324 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=6] -curve = SubResource( 5 ) - -[sub_resource type="ParticlesMaterial" id=7] -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -scale = 0.75 -scale_curve = SubResource( 6 ) -color_ramp = SubResource( 4 ) +[sub_resource type="Gradient" id=3] +colors = PoolColorArray( 1, 1, 1, 0.501961, 1, 1, 1, 0 ) [node name="Player" type="Area2D"] z_index = 10 @@ -55,17 +39,20 @@ __meta__ = { [node name="AnimatedSprite" type="AnimatedSprite" parent="."] scale = Vector2( 0.5, 0.5 ) frames = SubResource( 1 ) -animation = "right" +animation = @"right" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 2 ) -[node name="Trail" type="Particles2D" parent="."] +[node name="Trail" type="CPUParticles2D" parent="."] z_index = -1 amount = 10 speed_scale = 2.0 local_coords = false -process_material = SubResource( 7 ) texture = ExtResource( 2 ) +gravity = Vector2( 0, 0 ) +initial_velocity = 1.0 +scale_amount_curve = SubResource( 5 ) +color_ramp = SubResource( 3 ) [connection signal="body_entered" from="." to="." method="_on_Player_body_entered"] diff --git a/2d/dodge_the_creeps/art/gameover.wav.import b/2d/dodge_the_creeps/art/gameover.wav.import index 58c33dd..ba79634 100644 --- a/2d/dodge_the_creeps/art/gameover.wav.import +++ b/2d/dodge_the_creeps/art/gameover.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/finite_state_machine/Demo.tscn b/2d/finite_state_machine/Demo.tscn index 6aed376..4ec8247 100644 --- a/2d/finite_state_machine/Demo.tscn +++ b/2d/finite_state_machine/Demo.tscn @@ -21,8 +21,8 @@ margin_bottom = -730.0 rect_clip_content = false mouse_filter = 2 size_flags_vertical = 4 -custom_fonts/bold_font = ExtResource( 5 ) custom_fonts/normal_font = ExtResource( 2 ) +custom_fonts/bold_font = ExtResource( 5 ) bbcode_enabled = true bbcode_text = "This example shows how to apply the State programming pattern in GDScript, including Hierarchical States, and a pushdown automaton. diff --git a/2d/finite_state_machine/project.pandemonium b/2d/finite_state_machine/project.pandemonium index 51c5e49..5b9732b 100644 --- a/2d/finite_state_machine/project.pandemonium +++ b/2d/finite_state_machine/project.pandemonium @@ -96,6 +96,5 @@ attack={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/gd_paint/paint_control.gd b/2d/gd_paint/paint_control.gd index ca0a27d..956f767 100644 --- a/2d/gd_paint/paint_control.gd +++ b/2d/gd_paint/paint_control.gd @@ -239,7 +239,7 @@ func _draw(): func save_picture(path): # Wait until the frame has finished before getting the texture. - yield(VisualServer, "frame_post_draw") + yield(RenderingServer, "frame_post_draw") # Get the viewport image. var img = get_viewport().get_texture().get_data() diff --git a/2d/gd_paint/paint_root.tscn b/2d/gd_paint/paint_root.tscn index 23a9d85..09ddee8 100644 --- a/2d/gd_paint/paint_root.tscn +++ b/2d/gd_paint/paint_root.tscn @@ -218,5 +218,3 @@ margin_bottom = 400.0 resizable = true access = 2 filters = PoolStringArray( "*.png" ) -current_dir = "/home/aaronfranke/workspace/godot-demo-projects/2d/gd_paint" -current_path = "/home/aaronfranke/workspace/godot-demo-projects/2d/gd_paint/" diff --git a/2d/gd_paint/project.pandemonium b/2d/gd_paint/project.pandemonium index d2e0f99..8c43a73 100644 --- a/2d/gd_paint/project.pandemonium +++ b/2d/gd_paint/project.pandemonium @@ -31,6 +31,5 @@ singletons=[ ] [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/gd_paint/tools_panel.gd b/2d/gd_paint/tools_panel.gd index 88ce3fe..a834e79 100644 --- a/2d/gd_paint/tools_panel.gd +++ b/2d/gd_paint/tools_panel.gd @@ -1,14 +1,14 @@ extends Panel onready var brush_settings = $BrushSettings -onready var label_brush_size = brush_settings.get_node(@"LabelBrushSize") -onready var label_brush_shape = brush_settings.get_node(@"LabelBrushShape") +onready var label_brush_size = brush_settings.get_node("LabelBrushSize") +onready var label_brush_shape = brush_settings.get_node("LabelBrushShape") onready var label_stats = $LabelStats onready var label_tools = $LabelTools onready var _parent = get_parent() -onready var save_dialog = _parent.get_node(@"SaveFileDialog") -onready var paint_control = _parent.get_node(@"PaintControl") +onready var save_dialog = _parent.get_node("SaveFileDialog") +onready var paint_control = _parent.get_node("PaintControl") func _ready(): # warning-ignore-all:return_value_discarded diff --git a/2d/hdr/beach_cave.tscn b/2d/hdr/beach_cave.tscn index 5095987..76a95c4 100644 --- a/2d/hdr/beach_cave.tscn +++ b/2d/hdr/beach_cave.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://ocean_beach.png" type="Texture" id=2] [ext_resource path="res://ocean_cave.png" type="Texture" id=3] -[sub_resource type="Environment" id=1] +[sub_resource type="Environment3D" id=1] background_mode = 4 ambient_light_sky_contribution = 0.0 auto_exposure_enabled = true @@ -36,12 +36,11 @@ scale = Vector2( 1.2, 1 ) texture = ExtResource( 3 ) centered = false -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +[node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="."] environment = SubResource( 1 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 540, 360 ) -current = true [node name="Label" type="Label" parent="."] margin_left = 10.0 diff --git a/2d/hexagonal_map/project.pandemonium b/2d/hexagonal_map/project.pandemonium index 04b33a7..ad26a78 100644 --- a/2d/hexagonal_map/project.pandemonium +++ b/2d/hexagonal_map/project.pandemonium @@ -62,7 +62,6 @@ move_up={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.172549, 0.219608, 0.129412, 1 ) diff --git a/2d/instancing/project.pandemonium b/2d/instancing/project.pandemonium index aca5d72..9644e53 100644 --- a/2d/instancing/project.pandemonium +++ b/2d/instancing/project.pandemonium @@ -33,7 +33,6 @@ singletons=[ ] [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 ) diff --git a/2d/instancing/scene_instancing.tscn b/2d/instancing/scene_instancing.tscn index 6e8a1d3..f3eb8f1 100644 --- a/2d/instancing/scene_instancing.tscn +++ b/2d/instancing/scene_instancing.tscn @@ -89,4 +89,3 @@ physics_material_override = SubResource( 10 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 400, 300 ) -current = true diff --git a/2d/isometric/project.pandemonium b/2d/isometric/project.pandemonium index 7830c77..9061eec 100644 --- a/2d/isometric/project.pandemonium +++ b/2d/isometric/project.pandemonium @@ -74,7 +74,6 @@ use_pixel_snap=true [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.0784314, 0.105882, 0.145098, 1 ) diff --git a/2d/kinematic_character/project.pandemonium b/2d/kinematic_character/project.pandemonium index d72d24a..09d4eef 100644 --- a/2d/kinematic_character/project.pandemonium +++ b/2d/kinematic_character/project.pandemonium @@ -70,7 +70,6 @@ multithread/thread_rid_pool_prealloc=60 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.156, 0.1325, 0.25, 1 ) diff --git a/2d/kinematic_character/world.tscn b/2d/kinematic_character/world.tscn index 237d92a..9d1d570 100644 --- a/2d/kinematic_character/world.tscn +++ b/2d/kinematic_character/world.tscn @@ -265,6 +265,5 @@ shape = SubResource( 12 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 265, 247 ) -current = true [connection signal="body_entered" from="Princess" to="Princess" method="_on_body_entered"] diff --git a/2d/light2d_as_mask/lightmask.tscn b/2d/light2d_as_mask/lightmask.tscn index f290bdc..d7a206d 100644 --- a/2d/light2d_as_mask/lightmask.tscn +++ b/2d/light2d_as_mask/lightmask.tscn @@ -84,4 +84,3 @@ anims/maskmotion = SubResource( 2 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) -current = true diff --git a/2d/light2d_as_mask/project.pandemonium b/2d/light2d_as_mask/project.pandemonium index 0230cee..8aa5843 100644 --- a/2d/light2d_as_mask/project.pandemonium +++ b/2d/light2d_as_mask/project.pandemonium @@ -31,6 +31,5 @@ shadow_filter=3 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/lights_and_shadows/light_shadows.tscn b/2d/lights_and_shadows/light_shadows.tscn index 553b51f..e74253e 100644 --- a/2d/lights_and_shadows/light_shadows.tscn +++ b/2d/lights_and_shadows/light_shadows.tscn @@ -320,4 +320,3 @@ anims/motion3 = SubResource( 7 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 400, 300 ) -current = true diff --git a/2d/lights_and_shadows/project.pandemonium b/2d/lights_and_shadows/project.pandemonium index 2d62ab7..bf174bb 100644 --- a/2d/lights_and_shadows/project.pandemonium +++ b/2d/lights_and_shadows/project.pandemonium @@ -35,6 +35,5 @@ shadow_filter=2 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/navigation/level.tscn b/2d/navigation/level.tscn index dafc4ff..f10d8a8 100644 --- a/2d/navigation/level.tscn +++ b/2d/navigation/level.tscn @@ -27,4 +27,3 @@ offset = Vector2( 0, -26 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 420, 300 ) -current = true diff --git a/2d/navigation/project.pandemonium b/2d/navigation/project.pandemonium index e6fdc34..6909fc4 100644 --- a/2d/navigation/project.pandemonium +++ b/2d/navigation/project.pandemonium @@ -40,7 +40,6 @@ click={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.160784, 0.172549, 0.278431, 1 ) diff --git a/2d/navigation_astar/Game.tscn b/2d/navigation_astar/Game.tscn index d84c2d3..0f8e4e0 100644 --- a/2d/navigation_astar/Game.tscn +++ b/2d/navigation_astar/Game.tscn @@ -23,4 +23,3 @@ texture = ExtResource( 4 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) -current = true diff --git a/2d/navigation_astar/project.pandemonium b/2d/navigation_astar/project.pandemonium index c43ce01..5be9567 100644 --- a/2d/navigation_astar/project.pandemonium +++ b/2d/navigation_astar/project.pandemonium @@ -32,6 +32,5 @@ click={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/particles/particles.tscn b/2d/particles/particles.tscn index 71c1581..492fdf4 100644 --- a/2d/particles/particles.tscn +++ b/2d/particles/particles.tscn @@ -1,11 +1,8 @@ -[gd_scene load_steps=38 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://fire_particle.png" type="Texture" id=1] [ext_resource path="res://smoke_particle.png" type="Texture" id=2] [ext_resource path="res://spark_particle2.png" type="Texture" id=3] -[ext_resource path="res://point_texture_emit.tres" type="Texture" id=4] -[ext_resource path="res://point_texture_image_outline.tres" type="Texture" id=5] -[ext_resource path="res://point_normal_texture_image_outline.tres" type="Texture" id=6] [ext_resource path="res://flipbook.png" type="Texture" id=7] [sub_resource type="CanvasItemMaterial" id=1] @@ -16,32 +13,9 @@ min_value = -360.0 max_value = 360.0 _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 85.0781 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=3] -curve = SubResource( 2 ) - [sub_resource type="Curve" id=4] _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=5] -curve = SubResource( 4 ) - -[sub_resource type="ParticlesMaterial" id=6] -emission_shape = 1 -emission_sphere_radius = 8.0 -flag_disable_z = true -gravity = Vector3( 0, -26, 0 ) -angular_velocity = 1.0 -angular_velocity_curve = SubResource( 3 ) -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -linear_accel = 50.0 -linear_accel_random = 1.0 -damping = 2.0 -scale = 0.8 -scale_random = 0.3 -scale_curve = SubResource( 5 ) -color = Color( 0.859375, 0.180278, 0.0469971, 1 ) - [sub_resource type="CanvasItemMaterial" id=7] blend_mode = 1 particles_animation = true @@ -49,248 +23,172 @@ particles_anim_h_frames = 2 particles_anim_v_frames = 2 particles_anim_loop = false -[sub_resource type="ParticlesMaterial" id=8] -emission_shape = 1 -emission_sphere_radius = 75.0 -flag_disable_z = true -gravity = Vector3( 0, -26, 0 ) -angular_velocity = 1.0 -angular_velocity_curve = SubResource( 3 ) -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -linear_accel_random = 1.0 -damping = 2.0 -scale = 0.5 -scale_curve = SubResource( 5 ) -color = Color( 0, 0.67, 2, 1 ) -hue_variation = 0.05 -hue_variation_random = 1.0 -anim_offset = 1.0 -anim_offset_random = 1.0 - [sub_resource type="Gradient" id=9] colors = PoolColorArray( 1, 1, 1, 0.806627, 1, 1, 1, 0 ) -[sub_resource type="GradientTexture" id=10] -gradient = SubResource( 9 ) - -[sub_resource type="ParticlesMaterial" id=11] -emission_shape = 1 -emission_sphere_radius = 30.0 -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -angular_velocity = 20.0 -angular_velocity_random = 1.0 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -radial_accel = 50.0 -damping = 20.0 -damping_random = 0.2 -angle = 360.0 -angle_random = 1.0 -color_ramp = SubResource( 10 ) - [sub_resource type="CanvasItemMaterial" id=12] blend_mode = 1 +[sub_resource type="Curve" id=15] +_data = [ Vector2( 0, 0.510742 ), 0.0, 0.0, 0, 0, Vector2( 1, 1 ), 0.0, 0.0, 0, 0 ] + [sub_resource type="Gradient" id=13] offsets = PoolRealArray( 0, 0.0769231, 0.16568, 0.266272, 0.378698, 0.491124, 0.609467, 0.704142, 0.804734, 0.911243, 1 ) colors = PoolColorArray( 1, 1, 1, 1, 1, 0.152961, 0, 1, 1, 0.726562, 0, 1, 0.78125, 1, 0, 1, 0.289062, 1, 0, 1, 0, 1, 0.472656, 1, 0, 1, 0.835938, 1, 0, 0.71875, 1, 1, 0.21875, 0, 1, 1, 1, 0, 0.773438, 1, 1, 1, 1, 1 ) -[sub_resource type="GradientTexture" id=14] -gradient = SubResource( 13 ) - -[sub_resource type="Curve" id=15] -_data = [ Vector2( 0, 0.510742 ), 0.0, 0.0, 0, 0, Vector2( 1, 1 ), 0.0, 0.0, 0, 0 ] - -[sub_resource type="CurveTexture" id=16] -curve = SubResource( 15 ) - -[sub_resource type="Curve" id=17] -_data = [ Vector2( 0, 0.961914 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] - -[sub_resource type="CurveTexture" id=18] -curve = SubResource( 17 ) - -[sub_resource type="ParticlesMaterial" id=19] -trail_divisor = 32 -trail_size_modifier = SubResource( 18 ) -emission_shape = 1 -emission_sphere_radius = 4.0 -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -angular_velocity = 100.0 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -tangential_accel = 100.0 -angle = 360.0 -angle_random = 1.0 -scale = 3.0 -scale_curve = SubResource( 16 ) -color_ramp = SubResource( 14 ) -hue_variation = 1.0 -hue_variation_random = 1.0 - [sub_resource type="CanvasItemMaterial" id=20] blend_mode = 1 -[sub_resource type="Gradient" id=21] -offsets = PoolRealArray( 0, 0.171598, 0.301775, 0.390533, 1 ) -colors = PoolColorArray( 1, 0.63501, 0.28125, 1, 1, 0.398438, 0, 1, 0.679688, 0.277451, 0.169922, 0.232039, 0.515625, 0.362454, 0.199402, 0.0784314, 1, 1, 1, 0.0839033 ) - -[sub_resource type="GradientTexture" id=22] -gradient = SubResource( 21 ) - [sub_resource type="Curve" id=23] max_value = 50.0 _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.0180711, 0 ), 74.6314, 74.6314, 0, 0, Vector2( 0.0392147, 40.9884 ), 0.0, 0.0, 0, 0, Vector2( 1, 50 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=24] -curve = SubResource( 23 ) - [sub_resource type="Curve" id=25] max_value = 2.0 _data = [ Vector2( 0, 0 ), 0.0, 1.78215, 0, 0, Vector2( 0.282731, 1.17848 ), -1.56917, 21.2492, 0, 0, Vector2( 0.311895, 2 ), 1.46231, 0.0, 0, 0, Vector2( 1, 2 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="CurveTexture" id=26] -curve = SubResource( 25 ) - -[sub_resource type="ParticlesMaterial" id=27] -emission_shape = 2 -emission_box_extents = Vector3( 10, 10, 40 ) -flag_rotate_y = true -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -angular_velocity = 26.0 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -radial_accel = 1.0 -radial_accel_random = 0.3 -radial_accel_curve = SubResource( 24 ) -damping = 10.0 -scale_curve = SubResource( 26 ) -color_ramp = SubResource( 22 ) - -[sub_resource type="ParticlesMaterial" id=28] -emission_shape = 3 -emission_point_texture = ExtResource( 4 ) -emission_point_count = 10554 -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -angular_velocity = 1.47136e-43 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -scale = 0.5 -scale_random = 1.0 -color = Color( 1, 0.550781, 0.550781, 1 ) - -[sub_resource type="ParticlesMaterial" id=29] -emission_shape = 3 -emission_point_texture = ExtResource( 5 ) -emission_point_count = 1288 -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 1.0 -angular_velocity = 1.47136e-43 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -scale = 0.5 -scale_random = 1.0 -color = Color( 0.375, 0.692383, 1, 1 ) - -[sub_resource type="ParticlesMaterial" id=30] -emission_shape = 4 -emission_point_texture = ExtResource( 5 ) -emission_normal_texture = ExtResource( 6 ) -emission_point_count = 1288 -flag_disable_z = true -gravity = Vector3( 0, 0, 0 ) -initial_velocity = 20.0 -angular_velocity = 1.47136e-43 -orbit_velocity = 0.0 -orbit_velocity_random = 0.0 -scale = 0.5 -scale_random = 1.0 -color = Color( 0.214844, 1, 0.392731, 1 ) +[sub_resource type="Gradient" id=21] +offsets = PoolRealArray( 0, 0.171598, 0.301775, 0.390533, 1 ) +colors = PoolColorArray( 1, 0.63501, 0.28125, 1, 1, 0.398438, 0, 1, 0.679688, 0.277451, 0.169922, 0.232039, 0.515625, 0.362454, 0.199402, 0.0784314, 1, 1, 1, 0.0839033 ) [node name="Particles" type="Node"] -[node name="Fire" type="Particles2D" parent="."] +[node name="Fire" type="CPUParticles2D" parent="."] material = SubResource( 1 ) position = Vector2( 122, 502 ) amount = 32 preprocess = 0.1 -process_material = SubResource( 6 ) texture = ExtResource( 1 ) +emission_shape = 1 +emission_sphere_radius = 8.0 +gravity = Vector2( 0, -26 ) +angular_velocity = 1.0 +angular_velocity_curve = SubResource( 2 ) +linear_accel = 50.0 +linear_accel_random = 1.0 +damping = 2.0 +scale_amount_curve = SubResource( 4 ) +color = Color( 0.859375, 0.180278, 0.0469971, 1 ) -[node name="Flipbook" type="Particles2D" parent="."] +[node name="Flipbook" type="CPUParticles2D" parent="."] material = SubResource( 7 ) position = Vector2( 392, 215 ) amount = 20 lifetime = 3.0 preprocess = 0.1 -process_material = SubResource( 8 ) texture = ExtResource( 7 ) +emission_shape = 1 +emission_sphere_radius = 75.0 +gravity = Vector2( 0, -26 ) +angular_velocity = 1.0 +angular_velocity_curve = SubResource( 2 ) +linear_accel_random = 1.0 +damping = 2.0 +scale_amount_curve = SubResource( 4 ) +color = Color( 0, 0.67, 2, 1 ) +hue_variation = 0.05 +hue_variation_random = 1.0 +anim_offset = 1.0 +anim_offset_random = 1.0 __meta__ = { "_editor_description_": "Flipbook animation requires setting a custom CanvasItemMaterial with Particles Animation enabled." } -[node name="Smoke" type="Particles2D" parent="."] +[node name="Smoke" type="CPUParticles2D" parent="."] position = Vector2( 362, 502 ) amount = 32 lifetime = 2.0 preprocess = 0.1 -process_material = SubResource( 11 ) texture = ExtResource( 2 ) +emission_shape = 1 +emission_sphere_radius = 30.0 +gravity = Vector2( 0, 0 ) +initial_velocity = 1.0 +angular_velocity = 20.0 +angular_velocity_random = 1.0 +radial_accel = 50.0 +damping = 20.0 +damping_random = 0.2 +angle = 360.0 +angle_random = 1.0 +color_ramp = SubResource( 9 ) -[node name="Magic" type="Particles2D" parent="."] +[node name="Magic" type="CPUParticles2D" parent="."] material = SubResource( 12 ) position = Vector2( 620, 440 ) amount = 64 lifetime = 2.0 preprocess = 0.1 randomness = 1.0 -process_material = SubResource( 19 ) texture = ExtResource( 3 ) +emission_shape = 1 +emission_sphere_radius = 4.0 +gravity = Vector2( 0, 0 ) +initial_velocity = 1.0 +angular_velocity = 100.0 +tangential_accel = 100.0 +angle = 360.0 +angle_random = 1.0 +scale_amount_curve = SubResource( 15 ) +color_ramp = SubResource( 13 ) +hue_variation = 1.0 +hue_variation_random = 1.0 -[node name="Explosion" type="Particles2D" parent="."] +[node name="Explosion" type="CPUParticles2D" parent="."] material = SubResource( 20 ) position = Vector2( 613.467, 182.62 ) rotation = 3.13794 amount = 16 lifetime = 2.0 explosiveness = 1.0 -process_material = SubResource( 27 ) texture = ExtResource( 2 ) +emission_shape = 2 +emission_rect_extents = Vector2( 10, 10 ) +initial_velocity = 1.0 +angular_velocity = 26.0 +radial_accel = 1.0 +radial_accel_random = 0.3 +radial_accel_curve = SubResource( 23 ) +damping = 10.0 +scale_amount_curve = SubResource( 25 ) +color_ramp = SubResource( 21 ) -[node name="EmitMask" type="Particles2D" parent="."] +[node name="EmitMask" type="CPUParticles2D" parent="."] position = Vector2( 42, -68 ) amount = 180 lifetime = 0.2 -visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 ) -process_material = SubResource( 28 ) texture = ExtResource( 3 ) +emission_shape = 3 +emission_points = PoolVector2Array( ) +emission_colors = PoolColorArray( ) +gravity = Vector2( 0, 0 ) +initial_velocity = 1.0 +color = Color( 0.375, 0.692383, 1, 1 ) -[node name="OutlineMask" type="Particles2D" parent="."] +[node name="OutlineMask" type="CPUParticles2D" parent="."] position = Vector2( 42, 52 ) amount = 180 lifetime = 0.2 -visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 ) -process_material = SubResource( 29 ) texture = ExtResource( 3 ) +emission_shape = 3 +emission_points = PoolVector2Array( ) +emission_colors = PoolColorArray( ) +gravity = Vector2( 0, 0 ) +initial_velocity = 1.0 +color = Color( 0.375, 0.692383, 1, 1 ) -[node name="DirectionMask" type="Particles2D" parent="."] +[node name="DirectionMask" type="CPUParticles2D" parent="."] position = Vector2( 40, 180 ) amount = 180 lifetime = 0.2 -visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 ) -process_material = SubResource( 30 ) texture = ExtResource( 3 ) +emission_shape = 4 +emission_points = PoolVector2Array( ) +emission_normals = PoolVector2Array( ) +emission_colors = PoolColorArray( ) +gravity = Vector2( 0, 0 ) +initial_velocity = 20.0 +color = Color( 0.214844, 1, 0.392731, 1 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 512, 300 ) -current = true diff --git a/2d/physics_platformer/audio/sound_coin.wav.import b/2d/physics_platformer/audio/sound_coin.wav.import index 02be70a..981fcac 100644 --- a/2d/physics_platformer/audio/sound_coin.wav.import +++ b/2d/physics_platformer/audio/sound_coin.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/physics_platformer/audio/sound_explode.wav.import b/2d/physics_platformer/audio/sound_explode.wav.import index 52a56ab..3c571f1 100644 --- a/2d/physics_platformer/audio/sound_explode.wav.import +++ b/2d/physics_platformer/audio/sound_explode.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/physics_platformer/audio/sound_hit.wav.import b/2d/physics_platformer/audio/sound_hit.wav.import index cd0f653..08b6901 100644 --- a/2d/physics_platformer/audio/sound_hit.wav.import +++ b/2d/physics_platformer/audio/sound_hit.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/physics_platformer/audio/sound_jump.wav.import b/2d/physics_platformer/audio/sound_jump.wav.import index b0bb11e..d5ccf42 100644 --- a/2d/physics_platformer/audio/sound_jump.wav.import +++ b/2d/physics_platformer/audio/sound_jump.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/physics_platformer/audio/sound_shoot.wav.import b/2d/physics_platformer/audio/sound_shoot.wav.import index 34d93e7..d9ed610 100644 --- a/2d/physics_platformer/audio/sound_shoot.wav.import +++ b/2d/physics_platformer/audio/sound_shoot.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/physics_platformer/platform/moving_platform.gd b/2d/physics_platformer/platform/moving_platform.gd index caa59ac..6d12ea2 100644 --- a/2d/physics_platformer/platform/moving_platform.gd +++ b/2d/physics_platformer/platform/moving_platform.gd @@ -13,5 +13,8 @@ func _physics_process(delta): var d = sin(accum) var xf = Transform2D() - xf[2]= motion * d + #xf[2] = motion * d + + xf.origin = motion * d + ($Platform as RigidBody2D).transform = xf diff --git a/2d/physics_platformer/player/player.gd b/2d/physics_platformer/player/player.gd index b4da1bc..971d1e5 100644 --- a/2d/physics_platformer/player/player.gd +++ b/2d/physics_platformer/player/player.gd @@ -50,7 +50,7 @@ var Enemy = preload("res://enemy/Enemy.tscn") onready var sound_jump = $SoundJump onready var sound_shoot = $SoundShoot onready var sprite = $Sprite -onready var sprite_smoke = sprite.get_node(@"Smoke") +onready var sprite_smoke = sprite.get_node("Smoke") onready var animation_player = $AnimationPlayer onready var bullet_shoot = $BulletShoot diff --git a/2d/physics_platformer/project.pandemonium b/2d/physics_platformer/project.pandemonium index 2af3515..f8628d4 100644 --- a/2d/physics_platformer/project.pandemonium +++ b/2d/physics_platformer/project.pandemonium @@ -10,28 +10,28 @@ config_version=4 _global_script_classes=[ { "base": "RigidBody2D", -"class": "Bullet", -"language": "GDScript", +"class": @"Bullet", +"language": @"GDScript", "path": "res://player/bullet.gd" }, { "base": "Area2D", -"class": "Coin", -"language": "GDScript", +"class": @"Coin", +"language": @"GDScript", "path": "res://coin/coin.gd" }, { "base": "RigidBody2D", -"class": "Enemy", -"language": "GDScript", +"class": @"Enemy", +"language": @"GDScript", "path": "res://enemy/enemy.gd" }, { "base": "Node2D", -"class": "MovingPlatform", -"language": "GDScript", +"class": @"MovingPlatform", +"language": @"GDScript", "path": "res://platform/moving_platform.gd" }, { "base": "RigidBody2D", -"class": "Player", -"language": "GDScript", +"class": @"Player", +"language": @"GDScript", "path": "res://player/player.gd" } ] _global_script_class_icons={ @@ -154,7 +154,6 @@ mipmap_policy=1 [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=1 2d/snapping/use_gpu_pixel_snap=true diff --git a/2d/physics_tests/project.pandemonium b/2d/physics_tests/project.pandemonium index 5421cee..5fbfe3f 100644 --- a/2d/physics_tests/project.pandemonium +++ b/2d/physics_tests/project.pandemonium @@ -10,18 +10,18 @@ config_version=4 _global_script_classes=[ { "base": "MenuButton", -"class": "OptionMenu", -"language": "GDScript", +"class": @"OptionMenu", +"language": @"GDScript", "path": "res://utils/option_menu.gd" }, { "base": "Node2D", -"class": "Test", -"language": "GDScript", +"class": @"Test", +"language": @"GDScript", "path": "res://test.gd" }, { "base": "Test", -"class": "TestCharacter", -"language": "GDScript", +"class": @"TestCharacter", +"language": @"GDScript", "path": "res://tests/functional/test_character.gd" } ] _global_script_class_icons={ @@ -47,10 +47,6 @@ config/icon="res://icon.png" Log="*res://utils/system_log.gd" System="*res://utils/system.gd" -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/dpi/allow_hidpi=true @@ -125,7 +121,6 @@ limits/message_queue/max_size_kb=10240 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.184314, 0.184314, 0.184314, 1 ) diff --git a/2d/physics_tests/tests/functional/test_joints.gd b/2d/physics_tests/tests/functional/test_joints.gd index b0f54f7..cdefeb4 100644 --- a/2d/physics_tests/tests/functional/test_joints.gd +++ b/2d/physics_tests/tests/functional/test_joints.gd @@ -31,7 +31,7 @@ func _ready(): for joint_index in range(joints.get_child_count()): var joint_node = joints.get_child(joint_index) joint_node.visible = false - var joint_name = joint_node.name + var joint_name = str(joint_node.name) var joint_short = joint_name.substr(0, joint_name.length() - 7) var option_name = OPTION_JOINT_TYPE % [joint_short, joint_index + 1] options.add_menu_item(option_name) diff --git a/2d/platformer/assets/audio/sfx/coin_pickup.wav.import b/2d/platformer/assets/audio/sfx/coin_pickup.wav.import index 63842c3..f00d9ec 100644 --- a/2d/platformer/assets/audio/sfx/coin_pickup.wav.import +++ b/2d/platformer/assets/audio/sfx/coin_pickup.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/platformer/assets/audio/sfx/explode.wav.import b/2d/platformer/assets/audio/sfx/explode.wav.import index 34d8239..6505ca6 100644 --- a/2d/platformer/assets/audio/sfx/explode.wav.import +++ b/2d/platformer/assets/audio/sfx/explode.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/platformer/assets/audio/sfx/hit.wav.import b/2d/platformer/assets/audio/sfx/hit.wav.import index d40ca4f..8561a86 100644 --- a/2d/platformer/assets/audio/sfx/hit.wav.import +++ b/2d/platformer/assets/audio/sfx/hit.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/platformer/assets/audio/sfx/jump.wav.import b/2d/platformer/assets/audio/sfx/jump.wav.import index 16d6001..e600fa3 100644 --- a/2d/platformer/assets/audio/sfx/jump.wav.import +++ b/2d/platformer/assets/audio/sfx/jump.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/platformer/assets/audio/sfx/shoot.wav.import b/2d/platformer/assets/audio/sfx/shoot.wav.import index 8a0eeb6..7424312 100644 --- a/2d/platformer/assets/audio/sfx/shoot.wav.import +++ b/2d/platformer/assets/audio/sfx/shoot.wav.import @@ -17,5 +17,7 @@ force/max_rate=false force/max_rate_hz=44100 edit/trim=true edit/normalize=true -edit/loop=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 compress/mode=0 diff --git a/2d/platformer/assets/theme/user_interface.tres b/2d/platformer/assets/theme/user_interface.tres index 502b933..959eba0 100644 --- a/2d/platformer/assets/theme/user_interface.tres +++ b/2d/platformer/assets/theme/user_interface.tres @@ -2,6 +2,10 @@ [ext_resource path="res://assets/theme/fonts/kenney_mini_square.tres" type="DynamicFontData" id=1] +[sub_resource type="DynamicFont" id=6] +size = 30 +font_data = ExtResource( 1 ) + [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 6.0 content_margin_right = 6.0 @@ -62,10 +66,6 @@ border_width_right = 1 border_width_bottom = 1 border_color = Color( 0.41, 0.61, 0.91, 1 ) -[sub_resource type="DynamicFont" id=6] -size = 30 -font_data = ExtResource( 1 ) - [resource] default_font = SubResource( 6 ) Button/colors/font_color = Color( 0.8, 0.8075, 0.8275, 1 ) @@ -75,7 +75,7 @@ Button/colors/font_color_pressed = Color( 0.411765, 0.611765, 0.909804, 1 ) Button/colors/icon_color_hover = Color( 1.15, 1.15, 1.15, 1 ) Button/colors/icon_color_pressed = Color( 0.4715, 0.7015, 1.0465, 1 ) Button/constants/hseparation = 2 -Button/fonts/font = null +Button/fonts/font = SubResource( 6 ) Button/styles/disabled = SubResource( 1 ) Button/styles/focus = SubResource( 2 ) Button/styles/hover = SubResource( 3 ) diff --git a/2d/platformer/project.pandemonium b/2d/platformer/project.pandemonium index 03d7a65..84c0552 100644 --- a/2d/platformer/project.pandemonium +++ b/2d/platformer/project.pandemonium @@ -10,33 +10,33 @@ config_version=4 _global_script_classes=[ { "base": "KinematicBody2D", -"class": "Actor", -"language": "GDScript", +"class": @"Actor", +"language": @"GDScript", "path": "res://src/Actors/Actor.gd" }, { "base": "RigidBody2D", -"class": "Bullet", -"language": "GDScript", +"class": @"Bullet", +"language": @"GDScript", "path": "res://src/Objects/Bullet.gd" }, { "base": "Area2D", -"class": "Coin", -"language": "GDScript", +"class": @"Coin", +"language": @"GDScript", "path": "res://src/Objects/Coin.gd" }, { "base": "Actor", -"class": "Enemy", -"language": "GDScript", +"class": @"Enemy", +"language": @"GDScript", "path": "res://src/Actors/Enemy.gd" }, { "base": "Position2D", -"class": "Gun", -"language": "GDScript", +"class": @"Gun", +"language": @"GDScript", "path": "res://src/Actors/Gun.gd" }, { "base": "Actor", -"class": "Player", -"language": "GDScript", +"class": @"Player", +"language": @"GDScript", "path": "res://src/Actors/Player.gd" } ] _global_script_class_icons={ @@ -240,7 +240,6 @@ mipmap_policy=1 [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=1 2d/snapping/use_gpu_pixel_snap=true diff --git a/2d/platformer/src/Actors/Player.gd b/2d/platformer/src/Actors/Player.gd index 9265adc..81d5f03 100644 --- a/2d/platformer/src/Actors/Player.gd +++ b/2d/platformer/src/Actors/Player.gd @@ -14,7 +14,7 @@ onready var animation_player = $AnimationPlayer onready var shoot_timer = $ShootAnimation onready var sprite = $Sprite onready var sound_jump = $Jump -onready var gun = sprite.get_node(@"Gun") +onready var gun = sprite.get_node("Gun") func _ready(): diff --git a/2d/platformer/src/UserInterface/CoinsCounter.gd b/2d/platformer/src/UserInterface/CoinsCounter.gd index cf3f76a..ca7728f 100644 --- a/2d/platformer/src/UserInterface/CoinsCounter.gd +++ b/2d/platformer/src/UserInterface/CoinsCounter.gd @@ -12,11 +12,11 @@ func _ready(): anim_sprite.play() # Check if the game is in splitscreen mode by checking the scene root name. if get_tree().get_root().get_child(0).name == "Splitscreen": - var _level_node = get_node(@"../../../../Black/SplitContainer/ViewportContainer1/Viewport1/Level") + var _level_node = get_node("../../../../Black/SplitContainer/ViewportContainer1/Viewport1/Level") _level_node.get_node("Player1").connect("collect_coin", self, "_collect_coin") _level_node.get_node("Player2").connect("collect_coin", self, "_collect_coin") else: - var _player_path = get_node(@"../../../../Level/Player") + var _player_path = get_node("../../../../Level/Player") _player_path.connect("collect_coin", self, "_collect_coin") diff --git a/2d/platformer/src/UserInterface/PauseMenu.gd b/2d/platformer/src/UserInterface/PauseMenu.gd index 587b8da..394c984 100644 --- a/2d/platformer/src/UserInterface/PauseMenu.gd +++ b/2d/platformer/src/UserInterface/PauseMenu.gd @@ -7,7 +7,7 @@ export(float) var fade_in_duration = 0.3 export(float) var fade_out_duration = 0.2 onready var center_cont = $ColorRect/CenterContainer -onready var resume_button = center_cont.get_node(@"VBoxContainer/ResumeButton") +onready var resume_button = center_cont.get_node("VBoxContainer/ResumeButton") onready var root = get_tree().get_root() onready var scene_root = root.get_child(root.get_child_count() - 1) diff --git a/2d/pong/pong.tscn b/2d/pong/pong.tscn index 75ea9f8..0c74094 100644 --- a/2d/pong/pong.tscn +++ b/2d/pong/pong.tscn @@ -97,7 +97,6 @@ shape = SubResource( 4 ) [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 320, 200 ) -current = true [connection signal="area_entered" from="Left" to="Left" method="_on_area_entered"] [connection signal="area_entered" from="Right" to="Right" method="_on_area_entered"] diff --git a/2d/pong/project.pandemonium b/2d/pong/project.pandemonium index 7c200dd..b80824c 100644 --- a/2d/pong/project.pandemonium +++ b/2d/pong/project.pandemonium @@ -64,7 +64,6 @@ right_move_up={ [rendering] -quality/driver/driver_name="GLES2" 2d/snapping/use_gpu_pixel_snap=true vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/role_playing_game/Game.tscn b/2d/role_playing_game/Game.tscn index 1278848..7d031bc 100644 --- a/2d/role_playing_game/Game.tscn +++ b/2d/role_playing_game/Game.tscn @@ -45,4 +45,3 @@ visible = false [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 640, 360 ) -current = true diff --git a/2d/role_playing_game/project.pandemonium b/2d/role_playing_game/project.pandemonium index 1420a69..7c0e587 100644 --- a/2d/role_playing_game/project.pandemonium +++ b/2d/role_playing_game/project.pandemonium @@ -10,13 +10,13 @@ config_version=4 _global_script_classes=[ { "base": "Node", -"class": "Combatant", -"language": "GDScript", +"class": @"Combatant", +"language": @"GDScript", "path": "res://combat/combatants/Combatant.gd" }, { "base": "Node2D", -"class": "Pawn", -"language": "GDScript", +"class": @"Pawn", +"language": @"GDScript", "path": "res://grid_movement/pawns/Pawn.gd" } ] _global_script_class_icons={ @@ -78,6 +78,5 @@ ui_down={ [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/skeleton/level/level.gd b/2d/skeleton/level/level.gd index 5fdfeb7..b8d37e4 100644 --- a/2d/skeleton/level/level.gd +++ b/2d/skeleton/level/level.gd @@ -8,7 +8,7 @@ const LIMIT_BOTTOM = 690 func _ready(): for child in get_children(): if child is Player: - var camera = child.get_node(@"Camera2D") + var camera = child.get_node("Camera2D") camera.limit_left = LIMIT_LEFT camera.limit_top = LIMIT_TOP camera.limit_right = LIMIT_RIGHT diff --git a/2d/skeleton/project.pandemonium b/2d/skeleton/project.pandemonium index 46078b5..82cf08e 100644 --- a/2d/skeleton/project.pandemonium +++ b/2d/skeleton/project.pandemonium @@ -10,8 +10,8 @@ config_version=4 _global_script_classes=[ { "base": "KinematicBody2D", -"class": "Player", -"language": "GDScript", +"class": @"Player", +"language": @"GDScript", "path": "res://player/player.gd" } ] _global_script_class_icons={ @@ -86,7 +86,6 @@ limits/debugger_stdout/max_chars_per_second=1000000 [rendering] -quality/driver/driver_name="GLES2" 2d/snapping/use_gpu_pixel_snap=true vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/sprite_shaders/project.pandemonium b/2d/sprite_shaders/project.pandemonium index 08aee46..5bb3e2d 100644 --- a/2d/sprite_shaders/project.pandemonium +++ b/2d/sprite_shaders/project.pandemonium @@ -24,6 +24,5 @@ window/stretch/aspect="expand" [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false diff --git a/2d/sprite_shaders/sprite_shaders.tscn b/2d/sprite_shaders/sprite_shaders.tscn index d77c7f7..8527a1e 100644 --- a/2d/sprite_shaders/sprite_shaders.tscn +++ b/2d/sprite_shaders/sprite_shaders.tscn @@ -125,4 +125,3 @@ texture = ExtResource( 2 ) region_rect = Rect2( 141, 115, 39, 6 ) [node name="Camera2D" type="Camera2D" parent="."] -current = true diff --git a/2d/tween/main.gd b/2d/tween/main.gd index d3654ab..a9054b1 100644 --- a/2d/tween/main.gd +++ b/2d/tween/main.gd @@ -20,14 +20,14 @@ onready var follow = $Top/Area/Follow onready var follow_2 = $Top/Area/Follow2 onready var size = $Top/Area.get_size() -onready var move_mode = modes_vbox.get_node(@"Move") -onready var color_mode = modes_vbox.get_node(@"Color") -onready var scale_mode = modes_vbox.get_node(@"Scale") -onready var rotate_mode = modes_vbox.get_node(@"Rotate") -onready var callback_mode = modes_vbox.get_node(@"Callback") -onready var follow_mode = modes_vbox.get_node(@"Follow") -onready var repeat_mode = modes_vbox.get_node(@"Repeat") -onready var paused_mode = modes_vbox.get_node(@"Pause") +onready var move_mode = modes_vbox.get_node("Move") +onready var color_mode = modes_vbox.get_node("Color") +onready var scale_mode = modes_vbox.get_node("Scale") +onready var rotate_mode = modes_vbox.get_node("Rotate") +onready var callback_mode = modes_vbox.get_node("Callback") +onready var follow_mode = modes_vbox.get_node("Follow") +onready var repeat_mode = modes_vbox.get_node("Repeat") +onready var paused_mode = modes_vbox.get_node("Pause") func _ready(): for index in range(trans_list.size()): @@ -44,7 +44,7 @@ func _ready(): for node in [trans_vbox, eases_vbox, modes_vbox]: node.get_child(1).set_pressed(true) - modes_vbox.get_node(@"Repeat").set_pressed(true) + modes_vbox.get_node("Repeat").set_pressed(true) reset_tween() diff --git a/2d/tween/project.pandemonium b/2d/tween/project.pandemonium index 7abdbea..35b6c25 100644 --- a/2d/tween/project.pandemonium +++ b/2d/tween/project.pandemonium @@ -16,10 +16,6 @@ run/main_scene="res://main.tscn" config/icon="res://icon.png" target_fps=60 -[debug] - -gdscript/warnings/return_value_discarded=false - [display] window/size/height=800 @@ -39,7 +35,6 @@ multithread/thread_rid_pool_prealloc=60 [rendering] -quality/driver/driver_name="GLES2" vram_compression/import_etc=true vram_compression/import_etc2=false environment/default_clear_color=Color( 0.2349, 0.2349, 0.27, 1 ) diff --git a/loading/multiple_threads_loading/resource_queue.gd b/loading/multiple_threads_loading/resource_queue.gd index bb0a728..0dc95bd 100644 --- a/loading/multiple_threads_loading/resource_queue.gd +++ b/loading/multiple_threads_loading/resource_queue.gd @@ -81,7 +81,7 @@ func is_ready(path): func _wait_for_resource(res, path): _unlock("wait_for_resource") while true: - VisualServer.sync() + RenderingServer.sync() OS.delay_usec(16000) # Wait approximately 1 frame. _lock("wait_for_resource") if queue.size() == 0 or queue[0] != res: diff --git a/misc/os_test/os_test.gd b/misc/os_test/os_test.gd index 5265bc2..97adee7 100644 --- a/misc/os_test/os_test.gd +++ b/misc/os_test/os_test.gd @@ -110,8 +110,8 @@ func _ready(): add_line("Model name", OS.get_model_name()) add_line("Processor count", OS.get_processor_count()) add_line("Device unique ID", OS.get_unique_id()) - add_line("Video adapter name", VisualServer.get_video_adapter_name()) - add_line("Video adapter vendor", VisualServer.get_video_adapter_vendor()) + add_line("Video adapter name", RenderingServer.get_video_adapter_name()) + add_line("Video adapter vendor", RenderingServer.get_video_adapter_vendor()) add_header("Input") add_line("Latin keyboard variant", OS.get_latin_keyboard_variant()) diff --git a/plugins/addons/material_creator/material_creator.gd b/plugins/addons/material_creator/material_creator.gd index 992309c..6bb0ff4 100644 --- a/plugins/addons/material_creator/material_creator.gd +++ b/plugins/addons/material_creator/material_creator.gd @@ -12,7 +12,7 @@ func _ready(): get_node("VBoxContainer/LoadButton").connect("pressed", self, "load_pressed") get_node("SaveMaterialDialog").connect("file_selected", self, "save_file_selected") get_node("LoadMaterialDialog").connect("file_selected", self, "load_file_selected") - VisualServer.canvas_item_set_clip(get_canvas_item(), true) + RenderingServer.canvas_item_set_clip(get_canvas_item(), true) func save_pressed(): diff --git a/viewport/dynamic_split_screen/camera_controller.gd b/viewport/dynamic_split_screen/camera_controller.gd index 5bdcba1..9b30fef 100644 --- a/viewport/dynamic_split_screen/camera_controller.gd +++ b/viewport/dynamic_split_screen/camera_controller.gd @@ -29,8 +29,8 @@ onready var player2 = $"../Player2" onready var view = $View onready var viewport1 = $Viewport1 onready var viewport2 = $Viewport2 -onready var camera1 = viewport1.get_node(@"Camera1") -onready var camera2 = viewport2.get_node(@"Camera2") +onready var camera1 = viewport1.get_node("Camera1") +onready var camera2 = viewport2.get_node("Camera2") func _ready(): diff --git a/viewport/screen_capture/screen_capture.gd b/viewport/screen_capture/screen_capture.gd index cc0c51d..4ef907a 100644 --- a/viewport/screen_capture/screen_capture.gd +++ b/viewport/screen_capture/screen_capture.gd @@ -5,7 +5,7 @@ onready var captured_image = $CapturedImage func _on_CaptureButton_pressed(): get_viewport().set_clear_mode(Viewport.CLEAR_MODE_ONLY_NEXT_FRAME) # Wait until the frame has finished before getting the texture. - yield(VisualServer, "frame_post_draw") + yield(RenderingServer, "frame_post_draw") # Retrieve the captured image. var img = get_viewport().get_texture().get_data()