Make sure everything works under the 2d folder.

This commit is contained in:
Relintai 2023-04-06 21:19:37 +02:00
parent 535f1a3316
commit a5c0194b60
61 changed files with 210 additions and 339 deletions

View File

@ -32,7 +32,6 @@ common/enable_pause_aware_picking=true
[rendering] [rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=0 quality/intended_usage/framebuffer_allocation.mobile=0
vram_compression/import_etc=true vram_compression/import_etc=true

View File

@ -9,7 +9,7 @@
animations = [ { animations = [ {
"frames": [ ExtResource( 3 ), ExtResource( 4 ) ], "frames": [ ExtResource( 3 ), ExtResource( 4 ) ],
"loop": true, "loop": true,
"name": "default", "name": @"default",
"speed": 5.0 "speed": 5.0
} ] } ]

View File

@ -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://Player.gd" type="Script" id=1]
[ext_resource path="res://art/playerGrey_walk1.png" type="Texture" id=2] [ext_resource path="res://art/playerGrey_walk1.png" type="Texture" id=2]
@ -10,12 +10,12 @@
animations = [ { animations = [ {
"frames": [ ExtResource( 2 ), ExtResource( 3 ) ], "frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
"loop": true, "loop": true,
"name": "right", "name": @"right",
"speed": 5.0 "speed": 5.0
}, { }, {
"frames": [ ExtResource( 4 ), ExtResource( 5 ) ], "frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
"loop": true, "loop": true,
"name": "up", "name": @"up",
"speed": 5.0 "speed": 5.0
} ] } ]
@ -23,27 +23,11 @@ animations = [ {
radius = 26.1701 radius = 26.1701
height = 14.822 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] [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 ] _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] [sub_resource type="Gradient" id=3]
curve = SubResource( 5 ) colors = PoolColorArray( 1, 1, 1, 0.501961, 1, 1, 1, 0 )
[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 )
[node name="Player" type="Area2D"] [node name="Player" type="Area2D"]
z_index = 10 z_index = 10
@ -55,17 +39,20 @@ __meta__ = {
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
frames = SubResource( 1 ) frames = SubResource( 1 )
animation = "right" animation = @"right"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 2 ) shape = SubResource( 2 )
[node name="Trail" type="Particles2D" parent="."] [node name="Trail" type="CPUParticles2D" parent="."]
z_index = -1 z_index = -1
amount = 10 amount = 10
speed_scale = 2.0 speed_scale = 2.0
local_coords = false local_coords = false
process_material = SubResource( 7 )
texture = ExtResource( 2 ) 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"] [connection signal="body_entered" from="." to="." method="_on_Player_body_entered"]

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -21,8 +21,8 @@ margin_bottom = -730.0
rect_clip_content = false rect_clip_content = false
mouse_filter = 2 mouse_filter = 2
size_flags_vertical = 4 size_flags_vertical = 4
custom_fonts/bold_font = ExtResource( 5 )
custom_fonts/normal_font = ExtResource( 2 ) custom_fonts/normal_font = ExtResource( 2 )
custom_fonts/bold_font = ExtResource( 5 )
bbcode_enabled = true bbcode_enabled = true
bbcode_text = "This example shows how to apply the State programming pattern in GDScript, including Hierarchical States, and a pushdown automaton. bbcode_text = "This example shows how to apply the State programming pattern in GDScript, including Hierarchical States, and a pushdown automaton.

View File

@ -96,6 +96,5 @@ attack={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -239,7 +239,7 @@ func _draw():
func save_picture(path): func save_picture(path):
# Wait until the frame has finished before getting the texture. # Wait until the frame has finished before getting the texture.
yield(VisualServer, "frame_post_draw") yield(RenderingServer, "frame_post_draw")
# Get the viewport image. # Get the viewport image.
var img = get_viewport().get_texture().get_data() var img = get_viewport().get_texture().get_data()

View File

@ -218,5 +218,3 @@ margin_bottom = 400.0
resizable = true resizable = true
access = 2 access = 2
filters = PoolStringArray( "*.png" ) 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/"

View File

@ -31,6 +31,5 @@ singletons=[ ]
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -1,14 +1,14 @@
extends Panel extends Panel
onready var brush_settings = $BrushSettings onready var brush_settings = $BrushSettings
onready var label_brush_size = brush_settings.get_node(@"LabelBrushSize") onready var label_brush_size = brush_settings.get_node("LabelBrushSize")
onready var label_brush_shape = brush_settings.get_node(@"LabelBrushShape") onready var label_brush_shape = brush_settings.get_node("LabelBrushShape")
onready var label_stats = $LabelStats onready var label_stats = $LabelStats
onready var label_tools = $LabelTools onready var label_tools = $LabelTools
onready var _parent = get_parent() onready var _parent = get_parent()
onready var save_dialog = _parent.get_node(@"SaveFileDialog") onready var save_dialog = _parent.get_node("SaveFileDialog")
onready var paint_control = _parent.get_node(@"PaintControl") onready var paint_control = _parent.get_node("PaintControl")
func _ready(): func _ready():
# warning-ignore-all:return_value_discarded # warning-ignore-all:return_value_discarded

View File

@ -4,7 +4,7 @@
[ext_resource path="res://ocean_beach.png" type="Texture" id=2] [ext_resource path="res://ocean_beach.png" type="Texture" id=2]
[ext_resource path="res://ocean_cave.png" type="Texture" id=3] [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 background_mode = 4
ambient_light_sky_contribution = 0.0 ambient_light_sky_contribution = 0.0
auto_exposure_enabled = true auto_exposure_enabled = true
@ -36,12 +36,11 @@ scale = Vector2( 1.2, 1 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
centered = false centered = false
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment3D" type="WorldEnvironment3D" parent="."]
environment = SubResource( 1 ) environment = SubResource( 1 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 540, 360 ) offset = Vector2( 540, 360 )
current = true
[node name="Label" type="Label" parent="."] [node name="Label" type="Label" parent="."]
margin_left = 10.0 margin_left = 10.0

View File

@ -62,7 +62,6 @@ move_up={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.172549, 0.219608, 0.129412, 1 ) environment/default_clear_color=Color( 0.172549, 0.219608, 0.129412, 1 )

View File

@ -33,7 +33,6 @@ singletons=[ ]
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 ) environment/default_clear_color=Color( 0.301961, 0.301961, 0.301961, 1 )

View File

@ -89,4 +89,3 @@ physics_material_override = SubResource( 10 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 400, 300 ) offset = Vector2( 400, 300 )
current = true

View File

@ -74,7 +74,6 @@ use_pixel_snap=true
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.0784314, 0.105882, 0.145098, 1 ) environment/default_clear_color=Color( 0.0784314, 0.105882, 0.145098, 1 )

View File

@ -70,7 +70,6 @@ multithread/thread_rid_pool_prealloc=60
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.156, 0.1325, 0.25, 1 ) environment/default_clear_color=Color( 0.156, 0.1325, 0.25, 1 )

View File

@ -265,6 +265,5 @@ shape = SubResource( 12 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 265, 247 ) offset = Vector2( 265, 247 )
current = true
[connection signal="body_entered" from="Princess" to="Princess" method="_on_body_entered"] [connection signal="body_entered" from="Princess" to="Princess" method="_on_body_entered"]

View File

@ -84,4 +84,3 @@ anims/maskmotion = SubResource( 2 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 512, 300 ) offset = Vector2( 512, 300 )
current = true

View File

@ -31,6 +31,5 @@ shadow_filter=3
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -320,4 +320,3 @@ anims/motion3 = SubResource( 7 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 400, 300 ) offset = Vector2( 400, 300 )
current = true

View File

@ -35,6 +35,5 @@ shadow_filter=2
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -27,4 +27,3 @@ offset = Vector2( 0, -26 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 420, 300 ) offset = Vector2( 420, 300 )
current = true

View File

@ -40,7 +40,6 @@ click={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.160784, 0.172549, 0.278431, 1 ) environment/default_clear_color=Color( 0.160784, 0.172549, 0.278431, 1 )

View File

@ -23,4 +23,3 @@ texture = ExtResource( 4 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 512, 300 ) offset = Vector2( 512, 300 )
current = true

View File

@ -32,6 +32,5 @@ click={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -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://fire_particle.png" type="Texture" id=1]
[ext_resource path="res://smoke_particle.png" type="Texture" id=2] [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://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] [ext_resource path="res://flipbook.png" type="Texture" id=7]
[sub_resource type="CanvasItemMaterial" id=1] [sub_resource type="CanvasItemMaterial" id=1]
@ -16,32 +13,9 @@ min_value = -360.0
max_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 ] _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] [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 ] _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] [sub_resource type="CanvasItemMaterial" id=7]
blend_mode = 1 blend_mode = 1
particles_animation = true particles_animation = true
@ -49,248 +23,172 @@ particles_anim_h_frames = 2
particles_anim_v_frames = 2 particles_anim_v_frames = 2
particles_anim_loop = false 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] [sub_resource type="Gradient" id=9]
colors = PoolColorArray( 1, 1, 1, 0.806627, 1, 1, 1, 0 ) 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] [sub_resource type="CanvasItemMaterial" id=12]
blend_mode = 1 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] [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 ) 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 ) 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] [sub_resource type="CanvasItemMaterial" id=20]
blend_mode = 1 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] [sub_resource type="Curve" id=23]
max_value = 50.0 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 ] _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] [sub_resource type="Curve" id=25]
max_value = 2.0 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 ] _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] [sub_resource type="Gradient" id=21]
curve = SubResource( 25 ) 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="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 )
[node name="Particles" type="Node"] [node name="Particles" type="Node"]
[node name="Fire" type="Particles2D" parent="."] [node name="Fire" type="CPUParticles2D" parent="."]
material = SubResource( 1 ) material = SubResource( 1 )
position = Vector2( 122, 502 ) position = Vector2( 122, 502 )
amount = 32 amount = 32
preprocess = 0.1 preprocess = 0.1
process_material = SubResource( 6 )
texture = ExtResource( 1 ) 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 ) material = SubResource( 7 )
position = Vector2( 392, 215 ) position = Vector2( 392, 215 )
amount = 20 amount = 20
lifetime = 3.0 lifetime = 3.0
preprocess = 0.1 preprocess = 0.1
process_material = SubResource( 8 )
texture = ExtResource( 7 ) 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__ = { __meta__ = {
"_editor_description_": "Flipbook animation requires setting a custom CanvasItemMaterial with Particles Animation enabled." "_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 ) position = Vector2( 362, 502 )
amount = 32 amount = 32
lifetime = 2.0 lifetime = 2.0
preprocess = 0.1 preprocess = 0.1
process_material = SubResource( 11 )
texture = ExtResource( 2 ) 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 ) material = SubResource( 12 )
position = Vector2( 620, 440 ) position = Vector2( 620, 440 )
amount = 64 amount = 64
lifetime = 2.0 lifetime = 2.0
preprocess = 0.1 preprocess = 0.1
randomness = 1.0 randomness = 1.0
process_material = SubResource( 19 )
texture = ExtResource( 3 ) 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 ) material = SubResource( 20 )
position = Vector2( 613.467, 182.62 ) position = Vector2( 613.467, 182.62 )
rotation = 3.13794 rotation = 3.13794
amount = 16 amount = 16
lifetime = 2.0 lifetime = 2.0
explosiveness = 1.0 explosiveness = 1.0
process_material = SubResource( 27 )
texture = ExtResource( 2 ) 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 ) position = Vector2( 42, -68 )
amount = 180 amount = 180
lifetime = 0.2 lifetime = 0.2
visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 )
process_material = SubResource( 28 )
texture = ExtResource( 3 ) 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 ) position = Vector2( 42, 52 )
amount = 180 amount = 180
lifetime = 0.2 lifetime = 0.2
visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 )
process_material = SubResource( 29 )
texture = ExtResource( 3 ) 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 ) position = Vector2( 40, 180 )
amount = 180 amount = 180
lifetime = 0.2 lifetime = 0.2
visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 )
process_material = SubResource( 30 )
texture = ExtResource( 3 ) 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="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 512, 300 ) offset = Vector2( 512, 300 )
current = true

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -13,5 +13,8 @@ func _physics_process(delta):
var d = sin(accum) var d = sin(accum)
var xf = Transform2D() var xf = Transform2D()
xf[2]= motion * d #xf[2] = motion * d
xf.origin = motion * d
($Platform as RigidBody2D).transform = xf ($Platform as RigidBody2D).transform = xf

View File

@ -50,7 +50,7 @@ var Enemy = preload("res://enemy/Enemy.tscn")
onready var sound_jump = $SoundJump onready var sound_jump = $SoundJump
onready var sound_shoot = $SoundShoot onready var sound_shoot = $SoundShoot
onready var sprite = $Sprite 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 animation_player = $AnimationPlayer
onready var bullet_shoot = $BulletShoot onready var bullet_shoot = $BulletShoot

View File

@ -10,28 +10,28 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "RigidBody2D", "base": "RigidBody2D",
"class": "Bullet", "class": @"Bullet",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/bullet.gd" "path": "res://player/bullet.gd"
}, { }, {
"base": "Area2D", "base": "Area2D",
"class": "Coin", "class": @"Coin",
"language": "GDScript", "language": @"GDScript",
"path": "res://coin/coin.gd" "path": "res://coin/coin.gd"
}, { }, {
"base": "RigidBody2D", "base": "RigidBody2D",
"class": "Enemy", "class": @"Enemy",
"language": "GDScript", "language": @"GDScript",
"path": "res://enemy/enemy.gd" "path": "res://enemy/enemy.gd"
}, { }, {
"base": "Node2D", "base": "Node2D",
"class": "MovingPlatform", "class": @"MovingPlatform",
"language": "GDScript", "language": @"GDScript",
"path": "res://platform/moving_platform.gd" "path": "res://platform/moving_platform.gd"
}, { }, {
"base": "RigidBody2D", "base": "RigidBody2D",
"class": "Player", "class": @"Player",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/player.gd" "path": "res://player/player.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
@ -154,7 +154,6 @@ mipmap_policy=1
[rendering] [rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=1 quality/intended_usage/framebuffer_allocation.mobile=1
2d/snapping/use_gpu_pixel_snap=true 2d/snapping/use_gpu_pixel_snap=true

View File

@ -10,18 +10,18 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "MenuButton", "base": "MenuButton",
"class": "OptionMenu", "class": @"OptionMenu",
"language": "GDScript", "language": @"GDScript",
"path": "res://utils/option_menu.gd" "path": "res://utils/option_menu.gd"
}, { }, {
"base": "Node2D", "base": "Node2D",
"class": "Test", "class": @"Test",
"language": "GDScript", "language": @"GDScript",
"path": "res://test.gd" "path": "res://test.gd"
}, { }, {
"base": "Test", "base": "Test",
"class": "TestCharacter", "class": @"TestCharacter",
"language": "GDScript", "language": @"GDScript",
"path": "res://tests/functional/test_character.gd" "path": "res://tests/functional/test_character.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
@ -47,10 +47,6 @@ config/icon="res://icon.png"
Log="*res://utils/system_log.gd" Log="*res://utils/system_log.gd"
System="*res://utils/system.gd" System="*res://utils/system.gd"
[debug]
gdscript/warnings/return_value_discarded=false
[display] [display]
window/dpi/allow_hidpi=true window/dpi/allow_hidpi=true
@ -125,7 +121,6 @@ limits/message_queue/max_size_kb=10240
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.184314, 0.184314, 0.184314, 1 ) environment/default_clear_color=Color( 0.184314, 0.184314, 0.184314, 1 )

View File

@ -31,7 +31,7 @@ func _ready():
for joint_index in range(joints.get_child_count()): for joint_index in range(joints.get_child_count()):
var joint_node = joints.get_child(joint_index) var joint_node = joints.get_child(joint_index)
joint_node.visible = false 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 joint_short = joint_name.substr(0, joint_name.length() - 7)
var option_name = OPTION_JOINT_TYPE % [joint_short, joint_index + 1] var option_name = OPTION_JOINT_TYPE % [joint_short, joint_index + 1]
options.add_menu_item(option_name) options.add_menu_item(option_name)

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100 force/max_rate_hz=44100
edit/trim=true edit/trim=true
edit/normalize=true edit/normalize=true
edit/loop=false edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0 compress/mode=0

View File

@ -2,6 +2,10 @@
[ext_resource path="res://assets/theme/fonts/kenney_mini_square.tres" type="DynamicFontData" id=1] [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] [sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 6.0 content_margin_left = 6.0
content_margin_right = 6.0 content_margin_right = 6.0
@ -62,10 +66,6 @@ border_width_right = 1
border_width_bottom = 1 border_width_bottom = 1
border_color = Color( 0.41, 0.61, 0.91, 1 ) border_color = Color( 0.41, 0.61, 0.91, 1 )
[sub_resource type="DynamicFont" id=6]
size = 30
font_data = ExtResource( 1 )
[resource] [resource]
default_font = SubResource( 6 ) default_font = SubResource( 6 )
Button/colors/font_color = Color( 0.8, 0.8075, 0.8275, 1 ) 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_hover = Color( 1.15, 1.15, 1.15, 1 )
Button/colors/icon_color_pressed = Color( 0.4715, 0.7015, 1.0465, 1 ) Button/colors/icon_color_pressed = Color( 0.4715, 0.7015, 1.0465, 1 )
Button/constants/hseparation = 2 Button/constants/hseparation = 2
Button/fonts/font = null Button/fonts/font = SubResource( 6 )
Button/styles/disabled = SubResource( 1 ) Button/styles/disabled = SubResource( 1 )
Button/styles/focus = SubResource( 2 ) Button/styles/focus = SubResource( 2 )
Button/styles/hover = SubResource( 3 ) Button/styles/hover = SubResource( 3 )

View File

@ -10,33 +10,33 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "KinematicBody2D", "base": "KinematicBody2D",
"class": "Actor", "class": @"Actor",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Actors/Actor.gd" "path": "res://src/Actors/Actor.gd"
}, { }, {
"base": "RigidBody2D", "base": "RigidBody2D",
"class": "Bullet", "class": @"Bullet",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Objects/Bullet.gd" "path": "res://src/Objects/Bullet.gd"
}, { }, {
"base": "Area2D", "base": "Area2D",
"class": "Coin", "class": @"Coin",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Objects/Coin.gd" "path": "res://src/Objects/Coin.gd"
}, { }, {
"base": "Actor", "base": "Actor",
"class": "Enemy", "class": @"Enemy",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Actors/Enemy.gd" "path": "res://src/Actors/Enemy.gd"
}, { }, {
"base": "Position2D", "base": "Position2D",
"class": "Gun", "class": @"Gun",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Actors/Gun.gd" "path": "res://src/Actors/Gun.gd"
}, { }, {
"base": "Actor", "base": "Actor",
"class": "Player", "class": @"Player",
"language": "GDScript", "language": @"GDScript",
"path": "res://src/Actors/Player.gd" "path": "res://src/Actors/Player.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
@ -240,7 +240,6 @@ mipmap_policy=1
[rendering] [rendering]
quality/driver/driver_name="GLES2"
quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation=0
quality/intended_usage/framebuffer_allocation.mobile=1 quality/intended_usage/framebuffer_allocation.mobile=1
2d/snapping/use_gpu_pixel_snap=true 2d/snapping/use_gpu_pixel_snap=true

View File

@ -14,7 +14,7 @@ onready var animation_player = $AnimationPlayer
onready var shoot_timer = $ShootAnimation onready var shoot_timer = $ShootAnimation
onready var sprite = $Sprite onready var sprite = $Sprite
onready var sound_jump = $Jump onready var sound_jump = $Jump
onready var gun = sprite.get_node(@"Gun") onready var gun = sprite.get_node("Gun")
func _ready(): func _ready():

View File

@ -12,11 +12,11 @@ func _ready():
anim_sprite.play() anim_sprite.play()
# Check if the game is in splitscreen mode by checking the scene root name. # Check if the game is in splitscreen mode by checking the scene root name.
if get_tree().get_root().get_child(0).name == "Splitscreen": 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("Player1").connect("collect_coin", self, "_collect_coin")
_level_node.get_node("Player2").connect("collect_coin", self, "_collect_coin") _level_node.get_node("Player2").connect("collect_coin", self, "_collect_coin")
else: else:
var _player_path = get_node(@"../../../../Level/Player") var _player_path = get_node("../../../../Level/Player")
_player_path.connect("collect_coin", self, "_collect_coin") _player_path.connect("collect_coin", self, "_collect_coin")

View File

@ -7,7 +7,7 @@ export(float) var fade_in_duration = 0.3
export(float) var fade_out_duration = 0.2 export(float) var fade_out_duration = 0.2
onready var center_cont = $ColorRect/CenterContainer 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 root = get_tree().get_root()
onready var scene_root = root.get_child(root.get_child_count() - 1) onready var scene_root = root.get_child(root.get_child_count() - 1)

View File

@ -97,7 +97,6 @@ shape = SubResource( 4 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 320, 200 ) offset = Vector2( 320, 200 )
current = true
[connection signal="area_entered" from="Left" to="Left" method="_on_area_entered"] [connection signal="area_entered" from="Left" to="Left" method="_on_area_entered"]
[connection signal="area_entered" from="Right" to="Right" method="_on_area_entered"] [connection signal="area_entered" from="Right" to="Right" method="_on_area_entered"]

View File

@ -64,7 +64,6 @@ right_move_up={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
2d/snapping/use_gpu_pixel_snap=true 2d/snapping/use_gpu_pixel_snap=true
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -45,4 +45,3 @@ visible = false
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2( 640, 360 ) offset = Vector2( 640, 360 )
current = true

View File

@ -10,13 +10,13 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "Node", "base": "Node",
"class": "Combatant", "class": @"Combatant",
"language": "GDScript", "language": @"GDScript",
"path": "res://combat/combatants/Combatant.gd" "path": "res://combat/combatants/Combatant.gd"
}, { }, {
"base": "Node2D", "base": "Node2D",
"class": "Pawn", "class": @"Pawn",
"language": "GDScript", "language": @"GDScript",
"path": "res://grid_movement/pawns/Pawn.gd" "path": "res://grid_movement/pawns/Pawn.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
@ -78,6 +78,5 @@ ui_down={
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -8,7 +8,7 @@ const LIMIT_BOTTOM = 690
func _ready(): func _ready():
for child in get_children(): for child in get_children():
if child is Player: if child is Player:
var camera = child.get_node(@"Camera2D") var camera = child.get_node("Camera2D")
camera.limit_left = LIMIT_LEFT camera.limit_left = LIMIT_LEFT
camera.limit_top = LIMIT_TOP camera.limit_top = LIMIT_TOP
camera.limit_right = LIMIT_RIGHT camera.limit_right = LIMIT_RIGHT

View File

@ -10,8 +10,8 @@ config_version=4
_global_script_classes=[ { _global_script_classes=[ {
"base": "KinematicBody2D", "base": "KinematicBody2D",
"class": "Player", "class": @"Player",
"language": "GDScript", "language": @"GDScript",
"path": "res://player/player.gd" "path": "res://player/player.gd"
} ] } ]
_global_script_class_icons={ _global_script_class_icons={
@ -86,7 +86,6 @@ limits/debugger_stdout/max_chars_per_second=1000000
[rendering] [rendering]
quality/driver/driver_name="GLES2"
2d/snapping/use_gpu_pixel_snap=true 2d/snapping/use_gpu_pixel_snap=true
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -24,6 +24,5 @@ window/stretch/aspect="expand"
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false

View File

@ -125,4 +125,3 @@ texture = ExtResource( 2 )
region_rect = Rect2( 141, 115, 39, 6 ) region_rect = Rect2( 141, 115, 39, 6 )
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
current = true

View File

@ -20,14 +20,14 @@ onready var follow = $Top/Area/Follow
onready var follow_2 = $Top/Area/Follow2 onready var follow_2 = $Top/Area/Follow2
onready var size = $Top/Area.get_size() onready var size = $Top/Area.get_size()
onready var move_mode = modes_vbox.get_node(@"Move") onready var move_mode = modes_vbox.get_node("Move")
onready var color_mode = modes_vbox.get_node(@"Color") onready var color_mode = modes_vbox.get_node("Color")
onready var scale_mode = modes_vbox.get_node(@"Scale") onready var scale_mode = modes_vbox.get_node("Scale")
onready var rotate_mode = modes_vbox.get_node(@"Rotate") onready var rotate_mode = modes_vbox.get_node("Rotate")
onready var callback_mode = modes_vbox.get_node(@"Callback") onready var callback_mode = modes_vbox.get_node("Callback")
onready var follow_mode = modes_vbox.get_node(@"Follow") onready var follow_mode = modes_vbox.get_node("Follow")
onready var repeat_mode = modes_vbox.get_node(@"Repeat") onready var repeat_mode = modes_vbox.get_node("Repeat")
onready var paused_mode = modes_vbox.get_node(@"Pause") onready var paused_mode = modes_vbox.get_node("Pause")
func _ready(): func _ready():
for index in range(trans_list.size()): for index in range(trans_list.size()):
@ -44,7 +44,7 @@ func _ready():
for node in [trans_vbox, eases_vbox, modes_vbox]: for node in [trans_vbox, eases_vbox, modes_vbox]:
node.get_child(1).set_pressed(true) 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() reset_tween()

View File

@ -16,10 +16,6 @@ run/main_scene="res://main.tscn"
config/icon="res://icon.png" config/icon="res://icon.png"
target_fps=60 target_fps=60
[debug]
gdscript/warnings/return_value_discarded=false
[display] [display]
window/size/height=800 window/size/height=800
@ -39,7 +35,6 @@ multithread/thread_rid_pool_prealloc=60
[rendering] [rendering]
quality/driver/driver_name="GLES2"
vram_compression/import_etc=true vram_compression/import_etc=true
vram_compression/import_etc2=false vram_compression/import_etc2=false
environment/default_clear_color=Color( 0.2349, 0.2349, 0.27, 1 ) environment/default_clear_color=Color( 0.2349, 0.2349, 0.27, 1 )

View File

@ -81,7 +81,7 @@ func is_ready(path):
func _wait_for_resource(res, path): func _wait_for_resource(res, path):
_unlock("wait_for_resource") _unlock("wait_for_resource")
while true: while true:
VisualServer.sync() RenderingServer.sync()
OS.delay_usec(16000) # Wait approximately 1 frame. OS.delay_usec(16000) # Wait approximately 1 frame.
_lock("wait_for_resource") _lock("wait_for_resource")
if queue.size() == 0 or queue[0] != res: if queue.size() == 0 or queue[0] != res:

View File

@ -110,8 +110,8 @@ func _ready():
add_line("Model name", OS.get_model_name()) add_line("Model name", OS.get_model_name())
add_line("Processor count", OS.get_processor_count()) add_line("Processor count", OS.get_processor_count())
add_line("Device unique ID", OS.get_unique_id()) add_line("Device unique ID", OS.get_unique_id())
add_line("Video adapter name", VisualServer.get_video_adapter_name()) add_line("Video adapter name", RenderingServer.get_video_adapter_name())
add_line("Video adapter vendor", VisualServer.get_video_adapter_vendor()) add_line("Video adapter vendor", RenderingServer.get_video_adapter_vendor())
add_header("Input") add_header("Input")
add_line("Latin keyboard variant", OS.get_latin_keyboard_variant()) add_line("Latin keyboard variant", OS.get_latin_keyboard_variant())

View File

@ -12,7 +12,7 @@ func _ready():
get_node("VBoxContainer/LoadButton").connect("pressed", self, "load_pressed") get_node("VBoxContainer/LoadButton").connect("pressed", self, "load_pressed")
get_node("SaveMaterialDialog").connect("file_selected", self, "save_file_selected") get_node("SaveMaterialDialog").connect("file_selected", self, "save_file_selected")
get_node("LoadMaterialDialog").connect("file_selected", self, "load_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(): func save_pressed():

View File

@ -29,8 +29,8 @@ onready var player2 = $"../Player2"
onready var view = $View onready var view = $View
onready var viewport1 = $Viewport1 onready var viewport1 = $Viewport1
onready var viewport2 = $Viewport2 onready var viewport2 = $Viewport2
onready var camera1 = viewport1.get_node(@"Camera1") onready var camera1 = viewport1.get_node("Camera1")
onready var camera2 = viewport2.get_node(@"Camera2") onready var camera2 = viewport2.get_node("Camera2")
func _ready(): func _ready():

View File

@ -5,7 +5,7 @@ onready var captured_image = $CapturedImage
func _on_CaptureButton_pressed(): func _on_CaptureButton_pressed():
get_viewport().set_clear_mode(Viewport.CLEAR_MODE_ONLY_NEXT_FRAME) get_viewport().set_clear_mode(Viewport.CLEAR_MODE_ONLY_NEXT_FRAME)
# Wait until the frame has finished before getting the texture. # Wait until the frame has finished before getting the texture.
yield(VisualServer, "frame_post_draw") yield(RenderingServer, "frame_post_draw")
# Retrieve the captured image. # Retrieve the captured image.
var img = get_viewport().get_texture().get_data() var img = get_viewport().get_texture().get_data()