diff --git a/2d/finite_state_machine/Demo.tscn b/2d/finite_state_machine/Demo.tscn index 747ac651..c6a5564d 100644 --- a/2d/finite_state_machine/Demo.tscn +++ b/2d/finite_state_machine/Demo.tscn @@ -1,20 +1,25 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://player/Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://debug/StatesStackDiplayer.tscn" type="PackedScene" id=2] -[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=3] -[ext_resource path="res://debug/Explanations.tscn" type="PackedScene" id=4] +[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=1] +[ext_resource path="res://debug/Explanations.tscn" type="PackedScene" id=2] +[ext_resource path="res://debug/StatesStackDiplayer.tscn" type="PackedScene" id=3] +[ext_resource path="res://player/Player.tscn" type="PackedScene" id=4] [node name="Demo" type="Node"] -[node name="Player" parent="." instance=ExtResource( 1 )] -editor/display_folded = true +[node name="Player" parent="." instance=ExtResource( 4 )] -[node name="StatesStackDiplayer" parent="." instance=ExtResource( 2 )] +[node name="Explanations" parent="." instance=ExtResource( 2 )] -[node name="ControlsPanel" parent="." instance=ExtResource( 3 )] +[node name="Control" type="Control" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Explanations" parent="." instance=ExtResource( 4 )] +[node name="StatesStackDiplayer" parent="Control" instance=ExtResource( 3 )] +[node name="ControlsPanel" parent="Control" instance=ExtResource( 1 )] [editable path="Player"] diff --git a/2d/finite_state_machine/debug/ControlsPanel.tscn b/2d/finite_state_machine/debug/ControlsPanel.tscn index ea78586c..2837430b 100644 --- a/2d/finite_state_machine/debug/ControlsPanel.tscn +++ b/2d/finite_state_machine/debug/ControlsPanel.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://debug/top_level_ui.gd" type="Script" id=1] [ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=2] [node name="ControlsPanel" type="Panel"] @@ -8,7 +7,9 @@ anchor_left = 1.0 anchor_right = 1.0 margin_left = -220.0 margin_bottom = 170.0 -script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="Keys" type="Label" parent="."] anchor_right = 1.0 @@ -38,4 +39,3 @@ X Space Shift" align = 2 - diff --git a/2d/finite_state_machine/debug/Explanations.tscn b/2d/finite_state_machine/debug/Explanations.tscn index bd174c0b..9fc00960 100644 --- a/2d/finite_state_machine/debug/Explanations.tscn +++ b/2d/finite_state_machine/debug/Explanations.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://fonts/source_code_pro_explanations_bold.tres" type="DynamicFont" id=1] [ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=2] -[ext_resource path="res://debug/top_level_ui.gd" type="Script" id=3] [node name="Explanations" type="RichTextLabel"] anchor_right = 1.0 @@ -35,8 +34,6 @@ States are common in games. You can use the pattern to: 3. Improve your code's structure. Look at the scene tree and FileSystem tab: without looking at the code, you'll know what the Player can or cannot do. You can read more about States in the excellent Game Programming Patterns ebook." -script = ExtResource( 3 ) __meta__ = { "_edit_lock_": true } - diff --git a/2d/finite_state_machine/debug/StatesStackDiplayer.tscn b/2d/finite_state_machine/debug/StatesStackDiplayer.tscn index 27b82c20..3d0727f3 100644 --- a/2d/finite_state_machine/debug/StatesStackDiplayer.tscn +++ b/2d/finite_state_machine/debug/StatesStackDiplayer.tscn @@ -46,4 +46,3 @@ margin_bottom = 170.0 custom_fonts/font = SubResource( 1 ) text = "1. 2." - diff --git a/2d/finite_state_machine/debug/states_stack_displayer.gd b/2d/finite_state_machine/debug/states_stack_displayer.gd index dd7da56d..d7e2cdce 100644 --- a/2d/finite_state_machine/debug/states_stack_displayer.gd +++ b/2d/finite_state_machine/debug/states_stack_displayer.gd @@ -1,9 +1,6 @@ extends Panel -onready var fsm_node = get_node("../Player/StateMachine") - -func _ready(): - set_as_toplevel(true) +onready var fsm_node = get_node("../../Player/StateMachine") func _process(delta): var states_names = '' diff --git a/2d/finite_state_machine/debug/top_level_ui.gd b/2d/finite_state_machine/debug/top_level_ui.gd deleted file mode 100644 index d489249b..00000000 --- a/2d/finite_state_machine/debug/top_level_ui.gd +++ /dev/null @@ -1,5 +0,0 @@ -tool -extends Control - -func _ready(): - set_as_toplevel(true) diff --git a/2d/finite_state_machine/default_env.tres b/2d/finite_state_machine/default_env.tres index 4b7cb0ac..d37b59de 100644 --- a/2d/finite_state_machine/default_env.tres +++ b/2d/finite_state_machine/default_env.tres @@ -11,4 +11,3 @@ ground_curve = 0.01 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/2d/finite_state_machine/icon.png.import b/2d/finite_state_machine/icon.png.import index 0041ef86..96cbf462 100644 --- a/2d/finite_state_machine/icon.png.import +++ b/2d/finite_state_machine/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/finite_state_machine/player/body.png.import b/2d/finite_state_machine/player/body.png.import index 001ecea9..9b8c6882 100644 --- a/2d/finite_state_machine/player/body.png.import +++ b/2d/finite_state_machine/player/body.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/body.png-313f6363670a5852a7b7126ab476d8b1.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/body.png-313f6363670a5852a7b7126ab476d8b1.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/finite_state_machine/player/player_controller.gd b/2d/finite_state_machine/player/player_controller.gd index 2e83ff7c..21457c3d 100644 --- a/2d/finite_state_machine/player/player_controller.gd +++ b/2d/finite_state_machine/player/player_controller.gd @@ -1,5 +1,5 @@ """ -The Player is a KinematicBody2D, in other words a physics-driven object. +The Player is a KinematicBody2D, in other words a physics-driven object. It can move, collide with the world... It HAS a state machine, but the body and the state machine are separate. """ diff --git a/2d/finite_state_machine/player/shadow.png.import b/2d/finite_state_machine/player/shadow.png.import index fe25dad4..53481319 100644 --- a/2d/finite_state_machine/player/shadow.png.import +++ b/2d/finite_state_machine/player/shadow.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/shadow.png-493c4635eca1ce8bdece629560617dc7.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/shadow.png-493c4635eca1ce8bdece629560617dc7.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/finite_state_machine/player/states/combat/stagger.gd b/2d/finite_state_machine/player/states/combat/stagger.gd index a0fa90f2..8e2b044f 100644 --- a/2d/finite_state_machine/player/states/combat/stagger.gd +++ b/2d/finite_state_machine/player/states/combat/stagger.gd @@ -1,6 +1,6 @@ """ The stagger state end with the stagger animation from the AnimationPlayer -The animation only affects the Body Sprite"s modulate property so +The animation only affects the Body Sprite's modulate property so it could stack with other animations if we had two AnimationPlayer nodes """ extends "res://state_machine/state.gd" @@ -11,5 +11,5 @@ func enter(): owner.get_node("AnimationPlayer").play("stagger") func _on_animation_finished(anim_name): - assert anim_name == "stagger" + assert(anim_name == "stagger") emit_signal("finished", "previous") diff --git a/2d/finite_state_machine/player/weapon/sword.png.import b/2d/finite_state_machine/player/weapon/sword.png.import index b4fff2fc..0ff00497 100644 --- a/2d/finite_state_machine/player/weapon/sword.png.import +++ b/2d/finite_state_machine/player/weapon/sword.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sword.png-fc7f0084cdf333c826eda2b33f2ec3cc.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/sword.png-fc7f0084cdf333c826eda2b33f2ec3cc.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/finite_state_machine/project.godot b/2d/finite_state_machine/project.godot index 7a24a60a..1279dd6f 100644 --- a/2d/finite_state_machine/project.godot +++ b/2d/finite_state_machine/project.godot @@ -23,10 +23,8 @@ config/icon="res://icon.png" window/size/width=1280 window/size/height=720 -window/size/test_width=1280 -window/size/test_height=720 window/stretch/mode="2d" -window/stretch/aspect="keep" +window/stretch/aspect="expand" [gdnative] diff --git a/2d/grid_based_movement/Game.tscn b/2d/grid_based_movement/Game.tscn index e5d23c70..0fa07bfb 100644 --- a/2d/grid_based_movement/Game.tscn +++ b/2d/grid_based_movement/Game.tscn @@ -16,7 +16,7 @@ z_index = -1 z_as_relative = false tile_set = ExtResource( 1 ) format = 1 -tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 131072, 0, 0, 131073, 0, 0, 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 131079, 0, 0, 131080, 0, 0, 131081, 0, 0, 131082, 0, 0, 131083, 0, 0, 131084, 0, 0, 131085, 0, 0, 131086, 0, 0, 131087, 0, 0, 131088, 0, 0, 196608, 0, 0, 196609, 0, 0, 196610, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 196614, 0, 0, 196615, 0, 0, 196616, 0, 0, 196617, 0, 0, 196618, 0, 0, 196619, 0, 0, 196620, 0, 0, 196621, 0, 0, 196622, 0, 0, 196623, 0, 0, 196624, 0, 0, 262144, 0, 0, 262145, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 0, 0, 262153, 0, 0, 262154, 0, 0, 262155, 0, 0, 262156, 0, 0, 262157, 0, 0, 262158, 0, 0, 262159, 0, 0, 262160, 0, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327694, 0, 0, 327695, 0, 0, 327696, 0, 0, 393216, 0, 0, 393217, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 0, 0, 393223, 0, 0, 393224, 0, 0, 393225, 0, 0, 393226, 0, 0, 393227, 0, 0, 393228, 0, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 393232, 0, 0, 458752, 0, 0, 458753, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458760, 0, 0, 458761, 0, 0, 458762, 0, 0, 458763, 0, 0, 458764, 0, 0, 458765, 0, 0, 458766, 0, 0, 458767, 0, 0, 458768, 0, 0, 524288, 0, 0, 524289, 0, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 0, 0, 524294, 0, 0, 524295, 0, 0, 524296, 0, 0, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 0, 0, 524304, 0, 0, 589824, 0, 0, 589825, 0, 0, 589826, 0, 0, 589827, 0, 0, 589828, 0, 0, 589829, 0, 0, 589830, 0, 0, 589831, 0, 0, 589832, 0, 0, 589833, 0, 0, 589834, 0, 0, 589835, 0, 0, 589836, 0, 0, 589837, 0, 0, 589838, 0, 0, 589839, 0, 0, 589840, 0, 0 ) +tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, -1610612736, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 65553, -1610612736, 0, 131072, 0, 0, 131073, 0, 0, 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 131079, 0, 0, 131080, 0, 0, 131081, 0, 0, 131082, 0, 0, 131083, 0, 0, 131084, 0, 0, 131085, 0, 0, 131086, 0, 0, 131087, 0, 0, 131088, 0, 0, 131089, -1610612736, 0, 196608, 0, 0, 196609, 0, 0, 196610, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 196614, 0, 0, 196615, 0, 0, 196616, 0, 0, 196617, 0, 0, 196618, 0, 0, 196619, 0, 0, 196620, 0, 0, 196621, 0, 0, 196622, 0, 0, 196623, 0, 0, 196624, 0, 0, 196625, -1610612736, 0, 262144, 0, 0, 262145, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 0, 0, 262153, 0, 0, 262154, 0, 0, 262155, 0, 0, 262156, 0, 0, 262157, 0, 0, 262158, 0, 0, 262159, 0, 0, 262160, 0, 0, 262161, -1610612736, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327694, 0, 0, 327695, 0, 0, 327696, 0, 0, 327697, -1610612736, 0, 393216, 0, 0, 393217, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 0, 0, 393223, 0, 0, 393224, 0, 0, 393225, 0, 0, 393226, 0, 0, 393227, 0, 0, 393228, 0, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 393232, 0, 0, 393233, -1610612736, 0, 458752, 0, 0, 458753, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 458760, 0, 0, 458761, 0, 0, 458762, 0, 0, 458763, 0, 0, 458764, 0, 0, 458765, 0, 0, 458766, 0, 0, 458767, 0, 0, 458768, 0, 0, 458769, -1610612736, 0, 524288, 0, 0, 524289, 0, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 0, 0, 524294, 0, 0, 524295, 0, 0, 524296, 0, 0, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 0, 0, 524304, 0, 0, 524305, -1610612736, 0, 589824, 0, 0, 589825, 0, 0, 589826, 0, 0, 589827, 0, 0, 589828, 0, 0, 589829, 0, 0, 589830, 0, 0, 589831, 0, 0, 589832, 0, 0, 589833, 0, 0, 589834, 0, 0, 589835, 0, 0, 589836, 0, 0, 589837, 0, 0, 589838, 0, 0, 589839, 0, 0, 589840, 0, 0, 589841, -1610612736, 0 ) __meta__ = { "_edit_lock_": true } @@ -24,18 +24,16 @@ __meta__ = { [node name="Grid" type="TileMap" parent="."] tile_set = ExtResource( 2 ) format = 1 -tile_data = PoolIntArray( 18, 1, 0, 19, 1, 0, 65554, 1, 0, 65555, 1, 0, 131090, 1, 0, 131091, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196626, 1, 0, 196627, 1, 0, 262151, 1, 0, 262162, 1, 0, 262163, 1, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327698, 1, 0, 327699, 1, 0, 393234, 1, 0, 393235, 1, 0, 458753, 1, 0, 458754, 1, 0, 458770, 1, 0, 458771, 1, 0, 524289, 1, 0, 524290, 1, 0, 524306, 1, 0, 524307, 1, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589842, 1, 0, 589843, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 655371, 1, 0, 655372, 1, 0, 655373, 1, 0, 655374, 1, 0, 655375, 1, 0, 655376, 1, 0, 655377, 1, 0, 655378, 1, 0, 655379, 1, 0, 720896, 1, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0 ) +tile_data = PoolIntArray( -655377, 1, 0, -655376, 1, 0, -655375, 1, 0, -655374, 1, 0, -655373, 1, 0, -655372, 1, 0, -655371, 1, 0, -655370, 1, 0, -655369, 1, 0, -655368, 1, 0, -655367, 1, 0, -655366, 1, 0, -655365, 1, 0, -655364, 1, 0, -655363, 1, 0, -655362, 1, 0, -655361, 1, 0, -720896, 1, 0, -720895, 1, 0, -720894, 1, 0, -720893, 1, 0, -720892, 1, 0, -720891, 1, 0, -720890, 1, 0, -720889, 1, 0, -720888, 1, 0, -720887, 1, 0, -720886, 1, 0, -720885, 1, 0, -720884, 1, 0, -720883, 1, 0, -720882, 1, 0, -720881, 1, 0, -720880, 1, 0, -720879, 1, 0, -720878, 1, 0, -720877, 1, 0, -720876, 1, 0, -720875, 1, 0, -720874, 1, 0, -720873, 1, 0, -720872, 1, 0, -720871, 1, 0, -720870, 1, 0, -720869, 1, 0, -720868, 1, 0, -720867, 1, 0, -720866, 1, 0, -720865, 1, 0, -720864, 1, 0, -720863, 1, 0, -720862, 1, 0, -589841, 1, 0, -589840, 1, 0, -589839, 1, 0, -589838, 1, 0, -589837, 1, 0, -589836, 1, 0, -589835, 1, 0, -589834, 1, 0, -589833, 1, 0, -589832, 1, 0, -589831, 1, 0, -589830, 1, 0, -589829, 1, 0, -589828, 1, 0, -589827, 1, 0, -589826, 1, 0, -589825, 1, 0, -655360, 1, 0, -655359, 1, 0, -655358, 1, 0, -655357, 1, 0, -655356, 1, 0, -655355, 1, 0, -655354, 1, 0, -655353, 1, 0, -655352, 1, 0, -655351, 1, 0, -655350, 1, 0, -655349, 1, 0, -655348, 1, 0, -655347, 1, 0, -655346, 1, 0, -655345, 1, 0, -655344, 1, 0, -655343, 1, 0, -655342, 1, 0, -655341, 1, 0, -655340, 1, 0, -655339, 1, 0, -655338, 1, 0, -655337, 1, 0, -655336, 1, 0, -655335, 1, 0, -655334, 1, 0, -655333, 1, 0, -655332, 1, 0, -655331, 1, 0, -655330, 1, 0, -655329, 1, 0, -655328, 1, 0, -655327, 1, 0, -655326, 1, 0, -524305, 1, 0, -524304, 1, 0, -524303, 1, 0, -524302, 1, 0, -524301, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -589809, 1, 0, -589808, 1, 0, -589807, 1, 0, -589806, 1, 0, -589805, 1, 0, -589804, 1, 0, -589803, 1, 0, -589802, 1, 0, -589801, 1, 0, -589800, 1, 0, -589799, 1, 0, -589798, 1, 0, -589797, 1, 0, -589796, 1, 0, -589795, 1, 0, -589794, 1, 0, -589793, 1, 0, -589792, 1, 0, -589791, 1, 0, -589790, 1, 0, -458769, 1, 0, -458768, 1, 0, -458767, 1, 0, -458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -524274, 1, 0, -524273, 1, 0, -524272, 1, 0, -524271, 1, 0, -524270, 1, 0, -524269, 1, 0, -524268, 1, 0, -524267, 1, 0, -524266, 1, 0, -524265, 1, 0, -524264, 1, 0, -524263, 1, 0, -524262, 1, 0, -524261, 1, 0, -524260, 1, 0, -524259, 1, 0, -524258, 1, 0, -524257, 1, 0, -524256, 1, 0, -524255, 1, 0, -524254, 1, 0, -393233, 1, 0, -393232, 1, 0, -393231, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -458737, 1, 0, -458736, 1, 0, -458735, 1, 0, -458734, 1, 0, -458733, 1, 0, -458732, 1, 0, -458731, 1, 0, -458730, 1, 0, -458729, 1, 0, -458728, 1, 0, -458727, 1, 0, -458726, 1, 0, -458725, 1, 0, -458724, 1, 0, -458723, 1, 0, -458722, 1, 0, -458721, 1, 0, -458720, 1, 0, -458719, 1, 0, -458718, 1, 0, -327697, 1, 0, -327696, 1, 0, -327695, 1, 0, -327694, 1, 0, -327693, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -393202, 1, 0, -393201, 1, 0, -393200, 1, 0, -393199, 1, 0, -393198, 1, 0, -393197, 1, 0, -393196, 1, 0, -393195, 1, 0, -393194, 1, 0, -393193, 1, 0, -393192, 1, 0, -393191, 1, 0, -393190, 1, 0, -393189, 1, 0, -393188, 1, 0, -393187, 1, 0, -393186, 1, 0, -393185, 1, 0, -393184, 1, 0, -393183, 1, 0, -393182, 1, 0, -262161, 1, 0, -262160, 1, 0, -262159, 1, 0, -262158, 1, 0, -262157, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 1, 0, -327680, 1, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -327664, 1, 0, -327663, 1, 0, -327662, 1, 0, -327661, 1, 0, -327660, 1, 0, -327659, 1, 0, -327658, 1, 0, -327657, 1, 0, -327656, 1, 0, -327655, 1, 0, -327654, 1, 0, -327653, 1, 0, -327652, 1, 0, -327651, 1, 0, -327650, 1, 0, -327649, 1, 0, -327648, 1, 0, -327647, 1, 0, -327646, 1, 0, -196625, 1, 0, -196624, 1, 0, -196623, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 1, 0, -262144, 1, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -262130, 1, 0, -262129, 1, 0, -262128, 1, 0, -262127, 1, 0, -262126, 1, 0, -262125, 1, 0, -262124, 1, 0, -262123, 1, 0, -262122, 1, 0, -262121, 1, 0, -262120, 1, 0, -262119, 1, 0, -262118, 1, 0, -262117, 1, 0, -262116, 1, 0, -262115, 1, 0, -262114, 1, 0, -262113, 1, 0, -262112, 1, 0, -262111, 1, 0, -262110, 1, 0, -131089, 1, 0, -131088, 1, 0, -131087, 1, 0, -131086, 1, 0, -131085, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -196594, 1, 0, -196593, 1, 0, -196592, 1, 0, -196591, 1, 0, -196590, 1, 0, -196589, 1, 0, -196588, 1, 0, -196587, 1, 0, -196586, 1, 0, -196585, 1, 0, -196584, 1, 0, -196583, 1, 0, -196582, 1, 0, -196581, 1, 0, -196580, 1, 0, -196579, 1, 0, -196578, 1, 0, -196577, 1, 0, -196576, 1, 0, -196575, 1, 0, -196574, 1, 0, -65553, 1, 0, -65552, 1, 0, -65551, 1, 0, -65550, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 1, 0, -65543, 1, 0, -65542, 1, 0, -65541, 1, 0, -65540, 1, 0, -65539, 1, 0, -65538, 1, 0, -65537, 1, 0, -131072, 1, 0, -131071, 1, 0, -131070, 1, 0, -131069, 1, 0, -131068, 1, 0, -131067, 1, 0, -131066, 1, 0, -131065, 1, 0, -131064, 1, 0, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -131058, 1, 0, -131057, 1, 0, -131056, 1, 0, -131055, 1, 0, -131054, 1, 0, -131053, 1, 0, -131052, 1, 0, -131051, 1, 0, -131050, 1, 0, -131049, 1, 0, -131048, 1, 0, -131047, 1, 0, -131046, 1, 0, -131045, 1, 0, -131044, 1, 0, -131043, 1, 0, -131042, 1, 0, -131041, 1, 0, -131040, 1, 0, -131039, 1, 0, -131038, 1, 0, -17, 1, 0, -16, 1, 0, -15, 1, 0, -14, 1, 0, -13, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 1, 0, -7, 1, 0, -6, 1, 0, -5, 1, 0, -4, 1, 0, -3, 1, 0, -2, 1, 0, -1, 1, 0, -65536, 1, 0, -65535, 1, 0, -65534, 1, 0, -65533, 1, 0, -65532, 1, 0, -65531, 1, 0, -65530, 1, 0, -65529, 1, 0, -65528, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, -65522, 1, 0, -65521, 1, 0, -65520, 1, 0, -65519, 1, 0, -65518, 1, 0, -65517, 1, 0, -65516, 1, 0, -65515, 1, 0, -65514, 1, 0, -65513, 1, 0, -65512, 1, 0, -65511, 1, 0, -65510, 1, 0, -65509, 1, 0, -65508, 1, 0, -65507, 1, 0, -65506, 1, 0, -65505, 1, 0, -65504, 1, 0, -65503, 1, 0, -65502, 1, 0, 65519, 1, 0, 65520, 1, 0, 65521, 1, 0, 65522, 1, 0, 65523, 1, 0, 65524, 1, 0, 65525, 1, 0, 65526, 1, 0, 65527, 1, 0, 65528, 1, 0, 65529, 1, 0, 65530, 1, 0, 65531, 1, 0, 65532, 1, 0, 65533, 1, 0, 65534, 1, 0, 65535, 1, 0, 18, 1, 0, 19, 1, 0, 20, 1, 0, 21, 1, 0, 22, 1, 0, 23, 1, 0, 24, 1, 0, 25, 1, 0, 26, 1, 0, 27, 1, 0, 28, 1, 0, 29, 1, 0, 30, 1, 0, 31, 1, 0, 32, 1, 0, 33, 1, 0, 34, 1, 0, 131055, 1, 0, 131056, 1, 0, 131057, 1, 0, 131058, 1, 0, 131059, 1, 0, 131060, 1, 0, 131061, 1, 0, 131062, 1, 0, 131063, 1, 0, 131064, 1, 0, 131065, 1, 0, 131066, 1, 0, 131067, 1, 0, 131068, 1, 0, 131069, 1, 0, 131070, 1, 0, 131071, 1, 0, 65554, 1, 0, 65555, 1, 0, 65556, 1, 0, 65557, 1, 0, 65558, 1, 0, 65559, 1, 0, 65560, 1, 0, 65561, 1, 0, 65562, 1, 0, 65563, 1, 0, 65564, 1, 0, 65565, 1, 0, 65566, 1, 0, 65567, 1, 0, 65568, 1, 0, 65569, 1, 0, 65570, 1, 0, 196591, 1, 0, 196592, 1, 0, 196593, 1, 0, 196594, 1, 0, 196595, 1, 0, 196596, 1, 0, 196597, 1, 0, 196598, 1, 0, 196599, 1, 0, 196600, 1, 0, 196601, 1, 0, 196602, 1, 0, 196603, 1, 0, 196604, 1, 0, 196605, 1, 0, 196606, 1, 0, 196607, 1, 0, 131090, 1, 0, 131091, 1, 0, 131092, 1, 0, 131093, 1, 0, 131094, 1, 0, 131095, 1, 0, 131096, 1, 0, 131097, 1, 0, 131098, 1, 0, 131099, 1, 0, 131100, 1, 0, 131101, 1, 0, 131102, 1, 0, 131103, 1, 0, 131104, 1, 0, 131105, 1, 0, 131106, 1, 0, 262127, 1, 0, 262128, 1, 0, 262129, 1, 0, 262130, 1, 0, 262131, 1, 0, 262132, 1, 0, 262133, 1, 0, 262134, 1, 0, 262135, 1, 0, 262136, 1, 0, 262137, 1, 0, 262138, 1, 0, 262139, 1, 0, 262140, 1, 0, 262141, 1, 0, 262142, 1, 0, 262143, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196626, 1, 0, 196627, 1, 0, 196628, 1, 0, 196629, 1, 0, 196630, 1, 0, 196631, 1, 0, 196632, 1, 0, 196633, 1, 0, 196634, 1, 0, 196635, 1, 0, 196636, 1, 0, 196637, 1, 0, 196638, 1, 0, 196639, 1, 0, 196640, 1, 0, 196641, 1, 0, 196642, 1, 0, 327663, 1, 0, 327664, 1, 0, 327665, 1, 0, 327666, 1, 0, 327667, 1, 0, 327668, 1, 0, 327669, 1, 0, 327670, 1, 0, 327671, 1, 0, 327672, 1, 0, 327673, 1, 0, 327674, 1, 0, 327675, 1, 0, 327676, 1, 0, 327677, 1, 0, 327678, 1, 0, 327679, 1, 0, 262151, 1, 0, 262162, 1, 0, 262163, 1, 0, 262164, 1, 0, 262165, 1, 0, 262166, 1, 0, 262167, 1, 0, 262168, 1, 0, 262169, 1, 0, 262170, 1, 0, 262171, 1, 0, 262172, 1, 0, 262173, 1, 0, 262174, 1, 0, 262175, 1, 0, 262176, 1, 0, 262177, 1, 0, 262178, 1, 0, 393199, 1, 0, 393200, 1, 0, 393201, 1, 0, 393202, 1, 0, 393203, 1, 0, 393204, 1, 0, 393205, 1, 0, 393206, 1, 0, 393207, 1, 0, 393208, 1, 0, 393209, 1, 0, 393210, 1, 0, 393211, 1, 0, 393212, 1, 0, 393213, 1, 0, 393214, 1, 0, 393215, 1, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327698, 1, 0, 327699, 1, 0, 327700, 1, 0, 327701, 1, 0, 327702, 1, 0, 327703, 1, 0, 327704, 1, 0, 327705, 1, 0, 327706, 1, 0, 327707, 1, 0, 327708, 1, 0, 327709, 1, 0, 327710, 1, 0, 327711, 1, 0, 327712, 1, 0, 327713, 1, 0, 327714, 1, 0, 458735, 1, 0, 458736, 1, 0, 458737, 1, 0, 458738, 1, 0, 458739, 1, 0, 458740, 1, 0, 458741, 1, 0, 458742, 1, 0, 458743, 1, 0, 458744, 1, 0, 458745, 1, 0, 458746, 1, 0, 458747, 1, 0, 458748, 1, 0, 458749, 1, 0, 458750, 1, 0, 458751, 1, 0, 393234, 1, 0, 393235, 1, 0, 393236, 1, 0, 393237, 1, 0, 393238, 1, 0, 393239, 1, 0, 393240, 1, 0, 393241, 1, 0, 393242, 1, 0, 393243, 1, 0, 393244, 1, 0, 393245, 1, 0, 393246, 1, 0, 393247, 1, 0, 393248, 1, 0, 393249, 1, 0, 393250, 1, 0, 524271, 1, 0, 524272, 1, 0, 524273, 1, 0, 524274, 1, 0, 524275, 1, 0, 524276, 1, 0, 524277, 1, 0, 524278, 1, 0, 524279, 1, 0, 524280, 1, 0, 524281, 1, 0, 524282, 1, 0, 524283, 1, 0, 524284, 1, 0, 524285, 1, 0, 524286, 1, 0, 524287, 1, 0, 458753, 1, 0, 458754, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 1, 0, 458773, 1, 0, 458774, 1, 0, 458775, 1, 0, 458776, 1, 0, 458777, 1, 0, 458778, 1, 0, 458779, 1, 0, 458780, 1, 0, 458781, 1, 0, 458782, 1, 0, 458783, 1, 0, 458784, 1, 0, 458785, 1, 0, 458786, 1, 0, 589807, 1, 0, 589808, 1, 0, 589809, 1, 0, 589810, 1, 0, 589811, 1, 0, 589812, 1, 0, 589813, 1, 0, 589814, 1, 0, 589815, 1, 0, 589816, 1, 0, 589817, 1, 0, 589818, 1, 0, 589819, 1, 0, 589820, 1, 0, 589821, 1, 0, 589822, 1, 0, 589823, 1, 0, 524289, 1, 0, 524290, 1, 0, 524306, 1, 0, 524307, 1, 0, 524308, 1, 0, 524309, 1, 0, 524310, 1, 0, 524311, 1, 0, 524312, 1, 0, 524313, 1, 0, 524314, 1, 0, 524315, 1, 0, 524316, 1, 0, 524317, 1, 0, 524318, 1, 0, 524319, 1, 0, 524320, 1, 0, 524321, 1, 0, 524322, 1, 0, 655343, 1, 0, 655344, 1, 0, 655345, 1, 0, 655346, 1, 0, 655347, 1, 0, 655348, 1, 0, 655349, 1, 0, 655350, 1, 0, 655351, 1, 0, 655352, 1, 0, 655353, 1, 0, 655354, 1, 0, 655355, 1, 0, 655356, 1, 0, 655357, 1, 0, 655358, 1, 0, 655359, 1, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589842, 1, 0, 589843, 1, 0, 589844, 1, 0, 589845, 1, 0, 589846, 1, 0, 589847, 1, 0, 589848, 1, 0, 589849, 1, 0, 589850, 1, 0, 589851, 1, 0, 589852, 1, 0, 589853, 1, 0, 589854, 1, 0, 589855, 1, 0, 589856, 1, 0, 589857, 1, 0, 589858, 1, 0, 720879, 1, 0, 720880, 1, 0, 720881, 1, 0, 720882, 1, 0, 720883, 1, 0, 720884, 1, 0, 720885, 1, 0, 720886, 1, 0, 720887, 1, 0, 720888, 1, 0, 720889, 1, 0, 720890, 1, 0, 720891, 1, 0, 720892, 1, 0, 720893, 1, 0, 720894, 1, 0, 720895, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 655371, 1, 0, 655372, 1, 0, 655373, 1, 0, 655374, 1, 0, 655375, 1, 0, 655376, 1, 0, 655377, 1, 0, 655378, 1, 0, 655379, 1, 0, 655380, 1, 0, 655381, 1, 0, 655382, 1, 0, 655383, 1, 0, 655384, 1, 0, 655385, 1, 0, 655386, 1, 0, 655387, 1, 0, 655388, 1, 0, 655389, 1, 0, 655390, 1, 0, 655391, 1, 0, 655392, 1, 0, 655393, 1, 0, 655394, 1, 0, 786415, 1, 0, 786416, 1, 0, 786417, 1, 0, 786418, 1, 0, 786419, 1, 0, 786420, 1, 0, 786421, 1, 0, 786422, 1, 0, 786423, 1, 0, 786424, 1, 0, 786425, 1, 0, 786426, 1, 0, 786427, 1, 0, 786428, 1, 0, 786429, 1, 0, 786430, 1, 0, 786431, 1, 0, 720896, 1, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 1, 0, 720917, 1, 0, 720918, 1, 0, 720919, 1, 0, 720920, 1, 0, 720921, 1, 0, 720922, 1, 0, 720923, 1, 0, 720924, 1, 0, 720925, 1, 0, 720926, 1, 0, 720927, 1, 0, 720928, 1, 0, 720929, 1, 0, 720930, 1, 0, 851951, 1, 0, 851952, 1, 0, 851953, 1, 0, 851954, 1, 0, 851955, 1, 0, 851956, 1, 0, 851957, 1, 0, 851958, 1, 0, 851959, 1, 0, 851960, 1, 0, 851961, 1, 0, 851962, 1, 0, 851963, 1, 0, 851964, 1, 0, 851965, 1, 0, 851966, 1, 0, 851967, 1, 0, 786432, 1, 0, 786433, 1, 0, 786434, 1, 0, 786435, 1, 0, 786436, 1, 0, 786437, 1, 0, 786438, 1, 0, 786439, 1, 0, 786440, 1, 0, 786441, 1, 0, 786442, 1, 0, 786443, 1, 0, 786444, 1, 0, 786445, 1, 0, 786446, 1, 0, 786447, 1, 0, 786448, 1, 0, 786449, 1, 0, 786450, 1, 0, 786451, 1, 0, 786452, 1, 0, 786453, 1, 0, 786454, 1, 0, 786455, 1, 0, 786456, 1, 0, 786457, 1, 0, 786458, 1, 0, 786459, 1, 0, 786460, 1, 0, 786461, 1, 0, 786462, 1, 0, 786463, 1, 0, 786464, 1, 0, 786465, 1, 0, 786466, 1, 0, 917487, 1, 0, 917488, 1, 0, 917489, 1, 0, 917490, 1, 0, 917491, 1, 0, 917492, 1, 0, 917493, 1, 0, 917494, 1, 0, 917495, 1, 0, 917496, 1, 0, 917497, 1, 0, 917498, 1, 0, 917499, 1, 0, 917500, 1, 0, 917501, 1, 0, 917502, 1, 0, 917503, 1, 0, 851968, 1, 0, 851969, 1, 0, 851970, 1, 0, 851971, 1, 0, 851972, 1, 0, 851973, 1, 0, 851974, 1, 0, 851975, 1, 0, 851976, 1, 0, 851977, 1, 0, 851978, 1, 0, 851979, 1, 0, 851980, 1, 0, 851981, 1, 0, 851982, 1, 0, 851983, 1, 0, 851984, 1, 0, 851985, 1, 0, 851986, 1, 0, 851987, 1, 0, 851988, 1, 0, 851989, 1, 0, 851990, 1, 0, 851991, 1, 0, 851992, 1, 0, 851993, 1, 0, 851994, 1, 0, 851995, 1, 0, 851996, 1, 0, 851997, 1, 0, 851998, 1, 0, 851999, 1, 0, 852000, 1, 0, 852001, 1, 0, 852002, 1, 0, 983023, 1, 0, 983024, 1, 0, 983025, 1, 0, 983026, 1, 0, 983027, 1, 0, 983028, 1, 0, 983029, 1, 0, 983030, 1, 0, 983031, 1, 0, 983032, 1, 0, 983033, 1, 0, 983034, 1, 0, 983035, 1, 0, 983036, 1, 0, 983037, 1, 0, 983038, 1, 0, 983039, 1, 0, 917504, 1, 0, 917505, 1, 0, 917506, 1, 0, 917507, 1, 0, 917508, 1, 0, 917509, 1, 0, 917510, 1, 0, 917511, 1, 0, 917512, 1, 0, 917513, 1, 0, 917514, 1, 0, 917515, 1, 0, 917516, 1, 0, 917517, 1, 0, 917518, 1, 0, 917519, 1, 0, 917520, 1, 0, 917521, 1, 0, 917522, 1, 0, 917523, 1, 0, 917524, 1, 0, 917525, 1, 0, 917526, 1, 0, 917527, 1, 0, 917528, 1, 0, 917529, 1, 0, 917530, 1, 0, 917531, 1, 0, 917532, 1, 0, 917533, 1, 0, 917534, 1, 0, 917535, 1, 0, 917536, 1, 0, 917537, 1, 0, 917538, 1, 0, 1048559, 1, 0, 1048560, 1, 0, 1048561, 1, 0, 1048562, 1, 0, 1048563, 1, 0, 1048564, 1, 0, 1048565, 1, 0, 1048566, 1, 0, 1048567, 1, 0, 1048568, 1, 0, 1048569, 1, 0, 1048570, 1, 0, 1048571, 1, 0, 1048572, 1, 0, 1048573, 1, 0, 1048574, 1, 0, 1048575, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0, 983053, 1, 0, 983054, 1, 0, 983055, 1, 0, 983056, 1, 0, 983057, 1, 0, 983058, 1, 0, 983059, 1, 0, 983060, 1, 0, 983061, 1, 0, 983062, 1, 0, 983063, 1, 0, 983064, 1, 0, 983065, 1, 0, 983066, 1, 0, 983067, 1, 0, 983068, 1, 0, 983069, 1, 0, 983070, 1, 0, 983071, 1, 0, 983072, 1, 0, 983073, 1, 0, 983074, 1, 0, 1114095, 1, 0, 1114096, 1, 0, 1114097, 1, 0, 1114098, 1, 0, 1114099, 1, 0, 1114100, 1, 0, 1114101, 1, 0, 1114102, 1, 0, 1114103, 1, 0, 1114104, 1, 0, 1114105, 1, 0, 1114106, 1, 0, 1114107, 1, 0, 1114108, 1, 0, 1114109, 1, 0, 1114110, 1, 0, 1114111, 1, 0, 1048576, 1, 0, 1048577, 1, 0, 1048578, 1, 0, 1048579, 1, 0, 1048580, 1, 0, 1048581, 1, 0, 1048582, 1, 0, 1048583, 1, 0, 1048584, 1, 0, 1048585, 1, 0, 1048586, 1, 0, 1048587, 1, 0, 1048588, 1, 0, 1048589, 1, 0, 1048590, 1, 0, 1048591, 1, 0, 1048592, 1, 0, 1048593, 1, 0, 1048594, 1, 0, 1048595, 1, 0, 1048596, 1, 0, 1048597, 1, 0, 1048598, 1, 0, 1048599, 1, 0, 1048600, 1, 0, 1048601, 1, 0, 1048602, 1, 0, 1048603, 1, 0, 1048604, 1, 0, 1048605, 1, 0, 1048606, 1, 0, 1048607, 1, 0, 1048608, 1, 0, 1048609, 1, 0, 1048610, 1, 0, 1179631, 1, 0, 1179632, 1, 0, 1179633, 1, 0, 1179634, 1, 0, 1179635, 1, 0, 1179636, 1, 0, 1179637, 1, 0, 1179638, 1, 0, 1179639, 1, 0, 1179640, 1, 0, 1179641, 1, 0, 1179642, 1, 0, 1179643, 1, 0, 1179644, 1, 0, 1179645, 1, 0, 1179646, 1, 0, 1179647, 1, 0, 1114112, 1, 0, 1114113, 1, 0, 1114114, 1, 0, 1114115, 1, 0, 1114116, 1, 0, 1114117, 1, 0, 1114118, 1, 0, 1114119, 1, 0, 1114120, 1, 0, 1114121, 1, 0, 1114122, 1, 0, 1114123, 1, 0, 1114124, 1, 0, 1114125, 1, 0, 1114126, 1, 0, 1114127, 1, 0, 1114128, 1, 0, 1114129, 1, 0, 1114130, 1, 0, 1114131, 1, 0, 1114132, 1, 0, 1114133, 1, 0, 1114134, 1, 0, 1114135, 1, 0, 1114136, 1, 0, 1114137, 1, 0, 1114138, 1, 0, 1114139, 1, 0, 1114140, 1, 0, 1114141, 1, 0, 1114142, 1, 0, 1114143, 1, 0, 1114144, 1, 0, 1114145, 1, 0, 1114146, 1, 0, 1245167, 1, 0, 1245168, 1, 0, 1245169, 1, 0, 1245170, 1, 0, 1245171, 1, 0, 1245172, 1, 0, 1245173, 1, 0, 1245174, 1, 0, 1245175, 1, 0, 1245176, 1, 0, 1245177, 1, 0, 1245178, 1, 0, 1245179, 1, 0, 1245180, 1, 0, 1245181, 1, 0, 1245182, 1, 0, 1245183, 1, 0, 1179648, 1, 0, 1179649, 1, 0, 1179650, 1, 0, 1179651, 1, 0, 1179652, 1, 0, 1179653, 1, 0, 1179654, 1, 0, 1179655, 1, 0, 1179656, 1, 0, 1179657, 1, 0, 1179658, 1, 0, 1179659, 1, 0, 1179660, 1, 0, 1179661, 1, 0, 1179662, 1, 0, 1179663, 1, 0, 1179664, 1, 0, 1179665, 1, 0, 1179666, 1, 0, 1179667, 1, 0, 1179668, 1, 0, 1179669, 1, 0, 1179670, 1, 0, 1179671, 1, 0, 1179672, 1, 0, 1179673, 1, 0, 1179674, 1, 0, 1179675, 1, 0, 1179676, 1, 0, 1179677, 1, 0, 1179678, 1, 0, 1179679, 1, 0, 1179680, 1, 0, 1179681, 1, 0, 1179682, 1, 0, 1310703, 1, 0, 1310704, 1, 0, 1310705, 1, 0, 1310706, 1, 0, 1310707, 1, 0, 1310708, 1, 0, 1310709, 1, 0, 1310710, 1, 0, 1310711, 1, 0, 1310712, 1, 0, 1310713, 1, 0, 1310714, 1, 0, 1310715, 1, 0, 1310716, 1, 0, 1310717, 1, 0, 1310718, 1, 0, 1310719, 1, 0, 1245184, 1, 0, 1245185, 1, 0, 1245186, 1, 0, 1245187, 1, 0, 1245188, 1, 0, 1245189, 1, 0, 1245190, 1, 0, 1245191, 1, 0, 1245192, 1, 0, 1245193, 1, 0, 1245194, 1, 0, 1245195, 1, 0, 1245196, 1, 0, 1245197, 1, 0, 1245198, 1, 0, 1245199, 1, 0, 1245200, 1, 0, 1245201, 1, 0, 1245202, 1, 0, 1245203, 1, 0, 1245204, 1, 0, 1245205, 1, 0, 1245206, 1, 0, 1245207, 1, 0, 1245208, 1, 0, 1245209, 1, 0, 1245210, 1, 0, 1245211, 1, 0, 1245212, 1, 0, 1245213, 1, 0, 1245214, 1, 0, 1245215, 1, 0, 1245216, 1, 0, 1245217, 1, 0, 1245218, 1, 0, 1376239, 1, 0, 1376240, 1, 0, 1376241, 1, 0, 1376242, 1, 0, 1376243, 1, 0, 1376244, 1, 0, 1376245, 1, 0, 1376246, 1, 0, 1376247, 1, 0, 1376248, 1, 0, 1376249, 1, 0, 1376250, 1, 0, 1376251, 1, 0, 1376252, 1, 0, 1376253, 1, 0, 1376254, 1, 0, 1376255, 1, 0, 1310720, 1, 0, 1310721, 1, 0, 1310722, 1, 0, 1310723, 1, 0, 1310724, 1, 0, 1310725, 1, 0, 1310726, 1, 0, 1310727, 1, 0, 1310728, 1, 0, 1310729, 1, 0, 1310730, 1, 0, 1310731, 1, 0, 1310732, 1, 0, 1310733, 1, 0, 1310734, 1, 0, 1310735, 1, 0, 1310736, 1, 0, 1310737, 1, 0, 1310738, 1, 0, 1310739, 1, 0, 1310740, 1, 0, 1310741, 1, 0, 1310742, 1, 0, 1310743, 1, 0, 1310744, 1, 0, 1310745, 1, 0, 1310746, 1, 0, 1310747, 1, 0, 1310748, 1, 0, 1310749, 1, 0, 1310750, 1, 0, 1310751, 1, 0, 1310752, 1, 0, 1310753, 1, 0, 1310754, 1, 0, 1441775, 1, 0, 1441776, 1, 0, 1441777, 1, 0, 1441778, 1, 0, 1441779, 1, 0, 1441780, 1, 0, 1441781, 1, 0, 1441782, 1, 0, 1441783, 1, 0, 1441784, 1, 0, 1441785, 1, 0, 1441786, 1, 0, 1441787, 1, 0, 1441788, 1, 0, 1441789, 1, 0, 1441790, 1, 0, 1441791, 1, 0, 1376256, 1, 0, 1376257, 1, 0, 1376258, 1, 0, 1376259, 1, 0, 1376260, 1, 0, 1376261, 1, 0, 1376262, 1, 0, 1376263, 1, 0, 1376264, 1, 0, 1376265, 1, 0, 1376266, 1, 0, 1376267, 1, 0, 1376268, 1, 0, 1376269, 1, 0, 1376270, 1, 0, 1376271, 1, 0, 1376272, 1, 0, 1376273, 1, 0, 1376274, 1, 0, 1376275, 1, 0, 1376276, 1, 0, 1376277, 1, 0, 1376278, 1, 0, 1376279, 1, 0, 1376280, 1, 0, 1376281, 1, 0, 1376282, 1, 0, 1376283, 1, 0, 1376284, 1, 0, 1376285, 1, 0, 1376286, 1, 0, 1376287, 1, 0, 1376288, 1, 0, 1376289, 1, 0, 1376290, 1, 0 ) script = ExtResource( 3 ) __meta__ = { "_edit_lock_": true } [node name="Actor" parent="Grid" instance=ExtResource( 4 )] -editor/display_folded = true position = Vector2( 416, 288 ) [node name="Actor2" type="Node2D" parent="Grid"] -editor/display_folded = true position = Vector2( 480, 480 ) z_index = 1 script = ExtResource( 5 ) @@ -44,7 +42,6 @@ script = ExtResource( 5 ) texture = ExtResource( 6 ) [node name="Object" type="Node2D" parent="Grid"] -editor/display_folded = true position = Vector2( 544, 288 ) script = ExtResource( 5 ) type = 2 @@ -52,5 +49,8 @@ type = 2 [node name="Sprite" type="Sprite" parent="Grid/Object"] texture = ExtResource( 7 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 640, 360 ) +current = true [editable path="Grid/Actor"] diff --git a/2d/grid_based_movement/default_env.tres b/2d/grid_based_movement/default_env.tres index 4b7cb0ac..d37b59de 100644 --- a/2d/grid_based_movement/default_env.tres +++ b/2d/grid_based_movement/default_env.tres @@ -11,4 +11,3 @@ ground_curve = 0.01 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/2d/grid_based_movement/icon.png.import b/2d/grid_based_movement/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/grid_based_movement/icon.png.import +++ b/2d/grid_based_movement/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/pawns/sprites/character.png.import b/2d/grid_based_movement/pawns/sprites/character.png.import index e2bf1b3a..06308f74 100644 --- a/2d/grid_based_movement/pawns/sprites/character.png.import +++ b/2d/grid_based_movement/pawns/sprites/character.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/character.png-98ed16816c5b464731c4fa68fe5b8613.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/pawns/sprites/character_grey.png.import b/2d/grid_based_movement/pawns/sprites/character_grey.png.import index eb26026c..ae50868c 100644 --- a/2d/grid_based_movement/pawns/sprites/character_grey.png.import +++ b/2d/grid_based_movement/pawns/sprites/character_grey.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/character_grey.png-a95d64c2e947e85f04dd1c6474e46965.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/pawns/sprites/star.png.import b/2d/grid_based_movement/pawns/sprites/star.png.import index 53215549..6dd29595 100644 --- a/2d/grid_based_movement/pawns/sprites/star.png.import +++ b/2d/grid_based_movement/pawns/sprites/star.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/star.png-4f164f82cf41ace82182660f1be8e68d.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/project.godot b/2d/grid_based_movement/project.godot index 28c4ef87..d78e31c0 100644 --- a/2d/grid_based_movement/project.godot +++ b/2d/grid_based_movement/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=1280 window/size/height=720 +window/stretch/mode="2d" +window/stretch/aspect="expand" [rendering] diff --git a/2d/grid_based_movement/tilesets/grid/actor.png.import b/2d/grid_based_movement/tilesets/grid/actor.png.import index f336d1c5..c76e4d6f 100644 --- a/2d/grid_based_movement/tilesets/grid/actor.png.import +++ b/2d/grid_based_movement/tilesets/grid/actor.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/actor.png-6a88af8a7bcb079732153877dfb0db8b.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/tilesets/grid/object.png.import b/2d/grid_based_movement/tilesets/grid/object.png.import index 82d963a8..8fe5e600 100644 --- a/2d/grid_based_movement/tilesets/grid/object.png.import +++ b/2d/grid_based_movement/tilesets/grid/object.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/object.png-3e89ebfb3424e8759914732b2b0130c1.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/tilesets/grid/obstacle.png.import b/2d/grid_based_movement/tilesets/grid/obstacle.png.import index bb162d76..f797ad9c 100644 --- a/2d/grid_based_movement/tilesets/grid/obstacle.png.import +++ b/2d/grid_based_movement/tilesets/grid/obstacle.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/obstacle.png-9f01dd1d06d7b99515918b65b46bd6c1.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/grid_based_movement/tilesets/grid_lines/grid_lines.png.import b/2d/grid_based_movement/tilesets/grid_lines/grid_lines.png.import index f8e9d82a..d346eae8 100644 --- a/2d/grid_based_movement/tilesets/grid_lines/grid_lines.png.import +++ b/2d/grid_based_movement/tilesets/grid_lines/grid_lines.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/grid_lines.png-beef853b47aa830c8383e5f6cc4d03ce.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/hdr/beach_cave.tscn b/2d/hdr/beach_cave.tscn index d16d4a0f..b1d2c0f3 100644 --- a/2d/hdr/beach_cave.tscn +++ b/2d/hdr/beach_cave.tscn @@ -27,6 +27,8 @@ modulate = Color( 2, 2, 2, 1 ) self_modulate = Color( 2, 2, 2, 1 ) texture = ExtResource( 2 ) centered = false +region_enabled = true +region_rect = Rect2( 0, 0, 3840, 720 ) [node name="cave" type="Sprite" parent="."] self_modulate = Color( 0.233166, 0.221219, 0.23582, 1 ) @@ -37,11 +39,18 @@ centered = false [node name="environment" type="WorldEnvironment" parent="."] environment = SubResource( 1 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 540, 360 ) +current = true + [node name="Label" type="Label" parent="."] -margin_right = 40.0 -margin_bottom = 13.0 +margin_left = 10.0 +margin_top = 10.0 +margin_right = 135.0 +margin_bottom = 24.0 size_flags_horizontal = 2 size_flags_vertical = 0 -custom_colors/font_color = Color( 0.213955, 0.205626, 0.20313, 1 ) -text = "Drag Left and Right" - +text = "Drag Left and Right" +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/2d/hdr/icon.png.import b/2d/hdr/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/hdr/icon.png.import +++ b/2d/hdr/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/hdr/ocean_beach.png.import b/2d/hdr/ocean_beach.png.import index 974aa9fb..8259aaa7 100644 --- a/2d/hdr/ocean_beach.png.import +++ b/2d/hdr/ocean_beach.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/ocean_beach.png-b571ab5468cc775a520aaa47efbed607.stex" +metadata={ +"vram_texture": false +} [deps] @@ -16,7 +19,7 @@ compress/lossy_quality=0.7 compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=0 +flags/repeat=2 flags/filter=true flags/mipmaps=false flags/anisotropic=false diff --git a/2d/hdr/ocean_cave.png.import b/2d/hdr/ocean_cave.png.import index 942f8e5f..6f6c51a0 100644 --- a/2d/hdr/ocean_cave.png.import +++ b/2d/hdr/ocean_cave.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/ocean_cave.png-2a86f381e3092b4cb698b627d778e19b.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/hdr/project.godot b/2d/hdr/project.godot index 0f574a53..982862bf 100644 --- a/2d/hdr/project.godot +++ b/2d/hdr/project.godot @@ -24,6 +24,8 @@ run/name="" window/size/width=1080 window/size/height=720 +window/stretch/mode="2d" +window/stretch/aspect="expand" [gdnative] @@ -32,3 +34,7 @@ singletons=[ ] [rasterizer] blur_buffer_size=128 + +[rendering] + +environment/default_clear_color=Color( 0.05, 0.0453, 0.0265, 1 ) diff --git a/2d/hexagonal_map/project.godot b/2d/hexagonal_map/project.godot index e45713ad..87cd39a7 100644 --- a/2d/hexagonal_map/project.godot +++ b/2d/hexagonal_map/project.godot @@ -20,6 +20,11 @@ run/main_scene="res://map.tscn" config/icon="res://icon.png" run/name="" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -46,3 +51,7 @@ move_up={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) ] } + +[rendering] + +environment/default_clear_color=Color( 0.172549, 0.219608, 0.129412, 1 ) diff --git a/2d/hexagonal_map/troll.gd b/2d/hexagonal_map/troll.gd index 4b955e69..c4229107 100644 --- a/2d/hexagonal_map/troll.gd +++ b/2d/hexagonal_map/troll.gd @@ -9,7 +9,7 @@ const MOTION_SPEED = 160 # Pixels/second func _physics_process(_delta): var motion = Vector2() - + if Input.is_action_pressed("move_up"): motion += Vector2(0, -1) if Input.is_action_pressed("move_bottom"): @@ -18,7 +18,7 @@ func _physics_process(_delta): motion += Vector2(-1, 0) if Input.is_action_pressed("move_right"): motion += Vector2(1, 0) - + motion = motion.normalized() * MOTION_SPEED move_and_slide(motion) diff --git a/2d/hexagonal_map/troll.tscn b/2d/hexagonal_map/troll.tscn index 2a2adfee..81e19e41 100644 --- a/2d/hexagonal_map/troll.tscn +++ b/2d/hexagonal_map/troll.tscn @@ -18,4 +18,3 @@ shape = SubResource( 1 ) [node name="Camera2D" type="Camera2D" parent="."] current = true - diff --git a/2d/isometric/dungeon.tscn b/2d/isometric/dungeon.tscn index 4e6dd38b..d39d891a 100644 --- a/2d/isometric/dungeon.tscn +++ b/2d/isometric/dungeon.tscn @@ -24,4 +24,3 @@ tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917 [node name="troll" parent="walls" instance=ExtResource( 2 )] position = Vector2( 368.142, 347.007 ) - diff --git a/2d/isometric/icon.png.import b/2d/isometric/icon.png.import index 802a7b49..96cbf462 100644 --- a/2d/isometric/icon.png.import +++ b/2d/isometric/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="c79c9ad7eaca57f9b61f2e8b06d7a2ea" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="557cc789bada50b97252b4b076d9396d" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/isometric/isotiles.png.import b/2d/isometric/isotiles.png.import index 5905e0fe..787038ef 100644 --- a/2d/isometric/isotiles.png.import +++ b/2d/isometric/isotiles.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/isotiles.png-502434fe0d6c3fd8ce67cea5a960c208.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://isotiles.png" -source_md5="497da3b55d87ebab4df56dba2a0804ed" - dest_files=[ "res://.import/isotiles.png-502434fe0d6c3fd8ce67cea5a960c208.stex" ] -dest_md5="e81f39117efaa23b86988b64a3523f31" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/isometric/project.godot b/2d/isometric/project.godot index 23495566..f4dfed4f 100644 --- a/2d/isometric/project.godot +++ b/2d/isometric/project.godot @@ -19,6 +19,11 @@ config/name="Isometric Game" run/main_scene="res://dungeon.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -54,3 +59,7 @@ move_up={ [rasterizer] use_pixel_snap=true + +[rendering] + +environment/default_clear_color=Color( 0.0784314, 0.105882, 0.145098, 1 ) diff --git a/2d/isometric/troll.png.import b/2d/isometric/troll.png.import index a0d29e4e..3029f67e 100644 --- a/2d/isometric/troll.png.import +++ b/2d/isometric/troll.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/troll.png-78efc50bfccaa17f54d40cfea3eef5f5.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://troll.png" -source_md5="76a37c47b1f09115f714d6635ab50fb4" - dest_files=[ "res://.import/troll.png-78efc50bfccaa17f54d40cfea3eef5f5.stex" ] -dest_md5="aded3a6d7973cb880144e84f0b3ec505" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/circle.png.import b/2d/kinematic_character/circle.png.import index a4cfa871..ea3a4ae5 100644 --- a/2d/kinematic_character/circle.png.import +++ b/2d/kinematic_character/circle.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://circle.png" -source_md5="c01cd5674a625756c3df259f76d5295a" - dest_files=[ "res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex" ] -dest_md5="e4ec5acd02941f2f2150d836824a5d51" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/colworld.tscn b/2d/kinematic_character/colworld.tscn index a73314b6..0c98bca6 100644 --- a/2d/kinematic_character/colworld.tscn +++ b/2d/kinematic_character/colworld.tscn @@ -118,7 +118,7 @@ script = ExtResource( 1 ) tile_set = SubResource( 2 ) cell_size = Vector2( 16, 16 ) format = 1 -tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 31, 0, 0, 32, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 65553, 0, 0, 65554, 0, 0, 65555, 0, 0, 65556, 0, 0, 65557, 0, 0, 65558, 0, 0, 65559, 0, 0, 65560, 0, 0, 65561, 0, 0, 65562, 0, 0, 65563, 0, 0, 65564, 0, 0, 65565, 0, 0, 65566, 0, 0, 65567, 0, 0, 65568, 0, 0, 131072, 0, 0, 131073, 0, 0, 131103, 0, 0, 131104, 0, 0, 196608, 0, 0, 196609, 0, 0, 196639, 0, 0, 196640, 0, 0, 262144, 0, 0, 262145, 0, 0, 262175, 0, 0, 262176, 0, 0, 327680, 0, 0, 327681, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327697, 0, 0, 327711, 0, 0, 327712, 0, 0, 393216, 0, 0, 393217, 0, 0, 393237, 0, 0, 393238, 0, 0, 393247, 0, 0, 393248, 0, 0, 458752, 0, 0, 458753, 0, 0, 458783, 0, 0, 458784, 0, 0, 524288, 0, 0, 524289, 0, 0, 524313, 0, 0, 524314, 0, 0, 524319, 0, 0, 524320, 0, 0, 589824, 0, 0, 589825, 0, 0, 589830, 0, 0, 589831, 0, 0, 589832, 0, 0, 589833, 0, 0, 589834, 0, 0, 589845, 0, 0, 589846, 0, 0, 589847, 0, 0, 589855, 0, 0, 589856, 0, 0, 655360, 0, 0, 655361, 0, 0, 655391, 0, 0, 655392, 0, 0, 720896, 0, 0, 720897, 0, 0, 720927, 0, 0, 720928, 0, 0, 786432, 0, 0, 786433, 0, 0, 786463, 0, 0, 786464, 0, 0, 851968, 0, 0, 851969, 0, 0, 851999, 0, 0, 852000, 0, 0, 917504, 0, 0, 917505, 0, 0, 917535, 0, 0, 917536, 0, 0, 983040, 0, 0, 983041, 0, 0, 983071, 0, 0, 983072, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048607, 0, 0, 1048608, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1179648, 0, 0, 1179649, 0, 0, 1179654, 0, 0, 1179655, 0, 0, 1179656, 0, 0, 1179679, 0, 0, 1179680, 0, 0, 1245184, 0, 0, 1245185, 0, 0, 1245204, 0, 0, 1245205, 0, 0, 1245206, 0, 0, 1245207, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1310720, 0, 0, 1310721, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376285, 0, 0, 1376286, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1441792, 0, 0, 1441793, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1572864, 0, 0, 1572865, 0, 0, 1572895, 0, 0, 1572896, 0, 0, 1638400, 0, 0, 1638401, 0, 0, 1638413, 0, 0, 1638425, 0, 0, 1638426, 0, 0, 1638431, 0, 0, 1638432, 0, 0, 1703936, 0, 0, 1703937, 0, 0, 1703948, 0, 0, 1703965, 0, 0, 1703966, 0, 0, 1703967, 0, 0, 1703968, 0, 0, 1769472, 0, 0, 1769473, 0, 0, 1769482, 0, 0, 1769483, 0, 0, 1769500, 0, 0, 1769501, 0, 0, 1769503, 0, 0, 1769504, 0, 0, 1835008, 0, 0, 1835009, 0, 0, 1835012, 0, 0, 1835018, 0, 0, 1835019, 0, 0, 1835034, 0, 0, 1835035, 0, 0, 1835039, 0, 0, 1835040, 0, 0, 1900544, 0, 0, 1900545, 0, 0, 1900546, 0, 0, 1900547, 0, 0, 1900548, 0, 0, 1900549, 0, 0, 1900550, 0, 0, 1900551, 0, 0, 1900552, 0, 0, 1900553, 0, 0, 1900554, 0, 0, 1900555, 0, 0, 1900556, 0, 0, 1900557, 0, 0, 1900558, 0, 0, 1900559, 0, 0, 1900560, 0, 0, 1900561, 0, 0, 1900562, 0, 0, 1900563, 0, 0, 1900564, 0, 0, 1900565, 0, 0, 1900566, 0, 0, 1900567, 0, 0, 1900568, 0, 0, 1900569, 0, 0, 1900570, 0, 0, 1900571, 0, 0, 1900572, 0, 0, 1900573, 0, 0, 1900574, 0, 0, 1900575, 0, 0, 1900576, 0, 0, 1966080, 0, 0, 1966081, 0, 0, 1966082, 0, 0, 1966083, 0, 0, 1966084, 0, 0, 1966085, 0, 0, 1966086, 0, 0, 1966087, 0, 0, 1966088, 0, 0, 1966089, 0, 0, 1966090, 0, 0, 1966091, 0, 0, 1966092, 0, 0, 1966093, 0, 0, 1966094, 0, 0, 1966095, 0, 0, 1966096, 0, 0, 1966097, 0, 0, 1966098, 0, 0, 1966099, 0, 0, 1966100, 0, 0, 1966101, 0, 0, 1966102, 0, 0, 1966103, 0, 0, 1966104, 0, 0, 1966105, 0, 0, 1966106, 0, 0, 1966107, 0, 0, 1966108, 0, 0, 1966109, 0, 0, 1966110, 0, 0, 1966111, 0, 0, 1966112, 0, 0, 2031616, 0, 0, 2031617, 0, 0, 2031618, 0, 0, 2031619, 0, 0, 2031620, 0, 0, 2031621, 0, 0, 2031622, 0, 0, 2031623, 0, 0, 2031624, 0, 0, 2031625, 0, 0, 2031626, 0, 0, 2031627, 0, 0, 2031628, 0, 0, 2031629, 0, 0, 2031630, 0, 0, 2031631, 0, 0, 2031632, 0, 0, 2031633, 0, 0, 2031634, 0, 0, 2031635, 0, 0, 2031636, 0, 0, 2031637, 0, 0, 2031638, 0, 0, 2031639, 0, 0, 2031640, 0, 0, 2031641, 0, 0, 2031642, 0, 0, 2031643, 0, 0, 2031644, 0, 0, 2031645, 0, 0, 2031646, 0, 0, 2031647, 0, 0, 2031648, 0, 0 ) +tile_data = PoolIntArray( -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -786416, 0, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 0, 0, -786410, 0, 0, -786409, 0, 0, -786408, 0, 0, -786407, 0, 0, -786406, 0, 0, -786405, 0, 0, -786404, 0, 0, -786403, 0, 0, -786402, 0, 0, -786401, 0, 0, -786400, 0, 0, -786399, 0, 0, -786398, 0, 0, -786397, 0, 0, -786396, 0, 0, -786395, 0, 0, -786394, 0, 0, -786393, 0, 0, -786392, 0, 0, -786391, 0, 0, -786390, 0, 0, -786389, 0, 0, -786388, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 0, 0, -720880, 0, 0, -720879, 0, 0, -720878, 0, 0, -720877, 0, 0, -720876, 0, 0, -720875, 0, 0, -720874, 0, 0, -720873, 0, 0, -720872, 0, 0, -720871, 0, 0, -720870, 0, 0, -720869, 0, 0, -720868, 0, 0, -720867, 0, 0, -720866, 0, 0, -720865, 0, 0, -720864, 0, 0, -720863, 0, 0, -720862, 0, 0, -720861, 0, 0, -720860, 0, 0, -720859, 0, 0, -720858, 0, 0, -720857, 0, 0, -720856, 0, 0, -720855, 0, 0, -720854, 0, 0, -720853, 0, 0, -720852, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -655345, 0, 0, -655344, 0, 0, -655343, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 0, 0, -655338, 0, 0, -655337, 0, 0, -655336, 0, 0, -655335, 0, 0, -655334, 0, 0, -655333, 0, 0, -655332, 0, 0, -655331, 0, 0, -655330, 0, 0, -655329, 0, 0, -655328, 0, 0, -655327, 0, 0, -655326, 0, 0, -655325, 0, 0, -655324, 0, 0, -655323, 0, 0, -655322, 0, 0, -655321, 0, 0, -655320, 0, 0, -655319, 0, 0, -655318, 0, 0, -655317, 0, 0, -655316, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -589809, 0, 0, -589808, 0, 0, -589807, 0, 0, -589806, 0, 0, -589805, 0, 0, -589804, 0, 0, -589803, 0, 0, -589802, 0, 0, -589801, 0, 0, -589800, 0, 0, -589799, 0, 0, -589798, 0, 0, -589797, 0, 0, -589796, 0, 0, -589795, 0, 0, -589794, 0, 0, -589793, 0, 0, -589792, 0, 0, -589791, 0, 0, -589790, 0, 0, -589789, 0, 0, -589788, 0, 0, -589787, 0, 0, -589786, 0, 0, -589785, 0, 0, -589784, 0, 0, -589783, 0, 0, -589782, 0, 0, -589781, 0, 0, -589780, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -524273, 0, 0, -524272, 0, 0, -524271, 0, 0, -524270, 0, 0, -524269, 0, 0, -524268, 0, 0, -524267, 0, 0, -524266, 0, 0, -524265, 0, 0, -524264, 0, 0, -524263, 0, 0, -524262, 0, 0, -524261, 0, 0, -524260, 0, 0, -524259, 0, 0, -524258, 0, 0, -524257, 0, 0, -524256, 0, 0, -524255, 0, 0, -524254, 0, 0, -524253, 0, 0, -524252, 0, 0, -524251, 0, 0, -524250, 0, 0, -524249, 0, 0, -524248, 0, 0, -524247, 0, 0, -524246, 0, 0, -524245, 0, 0, -524244, 0, 0, -393228, 0, 0, -393227, 0, 0, -393226, 0, 0, -393225, 0, 0, -393224, 0, 0, -393223, 0, 0, -393222, 0, 0, -393221, 0, 0, -393220, 0, 0, -393219, 0, 0, -393218, 0, 0, -393217, 0, 0, -458752, 0, 0, -458751, 0, 0, -458750, 0, 0, -458749, 0, 0, -458748, 0, 0, -458747, 0, 0, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -458737, 0, 0, -458736, 0, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0, -458730, 0, 0, -458729, 0, 0, -458728, 0, 0, -458727, 0, 0, -458726, 0, 0, -458725, 0, 0, -458724, 0, 0, -458723, 0, 0, -458722, 0, 0, -458721, 0, 0, -458720, 0, 0, -458719, 0, 0, -458718, 0, 0, -458717, 0, 0, -458716, 0, 0, -458715, 0, 0, -458714, 0, 0, -458713, 0, 0, -458712, 0, 0, -458711, 0, 0, -458710, 0, 0, -458709, 0, 0, -458708, 0, 0, -327692, 0, 0, -327691, 0, 0, -327690, 0, 0, -327689, 0, 0, -327688, 0, 0, -327687, 0, 0, -327686, 0, 0, -327685, 0, 0, -327684, 0, 0, -327683, 0, 0, -327682, 0, 0, -327681, 0, 0, -393216, 0, 0, -393215, 0, 0, -393214, 0, 0, -393213, 0, 0, -393212, 0, 0, -393211, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0, -393201, 0, 0, -393200, 0, 0, -393199, 0, 0, -393198, 0, 0, -393197, 0, 0, -393196, 0, 0, -393195, 0, 0, -393194, 0, 0, -393193, 0, 0, -393192, 0, 0, -393191, 0, 0, -393190, 0, 0, -393189, 0, 0, -393188, 0, 0, -393187, 0, 0, -393186, 0, 0, -393185, 0, 0, -393184, 0, 0, -393183, 0, 0, -393182, 0, 0, -393181, 0, 0, -393180, 0, 0, -393179, 0, 0, -393178, 0, 0, -393177, 0, 0, -393176, 0, 0, -393175, 0, 0, -393174, 0, 0, -393173, 0, 0, -393172, 0, 0, -262156, 0, 0, -262155, 0, 0, -262154, 0, 0, -262153, 0, 0, -262152, 0, 0, -262151, 0, 0, -262150, 0, 0, -262149, 0, 0, -262148, 0, 0, -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, 0, 0, -327679, 0, 0, -327678, 0, 0, -327677, 0, 0, -327676, 0, 0, -327675, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -327666, 0, 0, -327665, 0, 0, -327664, 0, 0, -327663, 0, 0, -327662, 0, 0, -327661, 0, 0, -327660, 0, 0, -327659, 0, 0, -327658, 0, 0, -327657, 0, 0, -327656, 0, 0, -327655, 0, 0, -327654, 0, 0, -327653, 0, 0, -327652, 0, 0, -327651, 0, 0, -327650, 0, 0, -327649, 0, 0, -327648, 0, 0, -327647, 0, 0, -327646, 0, 0, -327645, 0, 0, -327644, 0, 0, -327643, 0, 0, -327642, 0, 0, -327641, 0, 0, -327640, 0, 0, -327639, 0, 0, -327638, 0, 0, -327637, 0, 0, -327636, 0, 0, -196620, 0, 0, -196619, 0, 0, -196618, 0, 0, -196617, 0, 0, -196616, 0, 0, -196615, 0, 0, -196614, 0, 0, -196613, 0, 0, -196612, 0, 0, -196611, 0, 0, -196610, 0, 0, -196609, 0, 0, -262144, 0, 0, -262143, 0, 0, -262142, 0, 0, -262141, 0, 0, -262140, 0, 0, -262139, 0, 0, -262138, 0, 0, -262137, 0, 0, -262136, 0, 0, -262135, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -262130, 0, 0, -262129, 0, 0, -262128, 0, 0, -262127, 0, 0, -262126, 0, 0, -262125, 0, 0, -262124, 0, 0, -262123, 0, 0, -262122, 0, 0, -262121, 0, 0, -262120, 0, 0, -262119, 0, 0, -262118, 0, 0, -262117, 0, 0, -262116, 0, 0, -262115, 0, 0, -262114, 0, 0, -262113, 0, 0, -262112, 0, 0, -262111, 0, 0, -262110, 0, 0, -262109, 0, 0, -262108, 0, 0, -262107, 0, 0, -262106, 0, 0, -262105, 0, 0, -262104, 0, 0, -262103, 0, 0, -262102, 0, 0, -262101, 0, 0, -262100, 0, 0, -131084, 0, 0, -131083, 0, 0, -131082, 0, 0, -131081, 0, 0, -131080, 0, 0, -131079, 0, 0, -131078, 0, 0, -131077, 0, 0, -131076, 0, 0, -131075, 0, 0, -131074, 0, 0, -131073, 0, 0, -196608, 0, 0, -196607, 0, 0, -196606, 0, 0, -196605, 0, 0, -196604, 0, 0, -196603, 0, 0, -196602, 0, 0, -196601, 0, 0, -196600, 0, 0, -196599, 0, 0, -196598, 0, 0, -196597, 0, 0, -196596, 0, 0, -196595, 0, 0, -196594, 0, 0, -196593, 0, 0, -196592, 0, 0, -196591, 0, 0, -196590, 0, 0, -196589, 0, 0, -196588, 0, 0, -196587, 0, 0, -196586, 0, 0, -196585, 0, 0, -196584, 0, 0, -196583, 0, 0, -196582, 0, 0, -196581, 0, 0, -196580, 0, 0, -196579, 0, 0, -196578, 0, 0, -196577, 0, 0, -196576, 0, 0, -196575, 0, 0, -196574, 0, 0, -196573, 0, 0, -196572, 0, 0, -196571, 0, 0, -196570, 0, 0, -196569, 0, 0, -196568, 0, 0, -196567, 0, 0, -196566, 0, 0, -196565, 0, 0, -196564, 0, 0, -65548, 0, 0, -65547, 0, 0, -65546, 0, 0, -65545, 0, 0, -65544, 0, 0, -65543, 0, 0, -65542, 0, 0, -65541, 0, 0, -65540, 0, 0, -65539, 0, 0, -65538, 0, 0, -65537, 0, 0, -131072, 0, 0, -131071, 0, 0, -131070, 0, 0, -131069, 0, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131064, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0, -131058, 0, 0, -131057, 0, 0, -131056, 0, 0, -131055, 0, 0, -131054, 0, 0, -131053, 0, 0, -131052, 0, 0, -131051, 0, 0, -131050, 0, 0, -131049, 0, 0, -131048, 0, 0, -131047, 0, 0, -131046, 0, 0, -131045, 0, 0, -131044, 0, 0, -131043, 0, 0, -131042, 0, 0, -131041, 0, 0, -131040, 0, 0, -131039, 0, 0, -131038, 0, 0, -131037, 0, 0, -131036, 0, 0, -131035, 0, 0, -131034, 0, 0, -131033, 0, 0, -131032, 0, 0, -131031, 0, 0, -131030, 0, 0, -131029, 0, 0, -131028, 0, 0, -12, 0, 0, -11, 0, 0, -10, 0, 0, -9, 0, 0, -8, 0, 0, -7, 0, 0, -6, 0, 0, -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0, -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, -65524, 0, 0, -65523, 0, 0, -65522, 0, 0, -65521, 0, 0, -65520, 0, 0, -65519, 0, 0, -65518, 0, 0, -65517, 0, 0, -65516, 0, 0, -65515, 0, 0, -65514, 0, 0, -65513, 0, 0, -65512, 0, 0, -65511, 0, 0, -65510, 0, 0, -65509, 0, 0, -65508, 0, 0, -65507, 0, 0, -65506, 0, 0, -65505, 0, 0, -65504, 0, 0, -65503, 0, 0, -65502, 0, 0, -65501, 0, 0, -65500, 0, 0, -65499, 0, 0, -65498, 0, 0, -65497, 0, 0, -65496, 0, 0, -65495, 0, 0, -65494, 0, 0, -65493, 0, 0, -65492, 0, 0, 65524, 0, 0, 65525, 0, 0, 65526, 0, 0, 65527, 0, 0, 65528, 0, 0, 65529, 0, 0, 65530, 0, 0, 65531, 0, 0, 65532, 0, 0, 65533, 0, 0, 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 31, 0, 0, 32, 0, 0, 33, 0, 0, 34, 0, 0, 35, 0, 0, 36, 0, 0, 37, 0, 0, 38, 0, 0, 39, 0, 0, 40, 0, 0, 41, 0, 0, 42, 0, 0, 43, 0, 0, 44, 0, 0, 131060, 0, 0, 131061, 0, 0, 131062, 0, 0, 131063, 0, 0, 131064, 0, 0, 131065, 0, 0, 131066, 0, 0, 131067, 0, 0, 131068, 0, 0, 131069, 0, 0, 131070, 0, 0, 131071, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 65553, 0, 0, 65554, 0, 0, 65555, 0, 0, 65556, 0, 0, 65557, 0, 0, 65558, 0, 0, 65559, 0, 0, 65560, 0, 0, 65561, 0, 0, 65562, 0, 0, 65563, 0, 0, 65564, 0, 0, 65565, 0, 0, 65566, 0, 0, 65567, 0, 0, 65568, 0, 0, 65569, 0, 0, 65570, 0, 0, 65571, 0, 0, 65572, 0, 0, 65573, 0, 0, 65574, 0, 0, 65575, 0, 0, 65576, 0, 0, 65577, 0, 0, 65578, 0, 0, 65579, 0, 0, 65580, 0, 0, 196596, 0, 0, 196597, 0, 0, 196598, 0, 0, 196599, 0, 0, 196600, 0, 0, 196601, 0, 0, 196602, 0, 0, 196603, 0, 0, 196604, 0, 0, 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 131103, 0, 0, 131104, 0, 0, 131105, 0, 0, 131106, 0, 0, 131107, 0, 0, 131108, 0, 0, 131109, 0, 0, 131110, 0, 0, 131111, 0, 0, 131112, 0, 0, 131113, 0, 0, 131114, 0, 0, 131115, 0, 0, 131116, 0, 0, 262132, 0, 0, 262133, 0, 0, 262134, 0, 0, 262135, 0, 0, 262136, 0, 0, 262137, 0, 0, 262138, 0, 0, 262139, 0, 0, 262140, 0, 0, 262141, 0, 0, 262142, 0, 0, 262143, 0, 0, 196608, 0, 0, 196609, 0, 0, 196639, 0, 0, 196640, 0, 0, 196641, 0, 0, 196642, 0, 0, 196643, 0, 0, 196644, 0, 0, 196645, 0, 0, 196646, 0, 0, 196647, 0, 0, 196648, 0, 0, 196649, 0, 0, 196650, 0, 0, 196651, 0, 0, 196652, 0, 0, 327668, 0, 0, 327669, 0, 0, 327670, 0, 0, 327671, 0, 0, 327672, 0, 0, 327673, 0, 0, 327674, 0, 0, 327675, 0, 0, 327676, 0, 0, 327677, 0, 0, 327678, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 0, 0, 262175, 0, 0, 262176, 0, 0, 262177, 0, 0, 262178, 0, 0, 262179, 0, 0, 262180, 0, 0, 262181, 0, 0, 262182, 0, 0, 262183, 0, 0, 262184, 0, 0, 262185, 0, 0, 262186, 0, 0, 262187, 0, 0, 262188, 0, 0, 393204, 0, 0, 393205, 0, 0, 393206, 0, 0, 393207, 0, 0, 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0, 393212, 0, 0, 393213, 0, 0, 393214, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327697, 0, 0, 327711, 0, 0, 327712, 0, 0, 327713, 0, 0, 327714, 0, 0, 327715, 0, 0, 327716, 0, 0, 327717, 0, 0, 327718, 0, 0, 327719, 0, 0, 327720, 0, 0, 327721, 0, 0, 327722, 0, 0, 327723, 0, 0, 327724, 0, 0, 458740, 0, 0, 458741, 0, 0, 458742, 0, 0, 458743, 0, 0, 458744, 0, 0, 458745, 0, 0, 458746, 0, 0, 458747, 0, 0, 458748, 0, 0, 458749, 0, 0, 458750, 0, 0, 458751, 0, 0, 393216, 0, 0, 393217, 0, 0, 393237, 0, 0, 393238, 0, 0, 393247, 0, 0, 393248, 0, 0, 393249, 0, 0, 393250, 0, 0, 393251, 0, 0, 393252, 0, 0, 393253, 0, 0, 393254, 0, 0, 393255, 0, 0, 393256, 0, 0, 393257, 0, 0, 393258, 0, 0, 393259, 0, 0, 393260, 0, 0, 524276, 0, 0, 524277, 0, 0, 524278, 0, 0, 524279, 0, 0, 524280, 0, 0, 524281, 0, 0, 524282, 0, 0, 524283, 0, 0, 524284, 0, 0, 524285, 0, 0, 524286, 0, 0, 524287, 0, 0, 458752, 0, 0, 458753, 0, 0, 458783, 0, 0, 458784, 0, 0, 458785, 0, 0, 458786, 0, 0, 458787, 0, 0, 458788, 0, 0, 458789, 0, 0, 458790, 0, 0, 458791, 0, 0, 458792, 0, 0, 458793, 0, 0, 458794, 0, 0, 458795, 0, 0, 458796, 0, 0, 589812, 0, 0, 589813, 0, 0, 589814, 0, 0, 589815, 0, 0, 589816, 0, 0, 589817, 0, 0, 589818, 0, 0, 589819, 0, 0, 589820, 0, 0, 589821, 0, 0, 589822, 0, 0, 589823, 0, 0, 524288, 0, 0, 524289, 0, 0, 524313, 0, 0, 524314, 0, 0, 524319, 0, 0, 524320, 0, 0, 524321, 0, 0, 524322, 0, 0, 524323, 0, 0, 524324, 0, 0, 524325, 0, 0, 524326, 0, 0, 524327, 0, 0, 524328, 0, 0, 524329, 0, 0, 524330, 0, 0, 524331, 0, 0, 524332, 0, 0, 655348, 0, 0, 655349, 0, 0, 655350, 0, 0, 655351, 0, 0, 655352, 0, 0, 655353, 0, 0, 655354, 0, 0, 655355, 0, 0, 655356, 0, 0, 655357, 0, 0, 655358, 0, 0, 655359, 0, 0, 589824, 0, 0, 589825, 0, 0, 589830, 0, 0, 589831, 0, 0, 589832, 0, 0, 589833, 0, 0, 589834, 0, 0, 589845, 0, 0, 589846, 0, 0, 589847, 0, 0, 589855, 0, 0, 589856, 0, 0, 589857, 0, 0, 589858, 0, 0, 589859, 0, 0, 589860, 0, 0, 589861, 0, 0, 589862, 0, 0, 589863, 0, 0, 589864, 0, 0, 589865, 0, 0, 589866, 0, 0, 589867, 0, 0, 589868, 0, 0, 720884, 0, 0, 720885, 0, 0, 720886, 0, 0, 720887, 0, 0, 720888, 0, 0, 720889, 0, 0, 720890, 0, 0, 720891, 0, 0, 720892, 0, 0, 720893, 0, 0, 720894, 0, 0, 720895, 0, 0, 655360, 0, 0, 655361, 0, 0, 655391, 0, 0, 655392, 0, 0, 655393, 0, 0, 655394, 0, 0, 655395, 0, 0, 655396, 0, 0, 655397, 0, 0, 655398, 0, 0, 655399, 0, 0, 655400, 0, 0, 655401, 0, 0, 655402, 0, 0, 655403, 0, 0, 655404, 0, 0, 786420, 0, 0, 786421, 0, 0, 786422, 0, 0, 786423, 0, 0, 786424, 0, 0, 786425, 0, 0, 786426, 0, 0, 786427, 0, 0, 786428, 0, 0, 786429, 0, 0, 786430, 0, 0, 786431, 0, 0, 720896, 0, 0, 720897, 0, 0, 720927, 0, 0, 720928, 0, 0, 720929, 0, 0, 720930, 0, 0, 720931, 0, 0, 720932, 0, 0, 720933, 0, 0, 720934, 0, 0, 720935, 0, 0, 720936, 0, 0, 720937, 0, 0, 720938, 0, 0, 720939, 0, 0, 720940, 0, 0, 851956, 0, 0, 851957, 0, 0, 851958, 0, 0, 851959, 0, 0, 851960, 0, 0, 851961, 0, 0, 851962, 0, 0, 851963, 0, 0, 851964, 0, 0, 851965, 0, 0, 851966, 0, 0, 851967, 0, 0, 786432, 0, 0, 786433, 0, 0, 786463, 0, 0, 786464, 0, 0, 786465, 0, 0, 786466, 0, 0, 786467, 0, 0, 786468, 0, 0, 786469, 0, 0, 786470, 0, 0, 786471, 0, 0, 786472, 0, 0, 786473, 0, 0, 786474, 0, 0, 786475, 0, 0, 786476, 0, 0, 917492, 0, 0, 917493, 0, 0, 917494, 0, 0, 917495, 0, 0, 917496, 0, 0, 917497, 0, 0, 917498, 0, 0, 917499, 0, 0, 917500, 0, 0, 917501, 0, 0, 917502, 0, 0, 917503, 0, 0, 851968, 0, 0, 851969, 0, 0, 851999, 0, 0, 852000, 0, 0, 852001, 0, 0, 852002, 0, 0, 852003, 0, 0, 852004, 0, 0, 852005, 0, 0, 852006, 0, 0, 852007, 0, 0, 852008, 0, 0, 852009, 0, 0, 852010, 0, 0, 852011, 0, 0, 852012, 0, 0, 983028, 0, 0, 983029, 0, 0, 983030, 0, 0, 983031, 0, 0, 983032, 0, 0, 983033, 0, 0, 983034, 0, 0, 983035, 0, 0, 983036, 0, 0, 983037, 0, 0, 983038, 0, 0, 983039, 0, 0, 917504, 0, 0, 917505, 0, 0, 917535, 0, 0, 917536, 0, 0, 917537, 0, 0, 917538, 0, 0, 917539, 0, 0, 917540, 0, 0, 917541, 0, 0, 917542, 0, 0, 917543, 0, 0, 917544, 0, 0, 917545, 0, 0, 917546, 0, 0, 917547, 0, 0, 917548, 0, 0, 1048564, 0, 0, 1048565, 0, 0, 1048566, 0, 0, 1048567, 0, 0, 1048568, 0, 0, 1048569, 0, 0, 1048570, 0, 0, 1048571, 0, 0, 1048572, 0, 0, 1048573, 0, 0, 1048574, 0, 0, 1048575, 0, 0, 983040, 0, 0, 983041, 0, 0, 983071, 0, 0, 983072, 0, 0, 983073, 0, 0, 983074, 0, 0, 983075, 0, 0, 983076, 0, 0, 983077, 0, 0, 983078, 0, 0, 983079, 0, 0, 983080, 0, 0, 983081, 0, 0, 983082, 0, 0, 983083, 0, 0, 983084, 0, 0, 1114100, 0, 0, 1114101, 0, 0, 1114102, 0, 0, 1114103, 0, 0, 1114104, 0, 0, 1114105, 0, 0, 1114106, 0, 0, 1114107, 0, 0, 1114108, 0, 0, 1114109, 0, 0, 1114110, 0, 0, 1114111, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048607, 0, 0, 1048608, 0, 0, 1048609, 0, 0, 1048610, 0, 0, 1048611, 0, 0, 1048612, 0, 0, 1048613, 0, 0, 1048614, 0, 0, 1048615, 0, 0, 1048616, 0, 0, 1048617, 0, 0, 1048618, 0, 0, 1048619, 0, 0, 1048620, 0, 0, 1179636, 0, 0, 1179637, 0, 0, 1179638, 0, 0, 1179639, 0, 0, 1179640, 0, 0, 1179641, 0, 0, 1179642, 0, 0, 1179643, 0, 0, 1179644, 0, 0, 1179645, 0, 0, 1179646, 0, 0, 1179647, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1114145, 0, 0, 1114146, 0, 0, 1114147, 0, 0, 1114148, 0, 0, 1114149, 0, 0, 1114150, 0, 0, 1114151, 0, 0, 1114152, 0, 0, 1114153, 0, 0, 1114154, 0, 0, 1114155, 0, 0, 1114156, 0, 0, 1245172, 0, 0, 1245173, 0, 0, 1245174, 0, 0, 1245175, 0, 0, 1245176, 0, 0, 1245177, 0, 0, 1245178, 0, 0, 1245179, 0, 0, 1245180, 0, 0, 1245181, 0, 0, 1245182, 0, 0, 1245183, 0, 0, 1179648, 0, 0, 1179649, 0, 0, 1179654, 0, 0, 1179655, 0, 0, 1179656, 0, 0, 1179679, 0, 0, 1179680, 0, 0, 1179681, 0, 0, 1179682, 0, 0, 1179683, 0, 0, 1179684, 0, 0, 1179685, 0, 0, 1179686, 0, 0, 1179687, 0, 0, 1179688, 0, 0, 1179689, 0, 0, 1179690, 0, 0, 1179691, 0, 0, 1179692, 0, 0, 1310708, 0, 0, 1310709, 0, 0, 1310710, 0, 0, 1310711, 0, 0, 1310712, 0, 0, 1310713, 0, 0, 1310714, 0, 0, 1310715, 0, 0, 1310716, 0, 0, 1310717, 0, 0, 1310718, 0, 0, 1310719, 0, 0, 1245184, 0, 0, 1245185, 0, 0, 1245204, 0, 0, 1245205, 0, 0, 1245206, 0, 0, 1245207, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1245217, 0, 0, 1245218, 0, 0, 1245219, 0, 0, 1245220, 0, 0, 1245221, 0, 0, 1245222, 0, 0, 1245223, 0, 0, 1245224, 0, 0, 1245225, 0, 0, 1245226, 0, 0, 1245227, 0, 0, 1245228, 0, 0, 1376244, 0, 0, 1376245, 0, 0, 1376246, 0, 0, 1376247, 0, 0, 1376248, 0, 0, 1376249, 0, 0, 1376250, 0, 0, 1376251, 0, 0, 1376252, 0, 0, 1376253, 0, 0, 1376254, 0, 0, 1376255, 0, 0, 1310720, 0, 0, 1310721, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1310753, 0, 0, 1310754, 0, 0, 1310755, 0, 0, 1310756, 0, 0, 1310757, 0, 0, 1310758, 0, 0, 1310759, 0, 0, 1310760, 0, 0, 1310761, 0, 0, 1310762, 0, 0, 1310763, 0, 0, 1310764, 0, 0, 1441780, 0, 0, 1441781, 0, 0, 1441782, 0, 0, 1441783, 0, 0, 1441784, 0, 0, 1441785, 0, 0, 1441786, 0, 0, 1441787, 0, 0, 1441788, 0, 0, 1441789, 0, 0, 1441790, 0, 0, 1441791, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376285, 0, 0, 1376286, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1376289, 0, 0, 1376290, 0, 0, 1376291, 0, 0, 1376292, 0, 0, 1376293, 0, 0, 1376294, 0, 0, 1376295, 0, 0, 1376296, 0, 0, 1376297, 0, 0, 1376298, 0, 0, 1376299, 0, 0, 1376300, 0, 0, 1507316, 0, 0, 1507317, 0, 0, 1507318, 0, 0, 1507319, 0, 0, 1507320, 0, 0, 1507321, 0, 0, 1507322, 0, 0, 1507323, 0, 0, 1507324, 0, 0, 1507325, 0, 0, 1507326, 0, 0, 1507327, 0, 0, 1441792, 0, 0, 1441793, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1572852, 0, 0, 1572853, 0, 0, 1572854, 0, 0, 1572855, 0, 0, 1572856, 0, 0, 1572857, 0, 0, 1572858, 0, 0, 1572859, 0, 0, 1572860, 0, 0, 1572861, 0, 0, 1572862, 0, 0, 1572863, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1638388, 0, 0, 1638389, 0, 0, 1638390, 0, 0, 1638391, 0, 0, 1638392, 0, 0, 1638393, 0, 0, 1638394, 0, 0, 1638395, 0, 0, 1638396, 0, 0, 1638397, 0, 0, 1638398, 0, 0, 1638399, 0, 0, 1572864, 0, 0, 1572865, 0, 0, 1572895, 0, 0, 1572896, 0, 0, 1572897, 0, 0, 1572898, 0, 0, 1572899, 0, 0, 1572900, 0, 0, 1572901, 0, 0, 1572902, 0, 0, 1572903, 0, 0, 1572904, 0, 0, 1572905, 0, 0, 1572906, 0, 0, 1572907, 0, 0, 1572908, 0, 0, 1703924, 0, 0, 1703925, 0, 0, 1703926, 0, 0, 1703927, 0, 0, 1703928, 0, 0, 1703929, 0, 0, 1703930, 0, 0, 1703931, 0, 0, 1703932, 0, 0, 1703933, 0, 0, 1703934, 0, 0, 1703935, 0, 0, 1638400, 0, 0, 1638401, 0, 0, 1638413, 0, 0, 1638425, 0, 0, 1638426, 0, 0, 1638431, 0, 0, 1638432, 0, 0, 1638433, 0, 0, 1638434, 0, 0, 1638435, 0, 0, 1638436, 0, 0, 1638437, 0, 0, 1638438, 0, 0, 1638439, 0, 0, 1638440, 0, 0, 1638441, 0, 0, 1638442, 0, 0, 1638443, 0, 0, 1638444, 0, 0, 1769460, 0, 0, 1769461, 0, 0, 1769462, 0, 0, 1769463, 0, 0, 1769464, 0, 0, 1769465, 0, 0, 1769466, 0, 0, 1769467, 0, 0, 1769468, 0, 0, 1769469, 0, 0, 1769470, 0, 0, 1769471, 0, 0, 1703936, 0, 0, 1703937, 0, 0, 1703948, 0, 0, 1703965, 0, 0, 1703966, 0, 0, 1703967, 0, 0, 1703968, 0, 0, 1703969, 0, 0, 1703970, 0, 0, 1703971, 0, 0, 1703972, 0, 0, 1703973, 0, 0, 1703974, 0, 0, 1703975, 0, 0, 1703976, 0, 0, 1703977, 0, 0, 1703978, 0, 0, 1703979, 0, 0, 1703980, 0, 0, 1834996, 0, 0, 1834997, 0, 0, 1834998, 0, 0, 1834999, 0, 0, 1835000, 0, 0, 1835001, 0, 0, 1835002, 0, 0, 1835003, 0, 0, 1835004, 0, 0, 1835005, 0, 0, 1835006, 0, 0, 1835007, 0, 0, 1769472, 0, 0, 1769473, 0, 0, 1769482, 0, 0, 1769483, 0, 0, 1769500, 0, 0, 1769501, 0, 0, 1769503, 0, 0, 1769504, 0, 0, 1769505, 0, 0, 1769506, 0, 0, 1769507, 0, 0, 1769508, 0, 0, 1769509, 0, 0, 1769510, 0, 0, 1769511, 0, 0, 1769512, 0, 0, 1769513, 0, 0, 1769514, 0, 0, 1769515, 0, 0, 1769516, 0, 0, 1900532, 0, 0, 1900533, 0, 0, 1900534, 0, 0, 1900535, 0, 0, 1900536, 0, 0, 1900537, 0, 0, 1900538, 0, 0, 1900539, 0, 0, 1900540, 0, 0, 1900541, 0, 0, 1900542, 0, 0, 1900543, 0, 0, 1835008, 0, 0, 1835009, 0, 0, 1835012, 0, 0, 1835018, 0, 0, 1835019, 0, 0, 1835034, 0, 0, 1835035, 0, 0, 1835039, 0, 0, 1835040, 0, 0, 1835041, 0, 0, 1835042, 0, 0, 1835043, 0, 0, 1835044, 0, 0, 1835045, 0, 0, 1835046, 0, 0, 1835047, 0, 0, 1835048, 0, 0, 1835049, 0, 0, 1835050, 0, 0, 1835051, 0, 0, 1835052, 0, 0, 1966068, 0, 0, 1966069, 0, 0, 1966070, 0, 0, 1966071, 0, 0, 1966072, 0, 0, 1966073, 0, 0, 1966074, 0, 0, 1966075, 0, 0, 1966076, 0, 0, 1966077, 0, 0, 1966078, 0, 0, 1966079, 0, 0, 1900544, 0, 0, 1900545, 0, 0, 1900546, 0, 0, 1900547, 0, 0, 1900548, 0, 0, 1900549, 0, 0, 1900550, 0, 0, 1900551, 0, 0, 1900552, 0, 0, 1900553, 0, 0, 1900554, 0, 0, 1900555, 0, 0, 1900556, 0, 0, 1900557, 0, 0, 1900558, 0, 0, 1900559, 0, 0, 1900560, 0, 0, 1900561, 0, 0, 1900562, 0, 0, 1900563, 0, 0, 1900564, 0, 0, 1900565, 0, 0, 1900566, 0, 0, 1900567, 0, 0, 1900568, 0, 0, 1900569, 0, 0, 1900570, 0, 0, 1900571, 0, 0, 1900572, 0, 0, 1900573, 0, 0, 1900574, 0, 0, 1900575, 0, 0, 1900576, 0, 0, 1900577, 0, 0, 1900578, 0, 0, 1900579, 0, 0, 1900580, 0, 0, 1900581, 0, 0, 1900582, 0, 0, 1900583, 0, 0, 1900584, 0, 0, 1900585, 0, 0, 1900586, 0, 0, 1900587, 0, 0, 1900588, 0, 0, 2031604, 0, 0, 2031605, 0, 0, 2031606, 0, 0, 2031607, 0, 0, 2031608, 0, 0, 2031609, 0, 0, 2031610, 0, 0, 2031611, 0, 0, 2031612, 0, 0, 2031613, 0, 0, 2031614, 0, 0, 2031615, 0, 0, 1966080, 0, 0, 1966081, 0, 0, 1966082, 0, 0, 1966083, 0, 0, 1966084, 0, 0, 1966085, 0, 0, 1966086, 0, 0, 1966087, 0, 0, 1966088, 0, 0, 1966089, 0, 0, 1966090, 0, 0, 1966091, 0, 0, 1966092, 0, 0, 1966093, 0, 0, 1966094, 0, 0, 1966095, 0, 0, 1966096, 0, 0, 1966097, 0, 0, 1966098, 0, 0, 1966099, 0, 0, 1966100, 0, 0, 1966101, 0, 0, 1966102, 0, 0, 1966103, 0, 0, 1966104, 0, 0, 1966105, 0, 0, 1966106, 0, 0, 1966107, 0, 0, 1966108, 0, 0, 1966109, 0, 0, 1966110, 0, 0, 1966111, 0, 0, 1966112, 0, 0, 1966113, 0, 0, 1966114, 0, 0, 1966115, 0, 0, 1966116, 0, 0, 1966117, 0, 0, 1966118, 0, 0, 1966119, 0, 0, 1966120, 0, 0, 1966121, 0, 0, 1966122, 0, 0, 1966123, 0, 0, 1966124, 0, 0, 2097140, 0, 0, 2097141, 0, 0, 2097142, 0, 0, 2097143, 0, 0, 2097144, 0, 0, 2097145, 0, 0, 2097146, 0, 0, 2097147, 0, 0, 2097148, 0, 0, 2097149, 0, 0, 2097150, 0, 0, 2097151, 0, 0, 2031616, 0, 0, 2031617, 0, 0, 2031618, 0, 0, 2031619, 0, 0, 2031620, 0, 0, 2031621, 0, 0, 2031622, 0, 0, 2031623, 0, 0, 2031624, 0, 0, 2031625, 0, 0, 2031626, 0, 0, 2031627, 0, 0, 2031628, 0, 0, 2031629, 0, 0, 2031630, 0, 0, 2031631, 0, 0, 2031632, 0, 0, 2031633, 0, 0, 2031634, 0, 0, 2031635, 0, 0, 2031636, 0, 0, 2031637, 0, 0, 2031638, 0, 0, 2031639, 0, 0, 2031640, 0, 0, 2031641, 0, 0, 2031642, 0, 0, 2031643, 0, 0, 2031644, 0, 0, 2031645, 0, 0, 2031646, 0, 0, 2031647, 0, 0, 2031648, 0, 0, 2031649, 0, 0, 2031650, 0, 0, 2031651, 0, 0, 2031652, 0, 0, 2031653, 0, 0, 2031654, 0, 0, 2031655, 0, 0, 2031656, 0, 0, 2031657, 0, 0, 2031658, 0, 0, 2031659, 0, 0, 2031660, 0, 0, 2162676, 0, 0, 2162677, 0, 0, 2162678, 0, 0, 2162679, 0, 0, 2162680, 0, 0, 2162681, 0, 0, 2162682, 0, 0, 2162683, 0, 0, 2162684, 0, 0, 2162685, 0, 0, 2162686, 0, 0, 2162687, 0, 0, 2097152, 0, 0, 2097153, 0, 0, 2097154, 0, 0, 2097155, 0, 0, 2097156, 0, 0, 2097157, 0, 0, 2097158, 0, 0, 2097159, 0, 0, 2097160, 0, 0, 2097161, 0, 0, 2097162, 0, 0, 2097163, 0, 0, 2097164, 0, 0, 2097165, 0, 0, 2097166, 0, 0, 2097167, 0, 0, 2097168, 0, 0, 2097169, 0, 0, 2097170, 0, 0, 2097171, 0, 0, 2097172, 0, 0, 2097173, 0, 0, 2097174, 0, 0, 2097175, 0, 0, 2097176, 0, 0, 2097177, 0, 0, 2097178, 0, 0, 2097179, 0, 0, 2097180, 0, 0, 2097181, 0, 0, 2097182, 0, 0, 2097183, 0, 0, 2097184, 0, 0, 2097185, 0, 0, 2097186, 0, 0, 2097187, 0, 0, 2097188, 0, 0, 2097189, 0, 0, 2097190, 0, 0, 2097191, 0, 0, 2097192, 0, 0, 2097193, 0, 0, 2097194, 0, 0, 2097195, 0, 0, 2097196, 0, 0, 2228212, 0, 0, 2228213, 0, 0, 2228214, 0, 0, 2228215, 0, 0, 2228216, 0, 0, 2228217, 0, 0, 2228218, 0, 0, 2228219, 0, 0, 2228220, 0, 0, 2228221, 0, 0, 2228222, 0, 0, 2228223, 0, 0, 2162688, 0, 0, 2162689, 0, 0, 2162690, 0, 0, 2162691, 0, 0, 2162692, 0, 0, 2162693, 0, 0, 2162694, 0, 0, 2162695, 0, 0, 2162696, 0, 0, 2162697, 0, 0, 2162698, 0, 0, 2162699, 0, 0, 2162700, 0, 0, 2162701, 0, 0, 2162702, 0, 0, 2162703, 0, 0, 2162704, 0, 0, 2162705, 0, 0, 2162706, 0, 0, 2162707, 0, 0, 2162708, 0, 0, 2162709, 0, 0, 2162710, 0, 0, 2162711, 0, 0, 2162712, 0, 0, 2162713, 0, 0, 2162714, 0, 0, 2162715, 0, 0, 2162716, 0, 0, 2162717, 0, 0, 2162718, 0, 0, 2162719, 0, 0, 2162720, 0, 0, 2162721, 0, 0, 2162722, 0, 0, 2162723, 0, 0, 2162724, 0, 0, 2162725, 0, 0, 2162726, 0, 0, 2162727, 0, 0, 2162728, 0, 0, 2162729, 0, 0, 2162730, 0, 0, 2162731, 0, 0, 2162732, 0, 0, 2293748, 0, 0, 2293749, 0, 0, 2293750, 0, 0, 2293751, 0, 0, 2293752, 0, 0, 2293753, 0, 0, 2293754, 0, 0, 2293755, 0, 0, 2293756, 0, 0, 2293757, 0, 0, 2293758, 0, 0, 2293759, 0, 0, 2228224, 0, 0, 2228225, 0, 0, 2228226, 0, 0, 2228227, 0, 0, 2228228, 0, 0, 2228229, 0, 0, 2228230, 0, 0, 2228231, 0, 0, 2228232, 0, 0, 2228233, 0, 0, 2228234, 0, 0, 2228235, 0, 0, 2228236, 0, 0, 2228237, 0, 0, 2228238, 0, 0, 2228239, 0, 0, 2228240, 0, 0, 2228241, 0, 0, 2228242, 0, 0, 2228243, 0, 0, 2228244, 0, 0, 2228245, 0, 0, 2228246, 0, 0, 2228247, 0, 0, 2228248, 0, 0, 2228249, 0, 0, 2228250, 0, 0, 2228251, 0, 0, 2228252, 0, 0, 2228253, 0, 0, 2228254, 0, 0, 2228255, 0, 0, 2228256, 0, 0, 2228257, 0, 0, 2228258, 0, 0, 2228259, 0, 0, 2228260, 0, 0, 2228261, 0, 0, 2228262, 0, 0, 2228263, 0, 0, 2228264, 0, 0, 2228265, 0, 0, 2228266, 0, 0, 2228267, 0, 0, 2228268, 0, 0, 2359284, 0, 0, 2359285, 0, 0, 2359286, 0, 0, 2359287, 0, 0, 2359288, 0, 0, 2359289, 0, 0, 2359290, 0, 0, 2359291, 0, 0, 2359292, 0, 0, 2359293, 0, 0, 2359294, 0, 0, 2359295, 0, 0, 2293760, 0, 0, 2293761, 0, 0, 2293762, 0, 0, 2293763, 0, 0, 2293764, 0, 0, 2293765, 0, 0, 2293766, 0, 0, 2293767, 0, 0, 2293768, 0, 0, 2293769, 0, 0, 2293770, 0, 0, 2293771, 0, 0, 2293772, 0, 0, 2293773, 0, 0, 2293774, 0, 0, 2293775, 0, 0, 2293776, 0, 0, 2293777, 0, 0, 2293778, 0, 0, 2293779, 0, 0, 2293780, 0, 0, 2293781, 0, 0, 2293782, 0, 0, 2293783, 0, 0, 2293784, 0, 0, 2293785, 0, 0, 2293786, 0, 0, 2293787, 0, 0, 2293788, 0, 0, 2293789, 0, 0, 2293790, 0, 0, 2293791, 0, 0, 2293792, 0, 0, 2293793, 0, 0, 2293794, 0, 0, 2293795, 0, 0, 2293796, 0, 0, 2293797, 0, 0, 2293798, 0, 0, 2293799, 0, 0, 2293800, 0, 0, 2293801, 0, 0, 2293802, 0, 0, 2293803, 0, 0, 2293804, 0, 0, 2424820, 0, 0, 2424821, 0, 0, 2424822, 0, 0, 2424823, 0, 0, 2424824, 0, 0, 2424825, 0, 0, 2424826, 0, 0, 2424827, 0, 0, 2424828, 0, 0, 2424829, 0, 0, 2424830, 0, 0, 2424831, 0, 0, 2359296, 0, 0, 2359297, 0, 0, 2359298, 0, 0, 2359299, 0, 0, 2359300, 0, 0, 2359301, 0, 0, 2359302, 0, 0, 2359303, 0, 0, 2359304, 0, 0, 2359305, 0, 0, 2359306, 0, 0, 2359307, 0, 0, 2359308, 0, 0, 2359309, 0, 0, 2359310, 0, 0, 2359311, 0, 0, 2359312, 0, 0, 2359313, 0, 0, 2359314, 0, 0, 2359315, 0, 0, 2359316, 0, 0, 2359317, 0, 0, 2359318, 0, 0, 2359319, 0, 0, 2359320, 0, 0, 2359321, 0, 0, 2359322, 0, 0, 2359323, 0, 0, 2359324, 0, 0, 2359325, 0, 0, 2359326, 0, 0, 2359327, 0, 0, 2359328, 0, 0, 2359329, 0, 0, 2359330, 0, 0, 2359331, 0, 0, 2359332, 0, 0, 2359333, 0, 0, 2359334, 0, 0, 2359335, 0, 0, 2359336, 0, 0, 2359337, 0, 0, 2359338, 0, 0, 2359339, 0, 0, 2359340, 0, 0, 2490356, 0, 0, 2490357, 0, 0, 2490358, 0, 0, 2490359, 0, 0, 2490360, 0, 0, 2490361, 0, 0, 2490362, 0, 0, 2490363, 0, 0, 2490364, 0, 0, 2490365, 0, 0, 2490366, 0, 0, 2490367, 0, 0, 2424832, 0, 0, 2424833, 0, 0, 2424834, 0, 0, 2424835, 0, 0, 2424836, 0, 0, 2424837, 0, 0, 2424838, 0, 0, 2424839, 0, 0, 2424840, 0, 0, 2424841, 0, 0, 2424842, 0, 0, 2424843, 0, 0, 2424844, 0, 0, 2424845, 0, 0, 2424846, 0, 0, 2424847, 0, 0, 2424848, 0, 0, 2424849, 0, 0, 2424850, 0, 0, 2424851, 0, 0, 2424852, 0, 0, 2424853, 0, 0, 2424854, 0, 0, 2424855, 0, 0, 2424856, 0, 0, 2424857, 0, 0, 2424858, 0, 0, 2424859, 0, 0, 2424860, 0, 0, 2424861, 0, 0, 2424862, 0, 0, 2424863, 0, 0, 2424864, 0, 0, 2424865, 0, 0, 2424866, 0, 0, 2424867, 0, 0, 2424868, 0, 0, 2424869, 0, 0, 2424870, 0, 0, 2424871, 0, 0, 2424872, 0, 0, 2424873, 0, 0, 2424874, 0, 0, 2424875, 0, 0, 2424876, 0, 0, 2555892, 0, 0, 2555893, 0, 0, 2555894, 0, 0, 2555895, 0, 0, 2555896, 0, 0, 2555897, 0, 0, 2555898, 0, 0, 2555899, 0, 0, 2555900, 0, 0, 2555901, 0, 0, 2555902, 0, 0, 2555903, 0, 0, 2490368, 0, 0, 2490369, 0, 0, 2490370, 0, 0, 2490371, 0, 0, 2490372, 0, 0, 2490373, 0, 0, 2490374, 0, 0, 2490375, 0, 0, 2490376, 0, 0, 2490377, 0, 0, 2490378, 0, 0, 2490379, 0, 0, 2490380, 0, 0, 2490381, 0, 0, 2490382, 0, 0, 2490383, 0, 0, 2490384, 0, 0, 2490385, 0, 0, 2490386, 0, 0, 2490387, 0, 0, 2490388, 0, 0, 2490389, 0, 0, 2490390, 0, 0, 2490391, 0, 0, 2490392, 0, 0, 2490393, 0, 0, 2490394, 0, 0, 2490395, 0, 0, 2490396, 0, 0, 2490397, 0, 0, 2490398, 0, 0, 2490399, 0, 0, 2490400, 0, 0, 2490401, 0, 0, 2490402, 0, 0, 2490403, 0, 0, 2490404, 0, 0, 2490405, 0, 0, 2490406, 0, 0, 2490407, 0, 0, 2490408, 0, 0, 2490409, 0, 0, 2490410, 0, 0, 2490411, 0, 0, 2490412, 0, 0, 2621428, 0, 0, 2621429, 0, 0, 2621430, 0, 0, 2621431, 0, 0, 2621432, 0, 0, 2621433, 0, 0, 2621434, 0, 0, 2621435, 0, 0, 2621436, 0, 0, 2621437, 0, 0, 2621438, 0, 0, 2621439, 0, 0, 2555904, 0, 0, 2555905, 0, 0, 2555906, 0, 0, 2555907, 0, 0, 2555908, 0, 0, 2555909, 0, 0, 2555910, 0, 0, 2555911, 0, 0, 2555912, 0, 0, 2555913, 0, 0, 2555914, 0, 0, 2555915, 0, 0, 2555916, 0, 0, 2555917, 0, 0, 2555918, 0, 0, 2555919, 0, 0, 2555920, 0, 0, 2555921, 0, 0, 2555922, 0, 0, 2555923, 0, 0, 2555924, 0, 0, 2555925, 0, 0, 2555926, 0, 0, 2555927, 0, 0, 2555928, 0, 0, 2555929, 0, 0, 2555930, 0, 0, 2555931, 0, 0, 2555932, 0, 0, 2555933, 0, 0, 2555934, 0, 0, 2555935, 0, 0, 2555936, 0, 0, 2555937, 0, 0, 2555938, 0, 0, 2555939, 0, 0, 2555940, 0, 0, 2555941, 0, 0, 2555942, 0, 0, 2555943, 0, 0, 2555944, 0, 0, 2555945, 0, 0, 2555946, 0, 0, 2555947, 0, 0, 2555948, 0, 0, 2686964, 0, 0, 2686965, 0, 0, 2686966, 0, 0, 2686967, 0, 0, 2686968, 0, 0, 2686969, 0, 0, 2686970, 0, 0, 2686971, 0, 0, 2686972, 0, 0, 2686973, 0, 0, 2686974, 0, 0, 2686975, 0, 0, 2621440, 0, 0, 2621441, 0, 0, 2621442, 0, 0, 2621443, 0, 0, 2621444, 0, 0, 2621445, 0, 0, 2621446, 0, 0, 2621447, 0, 0, 2621448, 0, 0, 2621449, 0, 0, 2621450, 0, 0, 2621451, 0, 0, 2621452, 0, 0, 2621453, 0, 0, 2621454, 0, 0, 2621455, 0, 0, 2621456, 0, 0, 2621457, 0, 0, 2621458, 0, 0, 2621459, 0, 0, 2621460, 0, 0, 2621461, 0, 0, 2621462, 0, 0, 2621463, 0, 0, 2621464, 0, 0, 2621465, 0, 0, 2621466, 0, 0, 2621467, 0, 0, 2621468, 0, 0, 2621469, 0, 0, 2621470, 0, 0, 2621471, 0, 0, 2621472, 0, 0, 2621473, 0, 0, 2621474, 0, 0, 2621475, 0, 0, 2621476, 0, 0, 2621477, 0, 0, 2621478, 0, 0, 2621479, 0, 0, 2621480, 0, 0, 2621481, 0, 0, 2621482, 0, 0, 2621483, 0, 0, 2621484, 0, 0, 2752500, 0, 0, 2752501, 0, 0, 2752502, 0, 0, 2752503, 0, 0, 2752504, 0, 0, 2752505, 0, 0, 2752506, 0, 0, 2752507, 0, 0, 2752508, 0, 0, 2752509, 0, 0, 2752510, 0, 0, 2752511, 0, 0, 2686976, 0, 0, 2686977, 0, 0, 2686978, 0, 0, 2686979, 0, 0, 2686980, 0, 0, 2686981, 0, 0, 2686982, 0, 0, 2686983, 0, 0, 2686984, 0, 0, 2686985, 0, 0, 2686986, 0, 0, 2686987, 0, 0, 2686988, 0, 0, 2686989, 0, 0, 2686990, 0, 0, 2686991, 0, 0, 2686992, 0, 0, 2686993, 0, 0, 2686994, 0, 0, 2686995, 0, 0, 2686996, 0, 0, 2686997, 0, 0, 2686998, 0, 0, 2686999, 0, 0, 2687000, 0, 0, 2687001, 0, 0, 2687002, 0, 0, 2687003, 0, 0, 2687004, 0, 0, 2687005, 0, 0, 2687006, 0, 0, 2687007, 0, 0, 2687008, 0, 0, 2687009, 0, 0, 2687010, 0, 0, 2687011, 0, 0, 2687012, 0, 0, 2687013, 0, 0, 2687014, 0, 0, 2687015, 0, 0, 2687016, 0, 0, 2687017, 0, 0, 2687018, 0, 0, 2687019, 0, 0, 2687020, 0, 0, 2818036, 0, 0, 2818037, 0, 0, 2818038, 0, 0, 2818039, 0, 0, 2818040, 0, 0, 2818041, 0, 0, 2818042, 0, 0, 2818043, 0, 0, 2818044, 0, 0, 2818045, 0, 0, 2818046, 0, 0, 2818047, 0, 0, 2752512, 0, 0, 2752513, 0, 0, 2752514, 0, 0, 2752515, 0, 0, 2752516, 0, 0, 2752517, 0, 0, 2752518, 0, 0, 2752519, 0, 0, 2752520, 0, 0, 2752521, 0, 0, 2752522, 0, 0, 2752523, 0, 0, 2752524, 0, 0, 2752525, 0, 0, 2752526, 0, 0, 2752527, 0, 0, 2752528, 0, 0, 2752529, 0, 0, 2752530, 0, 0, 2752531, 0, 0, 2752532, 0, 0, 2752533, 0, 0, 2752534, 0, 0, 2752535, 0, 0, 2752536, 0, 0, 2752537, 0, 0, 2752538, 0, 0, 2752539, 0, 0, 2752540, 0, 0, 2752541, 0, 0, 2752542, 0, 0, 2752543, 0, 0, 2752544, 0, 0, 2752545, 0, 0, 2752546, 0, 0, 2752547, 0, 0, 2752548, 0, 0, 2752549, 0, 0, 2752550, 0, 0, 2752551, 0, 0, 2752552, 0, 0, 2752553, 0, 0, 2752554, 0, 0, 2752555, 0, 0, 2752556, 0, 0, 2883572, 0, 0, 2883573, 0, 0, 2883574, 0, 0, 2883575, 0, 0, 2883576, 0, 0, 2883577, 0, 0, 2883578, 0, 0, 2883579, 0, 0, 2883580, 0, 0, 2883581, 0, 0, 2883582, 0, 0, 2883583, 0, 0, 2818048, 0, 0, 2818049, 0, 0, 2818050, 0, 0, 2818051, 0, 0, 2818052, 0, 0, 2818053, 0, 0, 2818054, 0, 0, 2818055, 0, 0, 2818056, 0, 0, 2818057, 0, 0, 2818058, 0, 0, 2818059, 0, 0, 2818060, 0, 0, 2818061, 0, 0, 2818062, 0, 0, 2818063, 0, 0, 2818064, 0, 0, 2818065, 0, 0, 2818066, 0, 0, 2818067, 0, 0, 2818068, 0, 0, 2818069, 0, 0, 2818070, 0, 0, 2818071, 0, 0, 2818072, 0, 0, 2818073, 0, 0, 2818074, 0, 0, 2818075, 0, 0, 2818076, 0, 0, 2818077, 0, 0, 2818078, 0, 0, 2818079, 0, 0, 2818080, 0, 0, 2818081, 0, 0, 2818082, 0, 0, 2818083, 0, 0, 2818084, 0, 0, 2818085, 0, 0, 2818086, 0, 0, 2818087, 0, 0, 2818088, 0, 0, 2818089, 0, 0, 2818090, 0, 0, 2818091, 0, 0, 2818092, 0, 0 ) [node name="player" parent="." instance=ExtResource( 3 )] position = Vector2( 233.06, 223.436 ) @@ -258,4 +258,7 @@ texture = ExtResource( 6 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="platform1"] shape = SubResource( 12 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 265, 247 ) +current = true [connection signal="body_entered" from="princess" to="." method="_on_princess_body_enter"] diff --git a/2d/kinematic_character/icon.png.import b/2d/kinematic_character/icon.png.import index 5033c946..96cbf462 100644 --- a/2d/kinematic_character/icon.png.import +++ b/2d/kinematic_character/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="a2c4d258e30d0a978df50141f46c78fc" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="144813cb6d9a20bff16078a45fa2d990" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/long_obstacle.png.import b/2d/kinematic_character/long_obstacle.png.import index 0f4a9152..761eec08 100644 --- a/2d/kinematic_character/long_obstacle.png.import +++ b/2d/kinematic_character/long_obstacle.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/long_obstacle.png-1b33440a15b4db156b2a9ec7e9a2a80e.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://long_obstacle.png" -source_md5="3c79b1a7d3ef80a28347634c36f0b2e1" - dest_files=[ "res://.import/long_obstacle.png-1b33440a15b4db156b2a9ec7e9a2a80e.stex" ] -dest_md5="4956558400a4bac181bc00346aaaacdf" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/obstacle.png.import b/2d/kinematic_character/obstacle.png.import index b81cbc9e..99c1b729 100644 --- a/2d/kinematic_character/obstacle.png.import +++ b/2d/kinematic_character/obstacle.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/obstacle.png-dfb3e99d3af573251007cdf5e1c252b9.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://obstacle.png" -source_md5="5963aa5f0000565f5472e152003bfaf3" - dest_files=[ "res://.import/obstacle.png-dfb3e99d3af573251007cdf5e1c252b9.stex" ] -dest_md5="e4a785f1d55f2585bce48ea5d56b3124" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/player.gd b/2d/kinematic_character/player.gd index 1cd27b8d..5d0935b5 100644 --- a/2d/kinematic_character/player.gd +++ b/2d/kinematic_character/player.gd @@ -27,13 +27,13 @@ var prev_jump_pressed = false func _physics_process(delta): # Create forces var force = Vector2(0, GRAVITY) - + var walk_left = Input.is_action_pressed("move_left") var walk_right = Input.is_action_pressed("move_right") var jump = Input.is_action_pressed("jump") - + var stop = true - + if walk_left: if velocity.x <= WALK_MIN_SPEED and velocity.x > -WALK_MAX_SPEED: force.x -= WALK_FORCE @@ -42,34 +42,34 @@ func _physics_process(delta): if velocity.x >= -WALK_MIN_SPEED and velocity.x < WALK_MAX_SPEED: force.x += WALK_FORCE stop = false - + if stop: var vsign = sign(velocity.x) var vlen = abs(velocity.x) - + vlen -= STOP_FORCE * delta if vlen < 0: vlen = 0 - + velocity.x = vlen * vsign - + # Integrate forces to velocity - velocity += force * delta + velocity += force * delta # Integrate velocity into motion and move velocity = move_and_slide(velocity, Vector2(0, -1)) - + if is_on_floor(): on_air_time = 0 - + if jumping and velocity.y > 0: # If falling, no longer jumping jumping = false - + if on_air_time < JUMP_MAX_AIRBORNE_TIME and jump and not prev_jump_pressed and not jumping: # Jump must also be allowed to happen if the character left the floor a little bit ago. # Makes controls more snappy. velocity.y = -JUMP_SPEED jumping = true - + on_air_time += delta prev_jump_pressed = jump diff --git a/2d/kinematic_character/player.png.import b/2d/kinematic_character/player.png.import index 74c107d2..a1ab22fc 100644 --- a/2d/kinematic_character/player.png.import +++ b/2d/kinematic_character/player.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/player.png-2dd0af52de4b213777cd8c9df94c0978.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://player.png" -source_md5="540f7f0d3b239b1d8c349f4be4d2d253" - dest_files=[ "res://.import/player.png-2dd0af52de4b213777cd8c9df94c0978.stex" ] -dest_md5="4112e6a5c36d38d07edebbfbd416c9fa" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/player.tscn b/2d/kinematic_character/player.tscn index 4021f09c..b1805ee5 100644 --- a/2d/kinematic_character/player.tscn +++ b/2d/kinematic_character/player.tscn @@ -15,4 +15,3 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( -0.315559, 0.157784 ) shape = SubResource( 1 ) - diff --git a/2d/kinematic_character/princess.png.import b/2d/kinematic_character/princess.png.import index 1d1e2a50..f2f46060 100644 --- a/2d/kinematic_character/princess.png.import +++ b/2d/kinematic_character/princess.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/princess.png-9b4caf2cfe324ae3734249d5b559d39d.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://princess.png" -source_md5="0cc2f9e0359e84dd37950556613a1778" - dest_files=[ "res://.import/princess.png-9b4caf2cfe324ae3734249d5b559d39d.stex" ] -dest_md5="856066b52354a42ff12d3b5608755e56" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/kinematic_character/project.godot b/2d/kinematic_character/project.godot index 68e013d2..f06b9108 100644 --- a/2d/kinematic_character/project.godot +++ b/2d/kinematic_character/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=530 window/size/height=495 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch/aspect="keep" stretch/mode="2d" @@ -61,3 +63,7 @@ move_up={ [memory] multithread/thread_rid_pool_prealloc=60 + +[rendering] + +environment/default_clear_color=Color( 0.156, 0.1325, 0.25, 1 ) diff --git a/2d/kinematic_collision/colworld.tscn b/2d/kinematic_collision/colworld.tscn index 44979d39..0d527029 100644 --- a/2d/kinematic_collision/colworld.tscn +++ b/2d/kinematic_collision/colworld.tscn @@ -30,8 +30,11 @@ extents = Vector2( 8, 8 ) tile_set = SubResource( 2 ) cell_size = Vector2( 16, 16 ) format = 1 -tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 31, 0, 0, 32, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 65553, 0, 0, 65554, 0, 0, 65555, 0, 0, 65556, 0, 0, 65557, 0, 0, 65558, 0, 0, 65559, 0, 0, 65560, 0, 0, 65561, 0, 0, 65562, 0, 0, 65563, 0, 0, 65564, 0, 0, 65565, 0, 0, 65566, 0, 0, 65567, 0, 0, 65568, 0, 0, 131072, 0, 0, 131073, 0, 0, 131103, 0, 0, 131104, 0, 0, 196608, 0, 0, 196609, 0, 0, 196639, 0, 0, 196640, 0, 0, 262144, 0, 0, 262145, 0, 0, 262175, 0, 0, 262176, 0, 0, 327680, 0, 0, 327681, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327711, 0, 0, 327712, 0, 0, 393216, 0, 0, 393217, 0, 0, 393247, 0, 0, 393248, 0, 0, 458752, 0, 0, 458753, 0, 0, 458783, 0, 0, 458784, 0, 0, 524288, 0, 0, 524289, 0, 0, 524319, 0, 0, 524320, 0, 0, 589824, 0, 0, 589825, 0, 0, 589855, 0, 0, 589856, 0, 0, 655360, 0, 0, 655361, 0, 0, 655373, 0, 0, 655374, 0, 0, 655375, 0, 0, 655376, 0, 0, 655377, 0, 0, 655378, 0, 0, 655379, 0, 0, 655380, 0, 0, 655381, 0, 0, 655391, 0, 0, 655392, 0, 0, 720896, 0, 0, 720897, 0, 0, 720909, 0, 0, 720910, 0, 0, 720911, 0, 0, 720912, 0, 0, 720913, 0, 0, 720914, 0, 0, 720915, 0, 0, 720916, 0, 0, 720917, 0, 0, 720927, 0, 0, 720928, 0, 0, 786432, 0, 0, 786433, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786448, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 786452, 0, 0, 786453, 0, 0, 786463, 0, 0, 786464, 0, 0, 851968, 0, 0, 851969, 0, 0, 851981, 0, 0, 851982, 0, 0, 851988, 0, 0, 851989, 0, 0, 851999, 0, 0, 852000, 0, 0, 917504, 0, 0, 917505, 0, 0, 917517, 0, 0, 917518, 0, 0, 917524, 0, 0, 917525, 0, 0, 917535, 0, 0, 917536, 0, 0, 983040, 0, 0, 983041, 0, 0, 983053, 0, 0, 983054, 0, 0, 983060, 0, 0, 983061, 0, 0, 983071, 0, 0, 983072, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048596, 0, 0, 1048597, 0, 0, 1048607, 0, 0, 1048608, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114132, 0, 0, 1114133, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1179648, 0, 0, 1179649, 0, 0, 1179668, 0, 0, 1179669, 0, 0, 1179679, 0, 0, 1179680, 0, 0, 1245184, 0, 0, 1245185, 0, 0, 1245204, 0, 0, 1245205, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1310720, 0, 0, 1310721, 0, 0, 1310730, 0, 0, 1310731, 0, 0, 1310748, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376266, 0, 0, 1376267, 0, 0, 1376284, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1441792, 0, 0, 1441793, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441820, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1572864, 0, 0, 1572865, 0, 0, 1572874, 0, 0, 1572875, 0, 0, 1572876, 0, 0, 1572877, 0, 0, 1572878, 0, 0, 1572879, 0, 0, 1572880, 0, 0, 1572881, 0, 0, 1572882, 0, 0, 1572895, 0, 0, 1572896, 0, 0, 1638400, 0, 0, 1638401, 0, 0, 1638410, 0, 0, 1638411, 0, 0, 1638412, 0, 0, 1638413, 0, 0, 1638414, 0, 0, 1638415, 0, 0, 1638416, 0, 0, 1638417, 0, 0, 1638418, 0, 0, 1638431, 0, 0, 1638432, 0, 0, 1703936, 0, 0, 1703937, 0, 0, 1703946, 0, 0, 1703947, 0, 0, 1703967, 0, 0, 1703968, 0, 0, 1769472, 0, 0, 1769473, 0, 0, 1769482, 0, 0, 1769483, 0, 0, 1769503, 0, 0, 1769504, 0, 0, 1835008, 0, 0, 1835009, 0, 0, 1835018, 0, 0, 1835019, 0, 0, 1835039, 0, 0, 1835040, 0, 0, 1900544, 0, 0, 1900545, 0, 0, 1900546, 0, 0, 1900547, 0, 0, 1900548, 0, 0, 1900549, 0, 0, 1900550, 0, 0, 1900551, 0, 0, 1900552, 0, 0, 1900553, 0, 0, 1900554, 0, 0, 1900555, 0, 0, 1900556, 0, 0, 1900557, 0, 0, 1900558, 0, 0, 1900559, 0, 0, 1900560, 0, 0, 1900561, 0, 0, 1900562, 0, 0, 1900563, 0, 0, 1900564, 0, 0, 1900565, 0, 0, 1900566, 0, 0, 1900567, 0, 0, 1900568, 0, 0, 1900569, 0, 0, 1900570, 0, 0, 1900571, 0, 0, 1900572, 0, 0, 1900573, 0, 0, 1900574, 0, 0, 1900575, 0, 0, 1900576, 0, 0, 1966080, 0, 0, 1966081, 0, 0, 1966082, 0, 0, 1966083, 0, 0, 1966084, 0, 0, 1966085, 0, 0, 1966086, 0, 0, 1966087, 0, 0, 1966088, 0, 0, 1966089, 0, 0, 1966090, 0, 0, 1966091, 0, 0, 1966092, 0, 0, 1966093, 0, 0, 1966094, 0, 0, 1966095, 0, 0, 1966096, 0, 0, 1966097, 0, 0, 1966098, 0, 0, 1966099, 0, 0, 1966100, 0, 0, 1966101, 0, 0, 1966102, 0, 0, 1966103, 0, 0, 1966104, 0, 0, 1966105, 0, 0, 1966106, 0, 0, 1966107, 0, 0, 1966108, 0, 0, 1966109, 0, 0, 1966110, 0, 0, 1966111, 0, 0, 1966112, 0, 0, 2031616, 0, 0, 2031617, 0, 0, 2031618, 0, 0, 2031619, 0, 0, 2031620, 0, 0, 2031621, 0, 0, 2031622, 0, 0, 2031623, 0, 0, 2031624, 0, 0, 2031625, 0, 0, 2031626, 0, 0, 2031627, 0, 0, 2031628, 0, 0, 2031629, 0, 0, 2031630, 0, 0, 2031631, 0, 0, 2031632, 0, 0, 2031633, 0, 0, 2031634, 0, 0, 2031635, 0, 0, 2031636, 0, 0, 2031637, 0, 0, 2031638, 0, 0, 2031639, 0, 0, 2031640, 0, 0, 2031641, 0, 0, 2031642, 0, 0, 2031643, 0, 0, 2031644, 0, 0, 2031645, 0, 0, 2031646, 0, 0, 2031647, 0, 0, 2031648, 0, 0 ) +tile_data = PoolIntArray( -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0, -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, -65524, 0, 0, -65523, 0, 0, -65522, 0, 0, -65521, 0, 0, -65520, 0, 0, -65519, 0, 0, -65518, 0, 0, -65517, 0, 0, -65516, 0, 0, -65515, 0, 0, -65514, 0, 0, -65513, 0, 0, -65512, 0, 0, -65511, 0, 0, -65510, 0, 0, -65509, 0, 0, -65508, 0, 0, -65507, 0, 0, -65506, 0, 0, -65505, 0, 0, -65504, 0, 0, -65503, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 31, 0, 0, 32, 0, 0, 33, 0, 0, 131071, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0, 65550, 0, 0, 65551, 0, 0, 65552, 0, 0, 65553, 0, 0, 65554, 0, 0, 65555, 0, 0, 65556, 0, 0, 65557, 0, 0, 65558, 0, 0, 65559, 0, 0, 65560, 0, 0, 65561, 0, 0, 65562, 0, 0, 65563, 0, 0, 65564, 0, 0, 65565, 0, 0, 65566, 0, 0, 65567, 0, 0, 65568, 0, 0, 65569, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 131103, 0, 0, 131104, 0, 0, 131105, 0, 0, 262143, 0, 0, 196608, 0, 0, 196609, 0, 0, 196639, 0, 0, 196640, 0, 0, 196641, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 0, 0, 262175, 0, 0, 262176, 0, 0, 262177, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 0, 0, 327688, 0, 0, 327689, 0, 0, 327690, 0, 0, 327691, 0, 0, 327692, 0, 0, 327693, 0, 0, 327711, 0, 0, 327712, 0, 0, 327713, 0, 0, 458751, 0, 0, 393216, 0, 0, 393217, 0, 0, 393247, 0, 0, 393248, 0, 0, 393249, 0, 0, 524287, 0, 0, 458752, 0, 0, 458753, 0, 0, 458783, 0, 0, 458784, 0, 0, 458785, 0, 0, 589823, 0, 0, 524288, 0, 0, 524289, 0, 0, 524319, 0, 0, 524320, 0, 0, 524321, 0, 0, 655359, 0, 0, 589824, 0, 0, 589825, 0, 0, 589855, 0, 0, 589856, 0, 0, 589857, 0, 0, 720895, 0, 0, 655360, 0, 0, 655361, 0, 0, 655373, 0, 0, 655374, 0, 0, 655375, 0, 0, 655376, 0, 0, 655377, 0, 0, 655378, 0, 0, 655379, 0, 0, 655380, 0, 0, 655381, 0, 0, 655391, 0, 0, 655392, 0, 0, 655393, 0, 0, 786431, 0, 0, 720896, 0, 0, 720897, 0, 0, 720909, 0, 0, 720910, 0, 0, 720911, 0, 0, 720912, 0, 0, 720913, 0, 0, 720914, 0, 0, 720915, 0, 0, 720916, 0, 0, 720917, 0, 0, 720927, 0, 0, 720928, 0, 0, 720929, 0, 0, 851967, 0, 0, 786432, 0, 0, 786433, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786448, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 786452, 0, 0, 786453, 0, 0, 786463, 0, 0, 786464, 0, 0, 786465, 0, 0, 917503, 0, 0, 851968, 0, 0, 851969, 0, 0, 851981, 0, 0, 851982, 0, 0, 851988, 0, 0, 851989, 0, 0, 851999, 0, 0, 852000, 0, 0, 852001, 0, 0, 983039, 0, 0, 917504, 0, 0, 917505, 0, 0, 917517, 0, 0, 917518, 0, 0, 917524, 0, 0, 917525, 0, 0, 917535, 0, 0, 917536, 0, 0, 917537, 0, 0, 1048575, 0, 0, 983040, 0, 0, 983041, 0, 0, 983053, 0, 0, 983054, 0, 0, 983060, 0, 0, 983061, 0, 0, 983071, 0, 0, 983072, 0, 0, 983073, 0, 0, 1114111, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048596, 0, 0, 1048597, 0, 0, 1048607, 0, 0, 1048608, 0, 0, 1048609, 0, 0, 1179647, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114132, 0, 0, 1114133, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1114145, 0, 0, 1245183, 0, 0, 1179648, 0, 0, 1179649, 0, 0, 1179668, 0, 0, 1179669, 0, 0, 1179679, 0, 0, 1179680, 0, 0, 1179681, 0, 0, 1310719, 0, 0, 1245184, 0, 0, 1245185, 0, 0, 1245204, 0, 0, 1245205, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1245217, 0, 0, 1376255, 0, 0, 1310720, 0, 0, 1310721, 0, 0, 1310730, 0, 0, 1310731, 0, 0, 1310748, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1310753, 0, 0, 1441791, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376266, 0, 0, 1376267, 0, 0, 1376284, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1376289, 0, 0, 1507327, 0, 0, 1441792, 0, 0, 1441793, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441820, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1572863, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1638399, 0, 0, 1572864, 0, 0, 1572865, 0, 0, 1572874, 0, 0, 1572875, 0, 0, 1572876, 0, 0, 1572877, 0, 0, 1572878, 0, 0, 1572879, 0, 0, 1572880, 0, 0, 1572881, 0, 0, 1572882, 0, 0, 1572895, 0, 0, 1572896, 0, 0, 1572897, 0, 0, 1703935, 0, 0, 1638400, 0, 0, 1638401, 0, 0, 1638410, 0, 0, 1638411, 0, 0, 1638412, 0, 0, 1638413, 0, 0, 1638414, 0, 0, 1638415, 0, 0, 1638416, 0, 0, 1638417, 0, 0, 1638418, 0, 0, 1638431, 0, 0, 1638432, 0, 0, 1638433, 0, 0, 1769471, 0, 0, 1703936, 0, 0, 1703937, 0, 0, 1703946, 0, 0, 1703947, 0, 0, 1703967, 0, 0, 1703968, 0, 0, 1703969, 0, 0, 1835007, 0, 0, 1769472, 0, 0, 1769473, 0, 0, 1769482, 0, 0, 1769483, 0, 0, 1769503, 0, 0, 1769504, 0, 0, 1769505, 0, 0, 1900543, 0, 0, 1835008, 0, 0, 1835009, 0, 0, 1835018, 0, 0, 1835019, 0, 0, 1835039, 0, 0, 1835040, 0, 0, 1835041, 0, 0, 1966079, 0, 0, 1900544, 0, 0, 1900545, 0, 0, 1900546, 0, 0, 1900547, 0, 0, 1900548, 0, 0, 1900549, 0, 0, 1900550, 0, 0, 1900551, 0, 0, 1900552, 0, 0, 1900553, 0, 0, 1900554, 0, 0, 1900555, 0, 0, 1900556, 0, 0, 1900557, 0, 0, 1900558, 0, 0, 1900559, 0, 0, 1900560, 0, 0, 1900561, 0, 0, 1900562, 0, 0, 1900563, 0, 0, 1900564, 0, 0, 1900565, 0, 0, 1900566, 0, 0, 1900567, 0, 0, 1900568, 0, 0, 1900569, 0, 0, 1900570, 0, 0, 1900571, 0, 0, 1900572, 0, 0, 1900573, 0, 0, 1900574, 0, 0, 1900575, 0, 0, 1900576, 0, 0, 1900577, 0, 0, 2031615, 0, 0, 1966080, 0, 0, 1966081, 0, 0, 1966082, 0, 0, 1966083, 0, 0, 1966084, 0, 0, 1966085, 0, 0, 1966086, 0, 0, 1966087, 0, 0, 1966088, 0, 0, 1966089, 0, 0, 1966090, 0, 0, 1966091, 0, 0, 1966092, 0, 0, 1966093, 0, 0, 1966094, 0, 0, 1966095, 0, 0, 1966096, 0, 0, 1966097, 0, 0, 1966098, 0, 0, 1966099, 0, 0, 1966100, 0, 0, 1966101, 0, 0, 1966102, 0, 0, 1966103, 0, 0, 1966104, 0, 0, 1966105, 0, 0, 1966106, 0, 0, 1966107, 0, 0, 1966108, 0, 0, 1966109, 0, 0, 1966110, 0, 0, 1966111, 0, 0, 1966112, 0, 0, 1966113, 0, 0, 2097151, 0, 0, 2031616, 0, 0, 2031617, 0, 0, 2031618, 0, 0, 2031619, 0, 0, 2031620, 0, 0, 2031621, 0, 0, 2031622, 0, 0, 2031623, 0, 0, 2031624, 0, 0, 2031625, 0, 0, 2031626, 0, 0, 2031627, 0, 0, 2031628, 0, 0, 2031629, 0, 0, 2031630, 0, 0, 2031631, 0, 0, 2031632, 0, 0, 2031633, 0, 0, 2031634, 0, 0, 2031635, 0, 0, 2031636, 0, 0, 2031637, 0, 0, 2031638, 0, 0, 2031639, 0, 0, 2031640, 0, 0, 2031641, 0, 0, 2031642, 0, 0, 2031643, 0, 0, 2031644, 0, 0, 2031645, 0, 0, 2031646, 0, 0, 2031647, 0, 0, 2031648, 0, 0, 2031649, 0, 0 ) [node name="player" parent="." instance=ExtResource( 2 )] position = Vector2( 115.243, 222.134 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 264, 248 ) +current = true diff --git a/2d/kinematic_collision/icon.png.import b/2d/kinematic_collision/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/kinematic_collision/icon.png.import +++ b/2d/kinematic_collision/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/kinematic_collision/obstacle.png.import b/2d/kinematic_collision/obstacle.png.import index 90cd6e5b..99c1b729 100644 --- a/2d/kinematic_collision/obstacle.png.import +++ b/2d/kinematic_collision/obstacle.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/obstacle.png-dfb3e99d3af573251007cdf5e1c252b9.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/kinematic_collision/player.png.import b/2d/kinematic_collision/player.png.import index 38c5ccfc..a1ab22fc 100644 --- a/2d/kinematic_collision/player.png.import +++ b/2d/kinematic_collision/player.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/player.png-2dd0af52de4b213777cd8c9df94c0978.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/kinematic_collision/project.godot b/2d/kinematic_collision/project.godot index 5999f8f1..4049ced0 100644 --- a/2d/kinematic_collision/project.godot +++ b/2d/kinematic_collision/project.godot @@ -19,6 +19,11 @@ config/name="Kinematic Collision" run/main_scene="res://colworld.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -45,3 +50,7 @@ move_up={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) ] } + +[rendering] + +environment/default_clear_color=Color( 0.219608, 0.145098, 0.145098, 1 ) diff --git a/2d/light2d_as_mask/burano.png.import b/2d/light2d_as_mask/burano.png.import index 5aa96ae7..fcc8a4b1 100644 --- a/2d/light2d_as_mask/burano.png.import +++ b/2d/light2d_as_mask/burano.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/burano.png-893cff79ccbe972d7b1ad3e1845f81bf.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/light2d_as_mask/icon.png.import b/2d/light2d_as_mask/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/light2d_as_mask/icon.png.import +++ b/2d/light2d_as_mask/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/light2d_as_mask/lightmask.tscn b/2d/light2d_as_mask/lightmask.tscn index 0cef972b..93cd4f5e 100644 --- a/2d/light2d_as_mask/lightmask.tscn +++ b/2d/light2d_as_mask/lightmask.tscn @@ -51,6 +51,9 @@ anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 2 size_flags_vertical = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="burano" type="TextureRect" parent="."] material = SubResource( 1 ) @@ -79,3 +82,6 @@ mode = 2 autoplay = "maskmotion" anims/maskmotion = SubResource( 2 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true diff --git a/2d/light2d_as_mask/project.godot b/2d/light2d_as_mask/project.godot index f978eed3..57f97360 100644 --- a/2d/light2d_as_mask/project.godot +++ b/2d/light2d_as_mask/project.godot @@ -19,6 +19,11 @@ config/name="Using Lights as Mask" run/main_scene="res://lightmask.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/2d/light2d_as_mask/splat.png.import b/2d/light2d_as_mask/splat.png.import index 662272a2..c2f87fe3 100644 --- a/2d/light2d_as_mask/splat.png.import +++ b/2d/light2d_as_mask/splat.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/splat.png-a41a35966004eec2e8a20d517d1ec4bb.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/lights_and_shadows/bg.png.import b/2d/lights_and_shadows/bg.png.import index 87ad75c9..370cc07f 100644 --- a/2d/lights_and_shadows/bg.png.import +++ b/2d/lights_and_shadows/bg.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/bg.png-24bff804693ee063127ad100e04c5185.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://bg.png" -source_md5="767fe4b38b7f307c268da6beb72ca732" - dest_files=[ "res://.import/bg.png-24bff804693ee063127ad100e04c5185.stex" ] -dest_md5="c5f047c8b98d363519d5da3be2119651" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/lights_and_shadows/caster.png.import b/2d/lights_and_shadows/caster.png.import index eae5c98e..b9fcb867 100644 --- a/2d/lights_and_shadows/caster.png.import +++ b/2d/lights_and_shadows/caster.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/caster.png-67727cb056b9e0209664a84f1653a25a.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://caster.png" -source_md5="461a6647dafae1304d7a21178246bb9d" - dest_files=[ "res://.import/caster.png-67727cb056b9e0209664a84f1653a25a.stex" ] -dest_md5="102ac34dffa3ad96f81d7c422c9ff96d" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/lights_and_shadows/icon.png.import b/2d/lights_and_shadows/icon.png.import index 1ea2d62c..96cbf462 100644 --- a/2d/lights_and_shadows/icon.png.import +++ b/2d/lights_and_shadows/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="b522cb048c2d4713c630a1fd00254467" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="fca2fbe38bffc4d500dcbb63e1985d25" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/lights_and_shadows/light.png.import b/2d/lights_and_shadows/light.png.import index 0036aecb..eb66a391 100644 --- a/2d/lights_and_shadows/light.png.import +++ b/2d/lights_and_shadows/light.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/light.png-06e94102f0cce323cff7daad56cf3030.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://light.png" -source_md5="d36597a1d2ddc06b8d0d22650a176149" - dest_files=[ "res://.import/light.png-06e94102f0cce323cff7daad56cf3030.stex" ] -dest_md5="4358f9620206dfaf70c1c9c703c7cbc0" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/lights_and_shadows/light_shadows.tscn b/2d/lights_and_shadows/light_shadows.tscn index 40f1619c..e96d810f 100644 --- a/2d/lights_and_shadows/light_shadows.tscn +++ b/2d/lights_and_shadows/light_shadows.tscn @@ -72,7 +72,7 @@ color = Color( 0.27451, 0.27451, 0.27451, 1 ) [node name="bg" type="Sprite" parent="."] position = Vector2( 401.251, 301.906 ) -scale = Vector2( 6.39454, 4.82665 ) +scale = Vector2( 128, 128 ) texture = ExtResource( 1 ) [node name="casters" type="Node2D" parent="."] @@ -237,3 +237,6 @@ anims/motion = SubResource( 3 ) anims/motion2 = SubResource( 4 ) anims/motion3 = SubResource( 7 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 400, 300 ) +current = true diff --git a/2d/lights_and_shadows/project.godot b/2d/lights_and_shadows/project.godot index 0c1fb968..bb144da3 100644 --- a/2d/lights_and_shadows/project.godot +++ b/2d/lights_and_shadows/project.godot @@ -22,6 +22,8 @@ config/icon="res://icon.png" [display] window/size/width=800 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch/aspect="keep" stretch/mode="2d" diff --git a/2d/lights_and_shadows/spot.png.import b/2d/lights_and_shadows/spot.png.import index 650acd09..55cdf10f 100644 --- a/2d/lights_and_shadows/spot.png.import +++ b/2d/lights_and_shadows/spot.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/spot.png-36b4dfbff4efeea17ec3137d266ffc4a.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://spot.png" -source_md5="8d1a5fb652c178423018bac9e0f5acf0" - dest_files=[ "res://.import/spot.png-36b4dfbff4efeea17ec3137d266ffc4a.stex" ] -dest_md5="39755819eccb4f1e0c301b93be79590a" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/navigation/character.png.import b/2d/navigation/character.png.import index 4b481cae..a43cd0d5 100644 --- a/2d/navigation/character.png.import +++ b/2d/navigation/character.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/character.png-7a996d3b758d22c506b76a7c15391284.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation/icon.png.import b/2d/navigation/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/navigation/icon.png.import +++ b/2d/navigation/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation/level.tscn b/2d/navigation/level.tscn index 7c4a6f4f..966b2df1 100644 --- a/2d/navigation/level.tscn +++ b/2d/navigation/level.tscn @@ -24,3 +24,7 @@ position = Vector2( 228.464, 132.594 ) scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 3 ) offset = Vector2( 0, -26 ) + +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 400, 300 ) +current = true diff --git a/2d/navigation/map.png.import b/2d/navigation/map.png.import index dabf57ba..7f852179 100644 --- a/2d/navigation/map.png.import +++ b/2d/navigation/map.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/map.png-9eea34967fae34f4388f4a32a16da936.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation/navigation.gd b/2d/navigation/navigation.gd index b5a16440..27523c10 100644 --- a/2d/navigation/navigation.gd +++ b/2d/navigation/navigation.gd @@ -31,12 +31,12 @@ func move_along_path(distance): var last_point = $Character.position while path.size(): var distance_between_points = last_point.distance_to(path[0]) - + # the position to move to falls between two points if distance <= distance_between_points: $Character.position = last_point.linear_interpolate(path[0], distance / distance_between_points) return - + # the position is past the end of the segment distance -= distance_between_points last_point = path[0] diff --git a/2d/navigation/project.godot b/2d/navigation/project.godot index f1547bbf..2651056b 100644 --- a/2d/navigation/project.godot +++ b/2d/navigation/project.godot @@ -22,6 +22,8 @@ config/icon="res://icon.png" [display] window/size/width=800 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch/aspect="keep" stretch/mode="2d" @@ -36,3 +38,7 @@ click={ "events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) ] } + +[rendering] + +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 ba615010..b2a44a43 100644 --- a/2d/navigation_astar/Game.tscn +++ b/2d/navigation_astar/Game.tscn @@ -14,9 +14,13 @@ tile_data = PoolIntArray( 65537, 0, 0, 65541, 0, 0, 65545, 0, 0, 65550, 0, 0, 19 script = ExtResource( 2 ) [node name="Character" type="Position2D" parent="."] +position = Vector2( 32, 32 ) script = ExtResource( 3 ) [node name="Sprite" type="Sprite" parent="Character"] position = Vector2( 7, 0 ) texture = ExtResource( 4 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true diff --git a/2d/navigation_astar/default_env.tres b/2d/navigation_astar/default_env.tres index 4b7cb0ac..d37b59de 100644 --- a/2d/navigation_astar/default_env.tres +++ b/2d/navigation_astar/default_env.tres @@ -11,4 +11,3 @@ ground_curve = 0.01 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/2d/navigation_astar/icon.png.import b/2d/navigation_astar/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/navigation_astar/icon.png.import +++ b/2d/navigation_astar/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation_astar/pathfind_astar.gd b/2d/navigation_astar/pathfind_astar.gd index e207d551..21fddfd2 100644 --- a/2d/navigation_astar/pathfind_astar.gd +++ b/2d/navigation_astar/pathfind_astar.gd @@ -183,4 +183,4 @@ func _set_path_end_position(value): set_cell(value.x, value.y, 2) path_end_position = value if path_start_position != value: - _recalculate_path() \ No newline at end of file + _recalculate_path() diff --git a/2d/navigation_astar/project.godot b/2d/navigation_astar/project.godot index 6f2a177d..dd0e1ca2 100644 --- a/2d/navigation_astar/project.godot +++ b/2d/navigation_astar/project.godot @@ -19,6 +19,11 @@ config/name="Grid-based pathfinding with Astar" run/main_scene="res://Game.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [input] click={ diff --git a/2d/navigation_astar/sprites/character.png.import b/2d/navigation_astar/sprites/character.png.import index 5ffee97d..705122f8 100644 --- a/2d/navigation_astar/sprites/character.png.import +++ b/2d/navigation_astar/sprites/character.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/character.png-eb70ac48a5acf508c4b7740ea4ac4fae.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation_astar/sprites/obstacle.png.import b/2d/navigation_astar/sprites/obstacle.png.import index 31e61eb2..bf4560ef 100644 --- a/2d/navigation_astar/sprites/obstacle.png.import +++ b/2d/navigation_astar/sprites/obstacle.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/obstacle.png-0258c5f5ce65bfa0dd8610adeb784f54.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation_astar/sprites/path_end.png.import b/2d/navigation_astar/sprites/path_end.png.import index 4df45d91..193d9f42 100644 --- a/2d/navigation_astar/sprites/path_end.png.import +++ b/2d/navigation_astar/sprites/path_end.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/path_end.png-02b79e25892cd8d863bd44c3c5a1720e.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/navigation_astar/sprites/path_start.png.import b/2d/navigation_astar/sprites/path_start.png.import index 7459ba40..c28a811c 100644 --- a/2d/navigation_astar/sprites/path_start.png.import +++ b/2d/navigation_astar/sprites/path_start.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/path_start.png-475bd0b469629aa8779d506c5134e5c2.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/particles/fire_particle.png.import b/2d/particles/fire_particle.png.import index 0bcdda41..b9e110a3 100644 --- a/2d/particles/fire_particle.png.import +++ b/2d/particles/fire_particle.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/fire_particle.png-282b12927cd5b1f6d9c0bfb485d448ae.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://fire_particle.png" -source_md5="b0ff2970ad1b00d2ce4ed6f02e01d7c5" - dest_files=[ "res://.import/fire_particle.png-282b12927cd5b1f6d9c0bfb485d448ae.stex" ] -dest_md5="eea50c6eceabd139f99b8f771003811d" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/particles/icon.png.import b/2d/particles/icon.png.import index 7237c9fb..96cbf462 100644 --- a/2d/particles/icon.png.import +++ b/2d/particles/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="79bb491eb2c0a0753f965ac0b3106349" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="cbc9a406040e47df12d4494a9431028f" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/particles/mask.png.import b/2d/particles/mask.png.import index 4b80755c..3b4c681f 100644 --- a/2d/particles/mask.png.import +++ b/2d/particles/mask.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/mask.png-b945516e6475612c1c4c3b4f8dd0bdc6.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://mask.png" -source_md5="3214952ea3431758b892aabdbde38b08" - dest_files=[ "res://.import/mask.png-b945516e6475612c1c4c3b4f8dd0bdc6.stex" ] -dest_md5="6823b6e7db665ffc74987b968f7eaf3b" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=true flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=false diff --git a/2d/particles/particles.tscn b/2d/particles/particles.tscn index 4fab754f..ec24bc45 100644 --- a/2d/particles/particles.tscn +++ b/2d/particles/particles.tscn @@ -252,3 +252,6 @@ visibility_rect = Rect2( 26.0055, 90.0015, 199.176, 95.0445 ) process_material = SubResource( 28 ) texture = ExtResource( 3 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true diff --git a/2d/particles/project.godot b/2d/particles/project.godot index c99f9a29..4fb25a80 100644 --- a/2d/particles/project.godot +++ b/2d/particles/project.godot @@ -19,6 +19,15 @@ config/name="Particle Systems" run/main_scene="res://particles.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] + +[rendering] + +environment/default_clear_color=Color( 0, 0, 0, 1 ) diff --git a/2d/particles/smoke_particle.png.import b/2d/particles/smoke_particle.png.import index 0539d5c5..a04553e9 100644 --- a/2d/particles/smoke_particle.png.import +++ b/2d/particles/smoke_particle.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/smoke_particle.png-2af9cbaa4a935c239d404ea2402bff45.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://smoke_particle.png" -source_md5="1b1db1ed68bccbfb6cc968edd82d3590" - dest_files=[ "res://.import/smoke_particle.png-2af9cbaa4a935c239d404ea2402bff45.stex" ] -dest_md5="b15a735d1026591cfe0adf0961cd978d" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/particles/spark_particle2.png.import b/2d/particles/spark_particle2.png.import index 35a36661..746e162b 100644 --- a/2d/particles/spark_particle2.png.import +++ b/2d/particles/spark_particle2.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/spark_particle2.png-c01711346d42a0d9675f292248ead315.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://spark_particle2.png" -source_md5="907b52c0c7e2668357863bd01721e813" - dest_files=[ "res://.import/spark_particle2.png-c01711346d42a0d9675f292248ead315.stex" ] -dest_md5="a13abc4e2d2feac9c7fe76af899b5ff4" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=false @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/pong/ball.png.import b/2d/pong/ball.png.import index 5dee293b..f239f238 100644 --- a/2d/pong/ball.png.import +++ b/2d/pong/ball.png.import @@ -3,29 +3,31 @@ importer="texture" type="StreamTexture" path="res://.import/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://ball.png" -source_md5="4219e9084f5485c8d1812297700f317d" - dest_files=[ "res://.import/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex" ] -dest_md5="c23684a1fd10063a69ecc18f7ccca4c3" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/pong/icon.png.import b/2d/pong/icon.png.import index d09f9c2c..96cbf462 100644 --- a/2d/pong/icon.png.import +++ b/2d/pong/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="9be177e863d37787c0836d64924b3503" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="6339016da0f704252e68ba6dd6477388" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/pong/left_pallete.png.import b/2d/pong/left_pallete.png.import index 7cebe9a7..a80bf581 100644 --- a/2d/pong/left_pallete.png.import +++ b/2d/pong/left_pallete.png.import @@ -3,29 +3,31 @@ importer="texture" type="StreamTexture" path="res://.import/left_pallete.png-bc33611074a0f886142e37c77bd2545a.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://left_pallete.png" -source_md5="df76627349499ad47ebf48a7ca947cca" - dest_files=[ "res://.import/left_pallete.png-bc33611074a0f886142e37c77bd2545a.stex" ] -dest_md5="f286e993cb5a7b7513004045afcc4313" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/pong/paddle.gd b/2d/pong/paddle.gd index a514c617..02f25eab 100644 --- a/2d/pong/paddle.gd +++ b/2d/pong/paddle.gd @@ -5,13 +5,13 @@ const MOVE_SPEED = 100 func _process(delta): var which = get_name() - + # move up and down based on input if Input.is_action_pressed(which+"_move_up") and position.y > 0: position.y -= MOVE_SPEED * delta if Input.is_action_pressed(which+"_move_down") and position.y < get_viewport_rect().size.y: position.y += MOVE_SPEED * delta - + func _on_area_entered( area ): if area.get_name() == "ball": diff --git a/2d/pong/pong.tscn b/2d/pong/pong.tscn index d88d1637..7b12d497 100644 --- a/2d/pong/pong.tscn +++ b/2d/pong/pong.tscn @@ -23,6 +23,14 @@ extents = Vector2( 320, 10 ) [node name="game" type="Node2D"] +[node name="ColorRect" type="ColorRect" parent="."] +margin_right = 640.0 +margin_bottom = 400.0 +color = Color( 0.141176, 0.152941, 0.164706, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + [node name="left" type="Area2D" parent="."] position = Vector2( 67.6285, 192.594 ) script = ExtResource( 1 ) @@ -87,6 +95,9 @@ y_direction = -1 [node name="collision" type="CollisionShape2D" parent="floor"] 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"] [connection signal="area_entered" from="left_wall" to="left_wall" method="_on_wall_area_entered"] diff --git a/2d/pong/project.godot b/2d/pong/project.godot index b0ce9d7f..559bb2cb 100644 --- a/2d/pong/project.godot +++ b/2d/pong/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=640 window/size/height=400 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch_2d=true [gdnative] @@ -54,4 +56,5 @@ right_move_up={ [rendering] +quality/2d/use_pixel_snap=true viewport/default_clear_color=Color( 0, 0, 0, 1 ) diff --git a/2d/pong/right_pallete.png.import b/2d/pong/right_pallete.png.import index cbc584f9..4b442ffb 100644 --- a/2d/pong/right_pallete.png.import +++ b/2d/pong/right_pallete.png.import @@ -3,29 +3,31 @@ importer="texture" type="StreamTexture" path="res://.import/right_pallete.png-fc6e4a6a7c8197834656482b94708e47.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://right_pallete.png" -source_md5="d46f647d3f045dbee4d786089c309868" - dest_files=[ "res://.import/right_pallete.png-fc6e4a6a7c8197834656482b94708e47.stex" ] -dest_md5="5f8755f214bc8d4caf7c467291452637" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/pong/separator.png.import b/2d/pong/separator.png.import index 6b9b1ad4..a8527c62 100644 --- a/2d/pong/separator.png.import +++ b/2d/pong/separator.png.import @@ -3,29 +3,31 @@ importer="texture" type="StreamTexture" path="res://.import/separator.png-f981c8489b9148e2e1dc63398273da74.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://separator.png" -source_md5="b6234b89455156532bbe1256249fcfd4" - dest_files=[ "res://.import/separator.png-f981c8489b9148e2e1dc63398273da74.stex" ] -dest_md5="6e27251839594842494c6cd51e3b86cb" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/role_playing_game/Game.gd b/2d/role_playing_game/Game.gd index 128b8894..0464c4f9 100644 --- a/2d/role_playing_game/Game.gd +++ b/2d/role_playing_game/Game.gd @@ -15,7 +15,7 @@ func _ready(): continue if not n.has_node("DialoguePlayer"): continue - n.get_node("DialoguePlayer").connect("dialogue_finished", self, + n.get_node("DialoguePlayer").connect("dialogue_finished", self, "_on_opponent_dialogue_finished", [n]) remove_child(combat_screen) @@ -25,7 +25,7 @@ func _on_opponent_dialogue_finished(opponent): var player = $Exploration/Grid/Player var combatents = [player.combat_actor, opponent.combat_actor] start_combat(combatents) - + func start_combat(combat_actors): remove_child($Exploration) $AnimationPlayer.play("fade") @@ -34,7 +34,7 @@ func start_combat(combat_actors): combat_screen.show() combat_screen.initialize(combat_actors) $AnimationPlayer.play_backwards("fade") - + func _on_combat_finished(winner, _loser): remove_child(combat_screen) $AnimationPlayer.play_backwards("fade") diff --git a/2d/role_playing_game/Game.tscn b/2d/role_playing_game/Game.tscn index 453298f9..7b502c5b 100644 --- a/2d/role_playing_game/Game.tscn +++ b/2d/role_playing_game/Game.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Game.gd" type="Script" id=1] -[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=2] -[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=3] +[ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=2] +[ext_resource path="res://screens/combat/Combat.tscn" type="PackedScene" id=3] [sub_resource type="Animation" id=1] length = 0.5 @@ -30,13 +30,19 @@ anims/fade = SubResource( 1 ) [node name="Transition" type="CanvasLayer" parent="."] [node name="ColorRect" type="ColorRect" parent="Transition"] -margin_right = 1280.0 -margin_bottom = 720.0 +anchor_right = 1.0 +anchor_bottom = 1.0 mouse_filter = 1 color = Color( 0.0703125, 0.0703125, 0.0703125, 0 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="Combat" parent="." instance=ExtResource( 2 )] +[node name="Combat" parent="." instance=ExtResource( 3 )] visible = false -[node name="Exploration" parent="." instance=ExtResource( 3 )] +[node name="Exploration" parent="." instance=ExtResource( 2 )] +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 640, 360 ) +current = true diff --git a/2d/role_playing_game/default_env.tres b/2d/role_playing_game/default_env.tres index 378e0c16..dfe62abb 100644 --- a/2d/role_playing_game/default_env.tres +++ b/2d/role_playing_game/default_env.tres @@ -12,4 +12,3 @@ sun_energy = 16.0 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/2d/role_playing_game/project.godot b/2d/role_playing_game/project.godot index 34f000b0..951694f1 100644 --- a/2d/role_playing_game/project.godot +++ b/2d/role_playing_game/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=1280 window/size/height=720 +window/stretch/mode="2d" +window/stretch/aspect="expand" [rendering] diff --git a/2d/role_playing_game/screens/combat/Combat.gd b/2d/role_playing_game/screens/combat/Combat.gd index f850ef09..e37e69e2 100644 --- a/2d/role_playing_game/screens/combat/Combat.gd +++ b/2d/role_playing_game/screens/combat/Combat.gd @@ -33,4 +33,4 @@ func clear_combat(): func finish_combat(winner, loser): emit_signal("combat_finished", winner, loser) - + diff --git a/2d/role_playing_game/screens/combat/Combat.tscn b/2d/role_playing_game/screens/combat/Combat.tscn index 2fe59822..716ea237 100644 --- a/2d/role_playing_game/screens/combat/Combat.tscn +++ b/2d/role_playing_game/screens/combat/Combat.tscn @@ -75,7 +75,6 @@ margin_bottom = 246.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Flee" - [connection signal="button_up" from="UI/Buttons/GridContainer/Attack" to="UI" method="_on_Attack_button_up"] [connection signal="button_up" from="UI/Buttons/GridContainer/Defend" to="UI" method="_on_Defend_button_up"] [connection signal="button_up" from="UI/Buttons/GridContainer/Flee" to="UI" method="_on_Flee_button_up"] diff --git a/2d/role_playing_game/screens/exploration/Exploration.tscn b/2d/role_playing_game/screens/exploration/Exploration.tscn index 8ebb9252..82a13650 100644 --- a/2d/role_playing_game/screens/exploration/Exploration.tscn +++ b/2d/role_playing_game/screens/exploration/Exploration.tscn @@ -24,7 +24,7 @@ tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, [node name="Grid" type="TileMap" parent="."] tile_set = ExtResource( 2 ) format = 1 -tile_data = PoolIntArray( 0, 1, 0, 1, 1, 0, 2, 1, 0, 3, 1, 0, 4, 1, 0, 5, 1, 0, 6, 1, 0, 7, 1, 0, 8, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0, 14, 1, 0, 15, 1, 0, 16, 1, 0, 17, 1, 0, 18, 1, 0, 19, 1, 0, 65536, 1, 0, 65554, 1, 0, 65555, 1, 0, 131072, 1, 0, 131090, 1, 0, 131091, 1, 0, 196608, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196626, 1, 0, 196627, 1, 0, 262144, 1, 0, 262151, 1, 0, 262162, 1, 0, 262163, 1, 0, 327680, 1, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327698, 1, 0, 327699, 1, 0, 393216, 1, 0, 393234, 1, 0, 393235, 1, 0, 458752, 1, 0, 458753, 1, 0, 458754, 1, 0, 458770, 1, 0, 458771, 1, 0, 524288, 1, 0, 524289, 1, 0, 524290, 1, 0, 524306, 1, 0, 524307, 1, 0, 589824, 1, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589842, 1, 0, 589843, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 655371, 1, 0, 655372, 1, 0, 655373, 1, 0, 655374, 1, 0, 655375, 1, 0, 655376, 1, 0, 655377, 1, 0, 655378, 1, 0, 655379, 1, 0, 720896, 1, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0 ) +tile_data = PoolIntArray( -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -524274, 1, 0, -524273, 1, 0, -524272, 1, 0, -524271, 1, 0, -524270, 1, 0, -524269, 1, 0, -524268, 1, 0, -524267, 1, 0, -524266, 1, 0, -524265, 1, 0, -524264, 1, 0, -524263, 1, 0, -524262, 1, 0, -524261, 1, 0, -524260, 1, 0, -524259, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -458737, 1, 0, -458736, 1, 0, -458735, 1, 0, -458734, 1, 0, -458733, 1, 0, -458732, 1, 0, -458731, 1, 0, -458730, 1, 0, -458729, 1, 0, -458728, 1, 0, -458727, 1, 0, -458726, 1, 0, -458725, 1, 0, -458724, 1, 0, -458723, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -393202, 1, 0, -393201, 1, 0, -393200, 1, 0, -393199, 1, 0, -393198, 1, 0, -393197, 1, 0, -393196, 1, 0, -393195, 1, 0, -393194, 1, 0, -393193, 1, 0, -393192, 1, 0, -393191, 1, 0, -393190, 1, 0, -393189, 1, 0, -393188, 1, 0, -393187, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 1, 0, -327680, 1, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -327664, 1, 0, -327663, 1, 0, -327662, 1, 0, -327661, 1, 0, -327660, 1, 0, -327659, 1, 0, -327658, 1, 0, -327657, 1, 0, -327656, 1, 0, -327655, 1, 0, -327654, 1, 0, -327653, 1, 0, -327652, 1, 0, -327651, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 1, 0, -262144, 1, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -262130, 1, 0, -262129, 1, 0, -262128, 1, 0, -262127, 1, 0, -262126, 1, 0, -262125, 1, 0, -262124, 1, 0, -262123, 1, 0, -262122, 1, 0, -262121, 1, 0, -262120, 1, 0, -262119, 1, 0, -262118, 1, 0, -262117, 1, 0, -262116, 1, 0, -262115, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -196594, 1, 0, -196593, 1, 0, -196592, 1, 0, -196591, 1, 0, -196590, 1, 0, -196589, 1, 0, -196588, 1, 0, -196587, 1, 0, -196586, 1, 0, -196585, 1, 0, -196584, 1, 0, -196583, 1, 0, -196582, 1, 0, -196581, 1, 0, -196580, 1, 0, -196579, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 1, 0, -65543, 1, 0, -65542, 1, 0, -65541, 1, 0, -65540, 1, 0, -65539, 1, 0, -65538, 1, 0, -65537, 1, 0, -131072, 1, 0, -131071, 1, 0, -131070, 1, 0, -131069, 1, 0, -131068, 1, 0, -131067, 1, 0, -131066, 1, 0, -131065, 1, 0, -131064, 1, 0, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -131058, 1, 0, -131057, 1, 0, -131056, 1, 0, -131055, 1, 0, -131054, 1, 0, -131053, 1, 0, -131052, 1, 0, -131051, 1, 0, -131050, 1, 0, -131049, 1, 0, -131048, 1, 0, -131047, 1, 0, -131046, 1, 0, -131045, 1, 0, -131044, 1, 0, -131043, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 1, 0, -7, 1, 0, -6, 1, 0, -5, 1, 0, -4, 1, 0, -3, 1, 0, -2, 1, 0, -1, 1, 0, -65536, 1, 0, -65535, 1, 0, -65534, 1, 0, -65533, 1, 0, -65532, 1, 0, -65531, 1, 0, -65530, 1, 0, -65529, 1, 0, -65528, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, -65522, 1, 0, -65521, 1, 0, -65520, 1, 0, -65519, 1, 0, -65518, 1, 0, -65517, 1, 0, -65516, 1, 0, -65515, 1, 0, -65514, 1, 0, -65513, 1, 0, -65512, 1, 0, -65511, 1, 0, -65510, 1, 0, -65509, 1, 0, -65508, 1, 0, -65507, 1, 0, 65524, 1, 0, 65525, 1, 0, 65526, 1, 0, 65527, 1, 0, 65528, 1, 0, 65529, 1, 0, 65530, 1, 0, 65531, 1, 0, 65532, 1, 0, 65533, 1, 0, 65534, 1, 0, 65535, 1, 0, 0, 1, 0, 1, 1, 0, 2, 1, 0, 3, 1, 0, 4, 1, 0, 5, 1, 0, 6, 1, 0, 7, 1, 0, 8, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0, 14, 1, 0, 15, 1, 0, 16, 1, 0, 17, 1, 0, 18, 1, 0, 19, 1, 0, 20, 1, 0, 21, 1, 0, 22, 1, 0, 23, 1, 0, 24, 1, 0, 25, 1, 0, 26, 1, 0, 27, 1, 0, 28, 1, 0, 29, 1, 0, 131060, 1, 0, 131061, 1, 0, 131062, 1, 0, 131063, 1, 0, 131064, 1, 0, 131065, 1, 0, 131066, 1, 0, 131067, 1, 0, 131068, 1, 0, 131069, 1, 0, 131070, 1, 0, 131071, 1, 0, 65536, 1, 0, 65554, 1, 0, 65555, 1, 0, 65556, 1, 0, 65557, 1, 0, 65558, 1, 0, 65559, 1, 0, 65560, 1, 0, 65561, 1, 0, 65562, 1, 0, 65563, 1, 0, 65564, 1, 0, 65565, 1, 0, 196596, 1, 0, 196597, 1, 0, 196598, 1, 0, 196599, 1, 0, 196600, 1, 0, 196601, 1, 0, 196602, 1, 0, 196603, 1, 0, 196604, 1, 0, 196605, 1, 0, 196606, 1, 0, 196607, 1, 0, 131072, 1, 0, 131090, 1, 0, 131091, 1, 0, 131092, 1, 0, 131093, 1, 0, 131094, 1, 0, 131095, 1, 0, 131096, 1, 0, 131097, 1, 0, 131098, 1, 0, 131099, 1, 0, 131100, 1, 0, 131101, 1, 0, 262132, 1, 0, 262133, 1, 0, 262134, 1, 0, 262135, 1, 0, 262136, 1, 0, 262137, 1, 0, 262138, 1, 0, 262139, 1, 0, 262140, 1, 0, 262141, 1, 0, 262142, 1, 0, 262143, 1, 0, 196608, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196626, 1, 0, 196627, 1, 0, 196628, 1, 0, 196629, 1, 0, 196630, 1, 0, 196631, 1, 0, 196632, 1, 0, 196633, 1, 0, 196634, 1, 0, 196635, 1, 0, 196636, 1, 0, 196637, 1, 0, 327668, 1, 0, 327669, 1, 0, 327670, 1, 0, 327671, 1, 0, 327672, 1, 0, 327673, 1, 0, 327674, 1, 0, 327675, 1, 0, 327676, 1, 0, 327677, 1, 0, 327678, 1, 0, 327679, 1, 0, 262144, 1, 0, 262151, 1, 0, 262162, 1, 0, 262163, 1, 0, 262164, 1, 0, 262165, 1, 0, 262166, 1, 0, 262167, 1, 0, 262168, 1, 0, 262169, 1, 0, 262170, 1, 0, 262171, 1, 0, 262172, 1, 0, 262173, 1, 0, 393204, 1, 0, 393205, 1, 0, 393206, 1, 0, 393207, 1, 0, 393208, 1, 0, 393209, 1, 0, 393210, 1, 0, 393211, 1, 0, 393212, 1, 0, 393213, 1, 0, 393214, 1, 0, 393215, 1, 0, 327680, 1, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327698, 1, 0, 327699, 1, 0, 327700, 1, 0, 327701, 1, 0, 327702, 1, 0, 327703, 1, 0, 327704, 1, 0, 327705, 1, 0, 327706, 1, 0, 327707, 1, 0, 327708, 1, 0, 327709, 1, 0, 458740, 1, 0, 458741, 1, 0, 458742, 1, 0, 458743, 1, 0, 458744, 1, 0, 458745, 1, 0, 458746, 1, 0, 458747, 1, 0, 458748, 1, 0, 458749, 1, 0, 458750, 1, 0, 458751, 1, 0, 393216, 1, 0, 393234, 1, 0, 393235, 1, 0, 393236, 1, 0, 393237, 1, 0, 393238, 1, 0, 393239, 1, 0, 393240, 1, 0, 393241, 1, 0, 393242, 1, 0, 393243, 1, 0, 393244, 1, 0, 393245, 1, 0, 524276, 1, 0, 524277, 1, 0, 524278, 1, 0, 524279, 1, 0, 524280, 1, 0, 524281, 1, 0, 524282, 1, 0, 524283, 1, 0, 524284, 1, 0, 524285, 1, 0, 524286, 1, 0, 524287, 1, 0, 458752, 1, 0, 458753, 1, 0, 458754, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 1, 0, 458773, 1, 0, 458774, 1, 0, 458775, 1, 0, 458776, 1, 0, 458777, 1, 0, 458778, 1, 0, 458779, 1, 0, 458780, 1, 0, 458781, 1, 0, 589812, 1, 0, 589813, 1, 0, 589814, 1, 0, 589815, 1, 0, 589816, 1, 0, 589817, 1, 0, 589818, 1, 0, 589819, 1, 0, 589820, 1, 0, 589821, 1, 0, 589822, 1, 0, 589823, 1, 0, 524288, 1, 0, 524289, 1, 0, 524290, 1, 0, 524306, 1, 0, 524307, 1, 0, 524308, 1, 0, 524309, 1, 0, 524310, 1, 0, 524311, 1, 0, 524312, 1, 0, 524313, 1, 0, 524314, 1, 0, 524315, 1, 0, 524316, 1, 0, 524317, 1, 0, 655348, 1, 0, 655349, 1, 0, 655350, 1, 0, 655351, 1, 0, 655352, 1, 0, 655353, 1, 0, 655354, 1, 0, 655355, 1, 0, 655356, 1, 0, 655357, 1, 0, 655358, 1, 0, 655359, 1, 0, 589824, 1, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589842, 1, 0, 589843, 1, 0, 589844, 1, 0, 589845, 1, 0, 589846, 1, 0, 589847, 1, 0, 589848, 1, 0, 589849, 1, 0, 589850, 1, 0, 589851, 1, 0, 589852, 1, 0, 589853, 1, 0, 720884, 1, 0, 720885, 1, 0, 720886, 1, 0, 720887, 1, 0, 720888, 1, 0, 720889, 1, 0, 720890, 1, 0, 720891, 1, 0, 720892, 1, 0, 720893, 1, 0, 720894, 1, 0, 720895, 1, 0, 655360, 1, 0, 655361, 1, 0, 655362, 1, 0, 655363, 1, 0, 655364, 1, 0, 655365, 1, 0, 655366, 1, 0, 655367, 1, 0, 655368, 1, 0, 655369, 1, 0, 655370, 1, 0, 655371, 1, 0, 655372, 1, 0, 655373, 1, 0, 655374, 1, 0, 655375, 1, 0, 655376, 1, 0, 655377, 1, 0, 655378, 1, 0, 655379, 1, 0, 655380, 1, 0, 655381, 1, 0, 655382, 1, 0, 655383, 1, 0, 655384, 1, 0, 655385, 1, 0, 655386, 1, 0, 655387, 1, 0, 655388, 1, 0, 655389, 1, 0, 786420, 1, 0, 786421, 1, 0, 786422, 1, 0, 786423, 1, 0, 786424, 1, 0, 786425, 1, 0, 786426, 1, 0, 786427, 1, 0, 786428, 1, 0, 786429, 1, 0, 786430, 1, 0, 786431, 1, 0, 720896, 1, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 1, 0, 720917, 1, 0, 720918, 1, 0, 720919, 1, 0, 720920, 1, 0, 720921, 1, 0, 720922, 1, 0, 720923, 1, 0, 720924, 1, 0, 720925, 1, 0, 851956, 1, 0, 851957, 1, 0, 851958, 1, 0, 851959, 1, 0, 851960, 1, 0, 851961, 1, 0, 851962, 1, 0, 851963, 1, 0, 851964, 1, 0, 851965, 1, 0, 851966, 1, 0, 851967, 1, 0, 786432, 1, 0, 786433, 1, 0, 786434, 1, 0, 786435, 1, 0, 786436, 1, 0, 786437, 1, 0, 786438, 1, 0, 786439, 1, 0, 786440, 1, 0, 786441, 1, 0, 786442, 1, 0, 786443, 1, 0, 786444, 1, 0, 786445, 1, 0, 786446, 1, 0, 786447, 1, 0, 786448, 1, 0, 786449, 1, 0, 786450, 1, 0, 786451, 1, 0, 786452, 1, 0, 786453, 1, 0, 786454, 1, 0, 786455, 1, 0, 786456, 1, 0, 786457, 1, 0, 786458, 1, 0, 786459, 1, 0, 786460, 1, 0, 786461, 1, 0, 917492, 1, 0, 917493, 1, 0, 917494, 1, 0, 917495, 1, 0, 917496, 1, 0, 917497, 1, 0, 917498, 1, 0, 917499, 1, 0, 917500, 1, 0, 917501, 1, 0, 917502, 1, 0, 917503, 1, 0, 851968, 1, 0, 851969, 1, 0, 851970, 1, 0, 851971, 1, 0, 851972, 1, 0, 851973, 1, 0, 851974, 1, 0, 851975, 1, 0, 851976, 1, 0, 851977, 1, 0, 851978, 1, 0, 851979, 1, 0, 851980, 1, 0, 851981, 1, 0, 851982, 1, 0, 851983, 1, 0, 851984, 1, 0, 851985, 1, 0, 851986, 1, 0, 851987, 1, 0, 851988, 1, 0, 851989, 1, 0, 851990, 1, 0, 851991, 1, 0, 851992, 1, 0, 851993, 1, 0, 851994, 1, 0, 851995, 1, 0, 851996, 1, 0, 851997, 1, 0, 983028, 1, 0, 983029, 1, 0, 983030, 1, 0, 983031, 1, 0, 983032, 1, 0, 983033, 1, 0, 983034, 1, 0, 983035, 1, 0, 983036, 1, 0, 983037, 1, 0, 983038, 1, 0, 983039, 1, 0, 917504, 1, 0, 917505, 1, 0, 917506, 1, 0, 917507, 1, 0, 917508, 1, 0, 917509, 1, 0, 917510, 1, 0, 917511, 1, 0, 917512, 1, 0, 917513, 1, 0, 917514, 1, 0, 917515, 1, 0, 917516, 1, 0, 917517, 1, 0, 917518, 1, 0, 917519, 1, 0, 917520, 1, 0, 917521, 1, 0, 917522, 1, 0, 917523, 1, 0, 917524, 1, 0, 917525, 1, 0, 917526, 1, 0, 917527, 1, 0, 917528, 1, 0, 917529, 1, 0, 917530, 1, 0, 917531, 1, 0, 917532, 1, 0, 917533, 1, 0, 1048564, 1, 0, 1048565, 1, 0, 1048566, 1, 0, 1048567, 1, 0, 1048568, 1, 0, 1048569, 1, 0, 1048570, 1, 0, 1048571, 1, 0, 1048572, 1, 0, 1048573, 1, 0, 1048574, 1, 0, 1048575, 1, 0, 983040, 1, 0, 983041, 1, 0, 983042, 1, 0, 983043, 1, 0, 983044, 1, 0, 983045, 1, 0, 983046, 1, 0, 983047, 1, 0, 983048, 1, 0, 983049, 1, 0, 983050, 1, 0, 983051, 1, 0, 983052, 1, 0, 983053, 1, 0, 983054, 1, 0, 983055, 1, 0, 983056, 1, 0, 983057, 1, 0, 983058, 1, 0, 983059, 1, 0, 983060, 1, 0, 983061, 1, 0, 983062, 1, 0, 983063, 1, 0, 983064, 1, 0, 983065, 1, 0, 983066, 1, 0, 983067, 1, 0, 983068, 1, 0, 983069, 1, 0, 1114100, 1, 0, 1114101, 1, 0, 1114102, 1, 0, 1114103, 1, 0, 1114104, 1, 0, 1114105, 1, 0, 1114106, 1, 0, 1114107, 1, 0, 1114108, 1, 0, 1114109, 1, 0, 1114110, 1, 0, 1114111, 1, 0, 1048576, 1, 0, 1048577, 1, 0, 1048578, 1, 0, 1048579, 1, 0, 1048580, 1, 0, 1048581, 1, 0, 1048582, 1, 0, 1048583, 1, 0, 1048584, 1, 0, 1048585, 1, 0, 1048586, 1, 0, 1048587, 1, 0, 1048588, 1, 0, 1048589, 1, 0, 1048590, 1, 0, 1048591, 1, 0, 1048592, 1, 0, 1048593, 1, 0, 1048594, 1, 0, 1048595, 1, 0, 1048596, 1, 0, 1048597, 1, 0, 1048598, 1, 0, 1048599, 1, 0, 1048600, 1, 0, 1048601, 1, 0, 1048602, 1, 0, 1048603, 1, 0, 1048604, 1, 0, 1048605, 1, 0, 1179636, 1, 0, 1179637, 1, 0, 1179638, 1, 0, 1179639, 1, 0, 1179640, 1, 0, 1179641, 1, 0, 1179642, 1, 0, 1179643, 1, 0, 1179644, 1, 0, 1179645, 1, 0, 1179646, 1, 0, 1179647, 1, 0, 1114112, 1, 0, 1114113, 1, 0, 1114114, 1, 0, 1114115, 1, 0, 1114116, 1, 0, 1114117, 1, 0, 1114118, 1, 0, 1114119, 1, 0, 1114120, 1, 0, 1114121, 1, 0, 1114122, 1, 0, 1114123, 1, 0, 1114124, 1, 0, 1114125, 1, 0, 1114126, 1, 0, 1114127, 1, 0, 1114128, 1, 0, 1114129, 1, 0, 1114130, 1, 0, 1114131, 1, 0, 1114132, 1, 0, 1114133, 1, 0, 1114134, 1, 0, 1114135, 1, 0, 1114136, 1, 0, 1114137, 1, 0, 1114138, 1, 0, 1114139, 1, 0, 1114140, 1, 0, 1114141, 1, 0, 1245172, 1, 0, 1245173, 1, 0, 1245174, 1, 0, 1245175, 1, 0, 1245176, 1, 0, 1245177, 1, 0, 1245178, 1, 0, 1245179, 1, 0, 1245180, 1, 0, 1245181, 1, 0, 1245182, 1, 0, 1245183, 1, 0, 1179648, 1, 0, 1179649, 1, 0, 1179650, 1, 0, 1179651, 1, 0, 1179652, 1, 0, 1179653, 1, 0, 1179654, 1, 0, 1179655, 1, 0, 1179656, 1, 0, 1179657, 1, 0, 1179658, 1, 0, 1179659, 1, 0, 1179660, 1, 0, 1179661, 1, 0, 1179662, 1, 0, 1179663, 1, 0, 1179664, 1, 0, 1179665, 1, 0, 1179666, 1, 0, 1179667, 1, 0, 1179668, 1, 0, 1179669, 1, 0, 1179670, 1, 0, 1179671, 1, 0, 1179672, 1, 0, 1179673, 1, 0, 1179674, 1, 0, 1179675, 1, 0, 1179676, 1, 0, 1179677, 1, 0 ) script = ExtResource( 3 ) __meta__ = { "_edit_lock_": true @@ -32,7 +32,6 @@ __meta__ = { dialogue_ui = NodePath("../DialogueUI") [node name="Player" parent="Grid" instance=ExtResource( 4 )] -editor/display_folded = true position = Vector2( 416, 288 ) combat_actor = ExtResource( 5 ) @@ -59,4 +58,3 @@ dialogue_file = "res://dialogue/dialogue_data/object.json" [node name="DialogueUI" parent="." instance=ExtResource( 10 )] visible = false - diff --git a/2d/role_playing_game/theme/theme.tres b/2d/role_playing_game/theme/theme.tres index 5c10858b..ae516e2f 100644 --- a/2d/role_playing_game/theme/theme.tres +++ b/2d/role_playing_game/theme/theme.tres @@ -81,4 +81,3 @@ ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 ) ProgressBar/fonts/font = ExtResource( 4 ) ProgressBar/styles/bg = SubResource( 6 ) ProgressBar/styles/fg = ExtResource( 7 ) - diff --git a/2d/screen_space_shaders/art/burano.jpg.import b/2d/screen_space_shaders/art/burano.jpg.import index 7296014e..7a636ce0 100644 --- a/2d/screen_space_shaders/art/burano.jpg.import +++ b/2d/screen_space_shaders/art/burano.jpg.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://art/burano.jpg" -source_md5="a7a43f4048c157e4180fadc2fb85500a" - dest_files=[ "res://.import/burano.jpg-bbae3c5a81f8b6300cd944219dbbbc05.stex" ] -dest_md5="7eac829bfd32310547f1ec1f64a2b6e1" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/art/filmgrain.png.import b/2d/screen_space_shaders/art/filmgrain.png.import index ab2a8810..5cc29332 100644 --- a/2d/screen_space_shaders/art/filmgrain.png.import +++ b/2d/screen_space_shaders/art/filmgrain.png.import @@ -4,20 +4,22 @@ importer="texture" type="StreamTexture" path.s3tc="res://.import/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex" path.etc2="res://.import/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} [deps] source_file="res://art/filmgrain.png" -source_md5="6e935b013571b36377b4f225746be5df" - dest_files=[ "res://.import/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.s3tc.stex", "res://.import/filmgrain.png-8b1c9d8b22a2ffa8f94b1e004d5eddc9.etc2.stex" ] -dest_md5="c0ae0627c5a3e2f284d0d36ceac850a9" [params] compress/mode=2 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=true flags/filter=true @@ -27,6 +29,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=false diff --git a/2d/screen_space_shaders/art/forest.jpg.import b/2d/screen_space_shaders/art/forest.jpg.import index 962daf14..88f65c9e 100644 --- a/2d/screen_space_shaders/art/forest.jpg.import +++ b/2d/screen_space_shaders/art/forest.jpg.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://art/forest.jpg" -source_md5="a19424db1a6064ebc09c600ab2b0a0e8" - dest_files=[ "res://.import/forest.jpg-f2ce28f12b0871a15d1e9ebfcd24b47f.stex" ] -dest_md5="406ea3b480446997fd81be4e4b1e4589" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/art/mountains.jpg.import b/2d/screen_space_shaders/art/mountains.jpg.import index dd804e92..23506d55 100644 --- a/2d/screen_space_shaders/art/mountains.jpg.import +++ b/2d/screen_space_shaders/art/mountains.jpg.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://art/mountains.jpg" -source_md5="d2d89058d725456ef75987637c06a7c0" - dest_files=[ "res://.import/mountains.jpg-fd51eb0e2a35878963804e860ef9d187.stex" ] -dest_md5="0b74851a8390532635e9dcd70cf58e8c" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/art/platformer.jpg.import b/2d/screen_space_shaders/art/platformer.jpg.import index f94866f1..c7f670b7 100644 --- a/2d/screen_space_shaders/art/platformer.jpg.import +++ b/2d/screen_space_shaders/art/platformer.jpg.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://art/platformer.jpg" -source_md5="8ff2fb3bb2fe75e79d0812c4cc7f4380" - dest_files=[ "res://.import/platformer.jpg-ce18350247a11c58497c7e0d8e3be273.stex" ] -dest_md5="ed068c0fed8f318e84ce5371746bf6b3" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/art/vignette.png.import b/2d/screen_space_shaders/art/vignette.png.import index 303cdd58..9a584a04 100644 --- a/2d/screen_space_shaders/art/vignette.png.import +++ b/2d/screen_space_shaders/art/vignette.png.import @@ -4,20 +4,22 @@ importer="texture" type="StreamTexture" path.s3tc="res://.import/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex" path.etc2="res://.import/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true +} [deps] source_file="res://art/vignette.png" -source_md5="d430febbb0b34beb0fdf23da8fe91676" - dest_files=[ "res://.import/vignette.png-993dbe0a69e475ef62cba692d80d947d.s3tc.stex", "res://.import/vignette.png-993dbe0a69e475ef62cba692d80d947d.etc2.stex" ] -dest_md5="e545eac98bc8a28106968b5f7529dc8c" [params] compress/mode=2 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=true flags/filter=true @@ -27,6 +29,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=false diff --git a/2d/screen_space_shaders/art/white.png.import b/2d/screen_space_shaders/art/white.png.import index dfd7dd45..340166da 100644 --- a/2d/screen_space_shaders/art/white.png.import +++ b/2d/screen_space_shaders/art/white.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://art/white.png" -source_md5="b68844373120b3795a9b80a7922d0c76" - dest_files=[ "res://.import/white.png-9cdc9524282ba2bce69b45edcd6ac827.stex" ] -dest_md5="f17f3e225bc88873851ebd43ba696987" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/icon.png.import b/2d/screen_space_shaders/icon.png.import index 8c448c06..96cbf462 100644 --- a/2d/screen_space_shaders/icon.png.import +++ b/2d/screen_space_shaders/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="7a9f231537559872f9c95e294e0024d8" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="ac2a005446207123eae90720f81b5c46" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/screen_space_shaders/project.godot b/2d/screen_space_shaders/project.godot index b33efe98..522de544 100644 --- a/2d/screen_space_shaders/project.godot +++ b/2d/screen_space_shaders/project.godot @@ -22,6 +22,8 @@ config/icon="res://icon.png" [display] window/size/width=800 +window/stretch/mode="2d" +window/stretch/aspect="keep" stretch/aspect="keep" stretch/mode="2d" diff --git a/2d/screen_space_shaders/screen_shaders.tscn b/2d/screen_space_shaders/screen_shaders.tscn index 9c6c954d..135ceabe 100644 --- a/2d/screen_space_shaders/screen_shaders.tscn +++ b/2d/screen_space_shaders/screen_shaders.tscn @@ -259,6 +259,5 @@ margin_right = 260.0 margin_bottom = 28.0 size_flags_horizontal = 2 size_flags_vertical = 2 - [connection signal="item_selected" from="picture" to="." method="_on_picture_item_selected"] [connection signal="item_selected" from="effect" to="." method="_on_effect_item_selected"] diff --git a/2d/sdf_font/default_environment.tres b/2d/sdf_font/default_environment.tres index b50899c5..4f63af59 100644 --- a/2d/sdf_font/default_environment.tres +++ b/2d/sdf_font/default_environment.tres @@ -1,4 +1,3 @@ [gd_resource type="Environment" format=2] [resource] - diff --git a/2d/sdf_font/icon.png.import b/2d/sdf_font/icon.png.import index 45ee6af7..96cbf462 100644 --- a/2d/sdf_font/icon.png.import +++ b/2d/sdf_font/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/2d/sdf_font/project.godot b/2d/sdf_font/project.godot index ded9925f..8f0f52b6 100644 --- a/2d/sdf_font/project.godot +++ b/2d/sdf_font/project.godot @@ -19,10 +19,16 @@ config/name="Signed Distance Field Font Demo" run/main_scene="res://sdf.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] [rendering] +environment/default_clear_color=Color( 0.18, 0.1188, 0.15348, 1 ) environment/default_environment="res://default_environment.tres" diff --git a/2d/sdf_font/sdf.tscn b/2d/sdf_font/sdf.tscn index a6eb537a..d2b4834b 100644 --- a/2d/sdf_font/sdf.tscn +++ b/2d/sdf_font/sdf.tscn @@ -29,7 +29,7 @@ tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { "times": PoolRealArray( 0, 5 ), -"transitions": PoolRealArray( 1, 1 ), +"transitions": PoolRealArray( -2, -2 ), "update": 0, "values": [ Vector2( 1, 1 ), Vector2( 7, 7 ) ] } @@ -37,7 +37,7 @@ tracks/0/keys = { [node name="Root Node" type="Node2D"] [node name="base" type="Position2D" parent="."] -position = Vector2( 450, 300 ) +position = Vector2( 500, 300 ) [node name="rotate" type="AnimationPlayer" parent="base"] autoplay = "rotate" @@ -60,3 +60,6 @@ text = "Signed Distance Field Font!!" align = 1 +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true diff --git a/2d/sprite_shaders/default_env.tres b/2d/sprite_shaders/default_env.tres index 4b7cb0ac..d37b59de 100644 --- a/2d/sprite_shaders/default_env.tres +++ b/2d/sprite_shaders/default_env.tres @@ -11,4 +11,3 @@ ground_curve = 0.01 [resource] background_mode = 2 background_sky = SubResource( 1 ) - diff --git a/2d/sprite_shaders/godotea.png.import b/2d/sprite_shaders/godotea.png.import index e4945351..fc101e1f 100644 --- a/2d/sprite_shaders/godotea.png.import +++ b/2d/sprite_shaders/godotea.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/godotea.png-418ef4f4be671d254e4230569960266a.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/godotea.png-418ef4f4be671d254e4230569960266a.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/sprite_shaders/icon.png.import b/2d/sprite_shaders/icon.png.import index 0041ef86..96cbf462 100644 --- a/2d/sprite_shaders/icon.png.import +++ b/2d/sprite_shaders/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] @@ -14,6 +17,7 @@ dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -23,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/2d/sprite_shaders/project.godot b/2d/sprite_shaders/project.godot index 440c1b8a..824989d8 100644 --- a/2d/sprite_shaders/project.godot +++ b/2d/sprite_shaders/project.godot @@ -19,6 +19,11 @@ config/name="2D Shaders for Sprites" run/main_scene="res://sprite_shaders.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [rendering] environment/default_environment="res://default_env.tres" diff --git a/2d/sprite_shaders/sprite_shaders.tscn b/2d/sprite_shaders/sprite_shaders.tscn index cd73e6b0..51b28bc1 100644 --- a/2d/sprite_shaders/sprite_shaders.tscn +++ b/2d/sprite_shaders/sprite_shaders.tscn @@ -115,3 +115,10 @@ position = Vector2( 1600, 800 ) texture = ExtResource( 2 ) region_rect = Rect2( 141, 115, 39, 6 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 248, 120 ) +current = true +drag_margin_left = 0.0 +drag_margin_top = 0.0 +drag_margin_right = 0.0 +drag_margin_bottom = 0.0 diff --git a/3d/material_testers/project.godot b/3d/material_testers/project.godot index 3413f8a8..036f5736 100644 --- a/3d/material_testers/project.godot +++ b/3d/material_testers/project.godot @@ -19,6 +19,11 @@ config/name="Material Tester" run/main_scene="res://tester.scn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/3d/material_testers/tester.gd b/3d/material_testers/tester.gd index 5b052b7d..85b83e45 100644 --- a/3d/material_testers/tester.gd +++ b/3d/material_testers/tester.gd @@ -10,6 +10,7 @@ const ROT_SPEED = 0.15 var rot_x = 0 var rot_y = 0 var zoom = 0 +var base_height = ProjectSettings.get_setting("display/window/size/height") const ZOOM_SPEED = 0.1 const ZOOM_MAX = 2.5 @@ -22,7 +23,7 @@ var hdrs=[ ] func _ready(): - for h in hdrs: + for h in hdrs: get_node("ui/bg").add_item(h.name) func _unhandled_input(ev): @@ -36,18 +37,21 @@ func _unhandled_input(ev): if zoom > 0: zoom -= ZOOM_SPEED get_node("camera/base/rotation/camera").translation.z = -zoom - + if ev is InputEventMouseMotion and ev.button_mask & BUTTON_MASK_LEFT: - rot_y += ev.relative.x * ROT_SPEED - rot_x += ev.relative.y * ROT_SPEED + # Compensate motion speed to be resolution-independent (based on the window height) + var relative_motion = ev.relative * get_viewport().size.y / base_height + + rot_y += relative_motion.x * ROT_SPEED + rot_x += relative_motion.y * ROT_SPEED rot_y = clamp(rot_y, -180, 180) rot_x = clamp(rot_x, 0, 150) var t = Transform() t = t.rotated(Vector3(0, 0, 1), rot_x * PI / 180.0) t = t.rotated(Vector3(0, 1, 0), -rot_y * PI / 180.0) get_node("camera/base").transform.basis = t.basis - - + + func _process(delta): var xform = get_node("testers").get_child(tester_index).get_node("MeshInstance").global_transform var p = xform.origin @@ -55,17 +59,17 @@ func _process(delta): var from_xform = get_node("camera").transform var from_p = from_xform.origin var from_r = Quat(from_xform.basis) - + p = from_p.linear_interpolate(p, INTERP_SPEED * delta) r = from_r.slerp(r, INTERP_SPEED * delta) - + var m = Transform(r) m.origin = p - + get_node("camera").transform = m get_node("ui/label").text = get_node("testers").get_child(tester_index).get_name() - - + + func _on_prev_pressed(): if tester_index > 0: tester_index -= 1 diff --git a/3d/truck_town/car_select.tscn b/3d/truck_town/car_select.tscn index e3b18e42..94d3f2b3 100644 --- a/3d/truck_town/car_select.tscn +++ b/3d/truck_town/car_select.tscn @@ -6,13 +6,20 @@ [ext_resource path="res://Images/choose_tow.png" type="Texture" id=4] [node name="base" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -300.0 +margin_right = 512.0 +margin_bottom = 300.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) __meta__ = { -"__editor_plugin_screen__": "2D" +"__editor_plugin_screen__": "2D", +"_edit_use_anchors_": false } [node name="van 1" type="Button" parent="."] @@ -41,7 +48,6 @@ margin_bottom = 400.0 size_flags_horizontal = 2 size_flags_vertical = 2 icon = ExtResource( 4 ) - [connection signal="pressed" from="van 1" to="." method="_on_van_1_pressed"] [connection signal="pressed" from="van 2" to="." method="_on_van_2_pressed"] [connection signal="pressed" from="van 3" to="." method="_on_van_3_pressed"] diff --git a/3d/truck_town/default_env.tres b/3d/truck_town/default_env.tres index 3eaf31ee..80160d64 100644 --- a/3d/truck_town/default_env.tres +++ b/3d/truck_town/default_env.tres @@ -14,4 +14,3 @@ background_mode = 2 background_sky = SubResource( 1 ) ambient_light_color = Color( 0.347656, 0.347656, 0.347656, 1 ) ambient_light_sky_contribution = 0.2 - diff --git a/3d/truck_town/project.godot b/3d/truck_town/project.godot index 7095dc0f..c1e1c158 100644 --- a/3d/truck_town/project.godot +++ b/3d/truck_town/project.godot @@ -21,6 +21,8 @@ config/icon="res://icon.png" [display] +window/stretch/mode="2d" +window/stretch/aspect="expand" window/height=720 window/width=1280 diff --git a/audio/mic_record/MicRecord.gd b/audio/mic_record/MicRecord.gd index e41a45b8..97cb1a6f 100644 --- a/audio/mic_record/MicRecord.gd +++ b/audio/mic_record/MicRecord.gd @@ -1,4 +1,4 @@ -extends Node +extends Control var effect var recording diff --git a/audio/mic_record/MicRecord.tscn b/audio/mic_record/MicRecord.tscn index c5c9e483..dfb3054c 100644 --- a/audio/mic_record/MicRecord.tscn +++ b/audio/mic_record/MicRecord.tscn @@ -5,8 +5,19 @@ [sub_resource type="AudioStreamMicrophone" id=1] -[node name="MicRecord" type="Node"] +[node name="MicRecord" type="Control"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -320.0 +margin_top = -240.0 +margin_right = 320.0 +margin_bottom = 240.0 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="AudioStreamRecord" type="AudioStreamPlayer" parent="."] stream = SubResource( 1 ) @@ -22,16 +33,16 @@ volume_db = -6.0 [node name="RecordButton" type="Button" parent="."] margin_left = 120.0 -margin_top = 60.0 +margin_top = 100.0 margin_right = 240.0 -margin_bottom = 100.0 +margin_bottom = 140.0 text = "Record" [node name="SaveButton" type="Button" parent="."] margin_left = 120.0 -margin_top = 140.0 +margin_top = 180.0 margin_right = 240.0 -margin_bottom = 180.0 +margin_bottom = 220.0 disabled = true text = "Save WAV To:" @@ -40,25 +51,27 @@ margin_left = 180.0 margin_right = 340.0 margin_bottom = 40.0 text = "user://record.wav" +caret_blink = true +caret_blink_speed = 0.5 [node name="PlayButton" type="Button" parent="."] margin_left = 300.0 -margin_top = 60.0 +margin_top = 100.0 margin_right = 420.0 -margin_bottom = 100.0 +margin_bottom = 140.0 disabled = true text = "Play" [node name="PlayMusic" type="Button" parent="."] margin_left = 120.0 -margin_top = 220.0 +margin_top = 260.0 margin_right = 240.0 -margin_bottom = 260.0 +margin_bottom = 300.0 text = "Play Music" [node name="Status" type="Label" parent="."] margin_left = 120.0 -margin_top = 300.0 +margin_top = 340.0 margin_right = 520.0 margin_bottom = 340.0 [connection signal="pressed" from="RecordButton" to="." method="_on_RecordButton_pressed"] diff --git a/gui/drag_and_drop/drag_and_drop.tscn b/gui/drag_and_drop/drag_and_drop.tscn index 75a281a1..2fc24839 100644 --- a/gui/drag_and_drop/drag_and_drop.tscn +++ b/gui/drag_and_drop/drag_and_drop.tscn @@ -3,110 +3,116 @@ [ext_resource path="res://drag_drop_script.gd" type="Script" id=1] [node name="Control" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -300.0 +margin_right = 512.0 +margin_bottom = 300.0 size_flags_horizontal = 2 size_flags_vertical = 2 __meta__ = { -"__editor_plugin_screen__": "2D" +"__editor_plugin_screen__": "2D", +"_edit_use_anchors_": false } [node name="ColorPickerButton0" type="ColorPickerButton" parent="."] -margin_left = 64.0 -margin_top = 64.0 -margin_right = 160.0 -margin_bottom = 128.0 +margin_left = 304.0 +margin_top = 193.0 +margin_right = 400.0 +margin_bottom = 257.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0.671032, 0.605183, 0, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton1" type="ColorPickerButton" parent="."] -margin_left = 224.0 -margin_top = 64.0 -margin_right = 320.0 -margin_bottom = 128.0 +margin_left = 464.0 +margin_top = 193.0 +margin_right = 560.0 +margin_bottom = 257.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0, 0.797347, 0.741037, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton2" type="ColorPickerButton" parent="."] -margin_left = 384.0 -margin_top = 64.0 -margin_right = 480.0 -margin_bottom = 128.0 +margin_left = 624.0 +margin_top = 193.0 +margin_right = 720.0 +margin_bottom = 257.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0.443924, 0, 0.632923, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton3" type="ColorPickerButton" parent="."] -margin_left = 64.0 -margin_top = 160.0 -margin_right = 160.0 -margin_bottom = 224.0 +margin_left = 304.0 +margin_top = 289.0 +margin_right = 400.0 +margin_bottom = 353.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 1, 1, 1, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton4" type="ColorPickerButton" parent="."] -margin_left = 224.0 -margin_top = 160.0 -margin_right = 320.0 -margin_bottom = 224.0 +margin_left = 464.0 +margin_top = 289.0 +margin_right = 560.0 +margin_bottom = 353.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 1, 0.933842, 0, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton5" type="ColorPickerButton" parent="."] -margin_left = 384.0 -margin_top = 160.0 -margin_right = 480.0 -margin_bottom = 224.0 +margin_left = 624.0 +margin_top = 289.0 +margin_right = 720.0 +margin_bottom = 353.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0.287293, 0.886362, 0.122933, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton6" type="ColorPickerButton" parent="."] -margin_left = 64.0 -margin_top = 256.0 -margin_right = 160.0 -margin_bottom = 320.0 +margin_left = 304.0 +margin_top = 385.0 +margin_right = 400.0 +margin_bottom = 449.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0.908461, 0, 0.88789, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton7" type="ColorPickerButton" parent="."] -margin_left = 224.0 -margin_top = 256.0 -margin_right = 320.0 -margin_bottom = 320.0 +margin_left = 464.0 +margin_top = 385.0 +margin_right = 560.0 +margin_bottom = 449.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0, 0.283703, 0, 1 ) script = ExtResource( 1 ) [node name="ColorPickerButton8" type="ColorPickerButton" parent="."] -margin_left = 384.0 -margin_top = 256.0 -margin_right = 480.0 -margin_bottom = 320.0 +margin_left = 624.0 +margin_top = 385.0 +margin_right = 720.0 +margin_bottom = 449.0 size_flags_horizontal = 2 size_flags_vertical = 2 color = Color( 0, 0, 0.178211, 1 ) script = ExtResource( 1 ) [node name="Label" type="Label" parent="."] -margin_left = 10.0 -margin_top = 11.0 -margin_right = 470.0 -margin_bottom = 24.0 +margin_left = 250.0 +margin_top = 140.0 +margin_right = 761.0 +margin_bottom = 154.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Drag colors from button to button, or change button colors and drag them again." - diff --git a/gui/drag_and_drop/icon.png.import b/gui/drag_and_drop/icon.png.import index 45ee6af7..96cbf462 100644 --- a/gui/drag_and_drop/icon.png.import +++ b/gui/drag_and_drop/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/gui/drag_and_drop/project.godot b/gui/drag_and_drop/project.godot index 63863e28..a8c2b7ce 100644 --- a/gui/drag_and_drop/project.godot +++ b/gui/drag_and_drop/project.godot @@ -19,6 +19,11 @@ config/name="Drag & Drop (GUI)" run/main_scene="res://drag_and_drop.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/gui/input_mapping/controls.gd b/gui/input_mapping/controls.gd index fc8314b6..fa6f89cf 100644 --- a/gui/input_mapping/controls.gd +++ b/gui/input_mapping/controls.gd @@ -99,6 +99,6 @@ func _ready(): var button = get_node("bindings").get_node(action).get_node("Button") button.text = OS.get_scancode_string(input_event.scancode) button.connect("pressed", self, "wait_for_input", [action]) - + # Do not start processing input until a button is pressed set_process_input(false) diff --git a/gui/input_mapping/controls.tscn b/gui/input_mapping/controls.tscn index 46d0929b..b3fdef14 100644 --- a/gui/input_mapping/controls.tscn +++ b/gui/input_mapping/controls.tscn @@ -3,31 +3,44 @@ [ext_resource path="res://controls.gd" type="Script" id=1] [node name="controls_ui" type="Control"] -margin_right = 40.0 -margin_bottom = 40.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -320.0 +margin_top = -240.0 +margin_right = 320.0 +margin_bottom = 240.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) __meta__ = { -"__editor_plugin_screen__": "2D" +"__editor_plugin_screen__": "2D", +"_edit_use_anchors_": false } [node name="contextual_help" type="Label" parent="."] -margin_left = 100.0 -margin_top = 50.0 -margin_right = 465.0 -margin_bottom = 89.0 +margin_left = 130.0 +margin_top = 100.0 +margin_right = 533.0 +margin_bottom = 139.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Click on a key binding to reassign it, or press the Cancel action." +__meta__ = { +"_edit_use_anchors_": false +} [node name="bindings" type="Control" parent="."] -margin_left = 50.0 -margin_top = 50.0 -margin_right = 90.0 -margin_bottom = 90.0 +margin_left = 80.0 +margin_top = 100.0 +margin_right = 120.0 +margin_bottom = 140.0 size_flags_horizontal = 2 size_flags_vertical = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="move_up" type="Control" parent="bindings"] margin_left = 50.0 @@ -55,7 +68,6 @@ size_flags_horizontal = 2 size_flags_vertical = 2 [node name="move_down" type="Control" parent="bindings"] -editor/display_folded = true margin_left = 50.0 margin_top = 100.0 margin_right = 90.0 @@ -81,7 +93,6 @@ size_flags_horizontal = 2 size_flags_vertical = 2 [node name="move_left" type="Control" parent="bindings"] -editor/display_folded = true margin_left = 50.0 margin_top = 150.0 margin_right = 90.0 @@ -107,7 +118,6 @@ size_flags_horizontal = 2 size_flags_vertical = 2 [node name="move_right" type="Control" parent="bindings"] -editor/display_folded = true margin_left = 50.0 margin_top = 200.0 margin_right = 90.0 @@ -133,7 +143,6 @@ size_flags_horizontal = 2 size_flags_vertical = 2 [node name="jump" type="Control" parent="bindings"] -editor/display_folded = true margin_left = 50.0 margin_top = 250.0 margin_right = 90.0 @@ -157,4 +166,3 @@ margin_right = 144.0 margin_bottom = 29.0 size_flags_horizontal = 2 size_flags_vertical = 2 - diff --git a/gui/input_mapping/icon.png.import b/gui/input_mapping/icon.png.import index 86f85d20..96cbf462 100644 --- a/gui/input_mapping/icon.png.import +++ b/gui/input_mapping/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="2e01548c24fa4b937105fc62dee25cb3" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="ceecd61fcffc0b649641832c508976b8" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/input_mapping/project.godot b/gui/input_mapping/project.godot index 336b8d7e..80709800 100644 --- a/gui/input_mapping/project.godot +++ b/gui/input_mapping/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=640 window/size/height=480 +window/stretch/mode="2d" +window/stretch/aspect="expand" [gdnative] diff --git a/gui/rich_text_bbcode/icon.png.import b/gui/rich_text_bbcode/icon.png.import index 855563bb..96cbf462 100644 --- a/gui/rich_text_bbcode/icon.png.import +++ b/gui/rich_text_bbcode/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="7308b25cf412df075856feeee943d2b4" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="02a47787cb375a9393c36defd733eca5" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/rich_text_bbcode/project.godot b/gui/rich_text_bbcode/project.godot index 596ae29c..bbb331cf 100644 --- a/gui/rich_text_bbcode/project.godot +++ b/gui/rich_text_bbcode/project.godot @@ -19,6 +19,11 @@ config/name="Rich Text Label (BBCode)" run/main_scene="res://rich_text_bbcode.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -26,3 +31,7 @@ singletons=[ ] [memory] multithread/thread_rid_pool_prealloc=60 + +[rendering] + +environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 ) diff --git a/gui/rich_text_bbcode/rich_text_bbcode.tscn b/gui/rich_text_bbcode/rich_text_bbcode.tscn index 129339c1..03db56ad 100644 --- a/gui/rich_text_bbcode/rich_text_bbcode.tscn +++ b/gui/rich_text_bbcode/rich_text_bbcode.tscn @@ -23,13 +23,20 @@ size = 20 font_data = ExtResource( 5 ) [node name="Panel" type="Panel"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -300.0 +margin_right = 512.0 +margin_bottom = 300.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) __meta__ = { -"__editor_plugin_screen__": "2D" +"__editor_plugin_screen__": "2D", +"_edit_use_anchors_": false } [node name="RichTextLabel" type="RichTextLabel" parent="."] @@ -49,22 +56,24 @@ bbcode_enabled = true bbcode_text = "[b][u]Rich Text Test[/u][/b] RichTextLabel is a flexible way of adding text to your game, with support for [i]italics[/i], [b]bold[/b] and [i][b]both[/b][/i]. [u]Underline[/u] works too. -It is also possible to include [img]res://unicorn_icon.png[/img] custom images, as well as [color=aqua][url=https://godotengine.org]Custom URLs[/url][/color]. +It is also possible to include [img]res://unicorn_icon.png[/img] custom images, as well as [color=aqua][url=https://godotengine.org]custom URLs[/url][/color]. Left alignment is default,[center]but center alignment is supported,[/center][right]as well as right alignment.[/right] -[fill]Fill alignment is also supported, and allows writing very long text that will end up fitting the horizontal space entirely with words of joy.[/fill] +[fill]Fill alignment is also supported, and allows writing very long text that will end up fitting the horizontal space entirely with words of joy.[/fill] -For full reference [color=aqua][url=https://docs.godotengine.org/en/latest/tutorials/gui/bbcode_in_richtextlabel.html]check the documentation.[/url][/color] +For full reference, [color=aqua][url=https://docs.godotengine.org/en/latest/tutorials/gui/bbcode_in_richtextlabel.html]check the documentation.[/url][/color] " text = "Rich Text Test RichTextLabel is a flexible way of adding text to your game, with support for italics, bold and both. Underline works too. -It is also possible to include custom images, as well as Custom URLs. +It is also possible to include custom images, as well as custom URLs. Left alignment is default,but center alignment is supported,as well as right alignment. -Fill alignment is also supported, and allows writing very long text that will end up fitting the horizontal space entirely with words of joy. +Fill alignment is also supported, and allows writing very long text that will end up fitting the horizontal space entirely with words of joy. -For full reference check the documentation. +For full reference, check the documentation. " - +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="meta_clicked" from="RichTextLabel" to="." method="_on_RichTextLabel_meta_clicked"] diff --git a/gui/rich_text_bbcode/unicorn_icon.png.import b/gui/rich_text_bbcode/unicorn_icon.png.import index 90e5f553..b33bb339 100644 --- a/gui/rich_text_bbcode/unicorn_icon.png.import +++ b/gui/rich_text_bbcode/unicorn_icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/unicorn_icon.png-7e6ed0493ce9bae1105057e782fcd0de.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://unicorn_icon.png" -source_md5="22f87e5cf3d8de3aae88c5af51032da0" - dest_files=[ "res://.import/unicorn_icon.png-7e6ed0493ce9bae1105057e782fcd0de.stex" ] -dest_md5="f10e3990ad10694cb7e392dc727a4ea7" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/flag_japan.png.import b/gui/translation/flag_japan.png.import index 0bd7a352..b0a17f8e 100644 --- a/gui/translation/flag_japan.png.import +++ b/gui/translation/flag_japan.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/flag_japan.png-e7284e6af3de26ab9c66cac9c4062038.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://flag_japan.png" -source_md5="9c0bec8a1e496f92954558a42a00119d" - dest_files=[ "res://.import/flag_japan.png-e7284e6af3de26ab9c66cac9c4062038.stex" ] -dest_md5="8d7183dc67f4e8ef7c8318ca56c0327a" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/flag_spain.png.import b/gui/translation/flag_spain.png.import index 5f209181..a154813d 100644 --- a/gui/translation/flag_spain.png.import +++ b/gui/translation/flag_spain.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/flag_spain.png-fd2012b4e19487cfc4923df0c268553f.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://flag_spain.png" -source_md5="ed47f2f75055c516f978a931a1c94bbd" - dest_files=[ "res://.import/flag_spain.png-fd2012b4e19487cfc4923df0c268553f.stex" ] -dest_md5="4bb283a20c83c753f70bd351d3c83a6a" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/flag_uk.png.import b/gui/translation/flag_uk.png.import index 1e42d47f..da63b1fa 100644 --- a/gui/translation/flag_uk.png.import +++ b/gui/translation/flag_uk.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/flag_uk.png-eb8a2b26ac36f4d0cf0d7345e577ec2c.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://flag_uk.png" -source_md5="e08b397a6aafd9113aa9c0600a53263b" - dest_files=[ "res://.import/flag_uk.png-eb8a2b26ac36f4d0cf0d7345e577ec2c.stex" ] -dest_md5="e4b3148288d20d8c3041d0b3cd8c3562" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/hello_en.wav.import b/gui/translation/hello_en.wav.import index 0bdee9e8..32d59081 100644 --- a/gui/translation/hello_en.wav.import +++ b/gui/translation/hello_en.wav.import @@ -7,10 +7,7 @@ path="res://.import/hello_en.wav-27ed59f2d75c1ba813ab0abd069b6758.sample" [deps] source_file="res://hello_en.wav" -source_md5="8a03a08650119bbd66417681a4f5aa5a" - dest_files=[ "res://.import/hello_en.wav-27ed59f2d75c1ba813ab0abd069b6758.sample" ] -dest_md5="55460bfdb1505a6c01d9f0ae69d71910" [params] diff --git a/gui/translation/hello_es.wav.import b/gui/translation/hello_es.wav.import index 22d9fa31..2d1236b8 100644 --- a/gui/translation/hello_es.wav.import +++ b/gui/translation/hello_es.wav.import @@ -7,10 +7,7 @@ path="res://.import/hello_es.wav-64fe245556f8642a1881ae257bd123f2.sample" [deps] source_file="res://hello_es.wav" -source_md5="4a0a73a1532d0c46f69e5336c550a431" - dest_files=[ "res://.import/hello_es.wav-64fe245556f8642a1881ae257bd123f2.sample" ] -dest_md5="601fc37baf5cf3356c7282e583185bcc" [params] diff --git a/gui/translation/hello_jp.wav.import b/gui/translation/hello_jp.wav.import index 2bd7cc2a..50dd285e 100644 --- a/gui/translation/hello_jp.wav.import +++ b/gui/translation/hello_jp.wav.import @@ -7,10 +7,7 @@ path="res://.import/hello_jp.wav-c31fbd7870b4b969789cb01f208809ac.sample" [deps] source_file="res://hello_jp.wav" -source_md5="60ed6a48deebb7a10da83adea9507693" - dest_files=[ "res://.import/hello_jp.wav-c31fbd7870b4b969789cb01f208809ac.sample" ] -dest_md5="3652492771540e443708cc455818d261" [params] diff --git a/gui/translation/icon.png.import b/gui/translation/icon.png.import index 662bf41f..96cbf462 100644 --- a/gui/translation/icon.png.import +++ b/gui/translation/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="53a00c1d20a2abda9a48e6c38c1f8558" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="44f27e8bb4c333990f2b6c9a422454af" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/main.tscn b/gui/translation/main.tscn index 3e56f8fe..867c5099 100644 --- a/gui/translation/main.tscn +++ b/gui/translation/main.tscn @@ -7,13 +7,20 @@ [ext_resource path="res://hello_en.wav" type="AudioStream" id=5] [node name="Panel" type="Panel"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -300.0 +margin_right = 512.0 +margin_bottom = 300.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) __meta__ = { -"__editor_plugin_screen__": "2D" +"__editor_plugin_screen__": "2D", +"_edit_use_anchors_": false } [node name="english" type="Button" parent="."] @@ -94,7 +101,6 @@ texture = ExtResource( 4 ) [node name="audio" type="AudioStreamPlayer" parent="."] stream = ExtResource( 5 ) - [connection signal="pressed" from="english" to="." method="_on_english_pressed"] [connection signal="pressed" from="spanish" to="." method="_on_spanish_pressed"] [connection signal="pressed" from="japanese" to="." method="_on_japanese_pressed"] diff --git a/gui/translation/project.godot b/gui/translation/project.godot index faf403d4..9b823e59 100644 --- a/gui/translation/project.godot +++ b/gui/translation/project.godot @@ -19,6 +19,11 @@ config/name="Translation Demo" run/main_scene="res://main.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -34,3 +39,7 @@ translations=PoolStringArray( "res://text.en.translation", "res://text.es.transl [memory] multithread/thread_rid_pool_prealloc=60 + +[rendering] + +environment/default_clear_color=Color( 0.145098, 0.145098, 0.164706, 1 ) diff --git a/gui/translation/speaker.png.import b/gui/translation/speaker.png.import index b37e79bc..c1199579 100644 --- a/gui/translation/speaker.png.import +++ b/gui/translation/speaker.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/speaker.png-045bf6684b83b55b088824f14e175d16.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://speaker.png" -source_md5="de26c4d8fbe4b16061ef1dcaedbb92fd" - dest_files=[ "res://.import/speaker.png-045bf6684b83b55b088824f14e175d16.stex" ] -dest_md5="1fe95898c91866243e523bac00082b5e" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/gui/translation/text.en.translation b/gui/translation/text.en.translation index cf4c90e0..4155236b 100644 Binary files a/gui/translation/text.en.translation and b/gui/translation/text.en.translation differ diff --git a/gui/translation/text.es.translation b/gui/translation/text.es.translation index 04d0495f..8fd4a768 100644 Binary files a/gui/translation/text.es.translation and b/gui/translation/text.es.translation differ diff --git a/gui/translation/text.ja.translation b/gui/translation/text.ja.translation index 0e6e4a22..c865b896 100644 Binary files a/gui/translation/text.ja.translation and b/gui/translation/text.ja.translation differ diff --git a/misc/android_iap/iap_demo.gd b/misc/android_iap/iap_demo.gd index 79e36d98..eeab2635 100644 --- a/misc/android_iap/iap_demo.gd +++ b/misc/android_iap/iap_demo.gd @@ -13,7 +13,7 @@ func _ready(): iap.connect("consume_success", self, "on_consume_success") iap.connect("consume_fail", self, "on_consume_fail") iap.connect("sku_details_complete", self, "on_sku_details_complete") - + get_node("purchase").connect("pressed", self, "button_purchase") get_node("consume").connect("pressed", self, "button_consume") get_node("request").connect("pressed", self, "button_request") diff --git a/misc/android_iap/icon.png.import b/misc/android_iap/icon.png.import index c04b9c90..96cbf462 100644 --- a/misc/android_iap/icon.png.import +++ b/misc/android_iap/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="86aa1d9e8afaf5ec9cabb7e89945c7a8" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="de268f1fefb026236e22a224989920b8" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/misc/android_iap/main.tscn b/misc/android_iap/main.tscn index a26ca61e..6632a338 100644 --- a/misc/android_iap/main.tscn +++ b/misc/android_iap/main.tscn @@ -3,11 +3,20 @@ [ext_resource path="res://iap_demo.gd" type="Script" id=1] [node name="Control" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -300.0 +margin_right = 512.0 +margin_bottom = 300.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="purchase" type="Button" parent="."] margin_left = 40.0 @@ -77,4 +86,3 @@ To test in-app purchase on android device, (It's not published to public, but you and tester can access it.) 3. There should be activated in-app item 4. Any changes on Developer console will take 2~3 hours to take effect" - diff --git a/misc/android_iap/project.godot b/misc/android_iap/project.godot index 6eb85467..b1615740 100644 --- a/misc/android_iap/project.godot +++ b/misc/android_iap/project.godot @@ -31,6 +31,11 @@ iap="*res://iap.gd" gdscript/warnings/return_value_discarded=false +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/misc/autoload/project.godot b/misc/autoload/project.godot index 0425c251..382b161f 100644 --- a/misc/autoload/project.godot +++ b/misc/autoload/project.godot @@ -22,6 +22,11 @@ run/main_scene="res://scene_a.tscn" global="res://global.gd" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/misc/background_load/background_load.gd b/misc/background_load/background_load.gd index a32233ca..0368ae0e 100644 --- a/misc/background_load/background_load.gd +++ b/misc/background_load/background_load.gd @@ -12,9 +12,9 @@ func _thread_load(path): var total = ril.get_stage_count() # Call deferred to configure max load steps progress.call_deferred("set_max", total) - + var res = null - + while true: #iterate until we have a resource # Update progress bar, use call deferred, which routes to main thread progress.call_deferred("set_value", ril.get_stage()) @@ -31,36 +31,36 @@ func _thread_load(path): # Not OK, there was an error print("There was an error loading") break - + # Send whathever we did (or not) get call_deferred("_thread_done", res) func _thread_done(resource): assert(resource) - + # Always wait for threads to finish, this is required on Windows thread.wait_to_finish() - + #Hide the progress bar progress.hide() - + # Instantiate new scene var new_scene = resource.instance() # Free current scene get_tree().current_scene.free() get_tree().current_scene = null # Add new one to root - get_tree().root.add_child(new_scene) + get_tree().root.add_child(new_scene) # Set as current scene get_tree().current_scene = new_scene - + progress.visible = false func load_scene(path): - + thread = Thread.new() thread.start( self, "_thread_load", path) raise() # show on top progress.visible = true - + diff --git a/misc/background_load/painting_babel.jpg.import b/misc/background_load/painting_babel.jpg.import index c6eff4b6..16c1f601 100644 --- a/misc/background_load/painting_babel.jpg.import +++ b/misc/background_load/painting_babel.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_babel.jpg-bb6b7c64c260f78ce43012bcac8a1c4e.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/painting_las_meninas.png.import b/misc/background_load/painting_las_meninas.png.import index 7125bfd4..b9ad9ae0 100644 --- a/misc/background_load/painting_las_meninas.png.import +++ b/misc/background_load/painting_las_meninas.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_las_meninas.png-158bef53fe63c53626df2020827ea75b.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/painting_mona_lisa.jpg.import b/misc/background_load/painting_mona_lisa.jpg.import index 10d0649b..acd7627d 100644 --- a/misc/background_load/painting_mona_lisa.jpg.import +++ b/misc/background_load/painting_mona_lisa.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_mona_lisa.jpg-cefdc64dfa49e9ee9566b078597cd552.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/painting_old_guitarist.jpg.import b/misc/background_load/painting_old_guitarist.jpg.import index 09689983..aa6bcdd0 100644 --- a/misc/background_load/painting_old_guitarist.jpg.import +++ b/misc/background_load/painting_old_guitarist.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_old_guitarist.jpg-f04ba627b38b0def60d96cb6c0bfa12b.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/painting_parasol.jpg.import b/misc/background_load/painting_parasol.jpg.import index ba8eed8d..817ef72e 100644 --- a/misc/background_load/painting_parasol.jpg.import +++ b/misc/background_load/painting_parasol.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_parasol.jpg-2864da595fcb4f0e842ba9c49097a056.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/painting_the_swing.jpg.import b/misc/background_load/painting_the_swing.jpg.import index 68b434ff..0e4080ce 100644 --- a/misc/background_load/painting_the_swing.jpg.import +++ b/misc/background_load/painting_the_swing.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/painting_the_swing.jpg-1303041ac03cbc85efa4b07ce56efbc4.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/paintings.gd b/misc/background_load/paintings.gd index 131ce225..4ce218db 100644 --- a/misc/background_load/paintings.gd +++ b/misc/background_load/paintings.gd @@ -1,5 +1,5 @@ extends Node2D func _on_switch_pressed(): - $switch.hide() + $CanvasLayer/switch.hide() background_load.load_scene("res://sculptures.tscn") diff --git a/misc/background_load/paintings.tscn b/misc/background_load/paintings.tscn index 9657e65e..73678153 100644 --- a/misc/background_load/paintings.tscn +++ b/misc/background_load/paintings.tscn @@ -194,11 +194,19 @@ texture = ExtResource( 7 ) autoplay = "move_around" anims/move_around = SubResource( 1 ) -[node name="switch" type="Button" parent="."] -margin_left = 6.0 -margin_top = 7.0 -margin_right = 152.0 -margin_bottom = 27.0 -text = "Switch to Sulptures" +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true -[connection signal="pressed" from="switch" to="." method="_on_switch_pressed"] +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="switch" type="Button" parent="CanvasLayer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 156.0 +margin_bottom = 30.0 +text = "Switch to Sculptures" +__meta__ = { +"_edit_use_anchors_": false +} +[connection signal="pressed" from="CanvasLayer/switch" to="." method="_on_switch_pressed"] diff --git a/misc/background_load/project.godot b/misc/background_load/project.godot index 3f7d75c5..b3454ad1 100644 --- a/misc/background_load/project.godot +++ b/misc/background_load/project.godot @@ -22,6 +22,11 @@ run/main_scene="res://paintings.tscn" background_load="*res://background_load.tscn" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [input] ui_accept={ diff --git a/misc/background_load/sculpture_david.jpg.import b/misc/background_load/sculpture_david.jpg.import index 569f0fab..d8b8c15f 100644 --- a/misc/background_load/sculpture_david.jpg.import +++ b/misc/background_load/sculpture_david.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_david.jpg-48aeb7cb164d32e6f17209e6764b659c.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculpture_fountain.jpg.import b/misc/background_load/sculpture_fountain.jpg.import index b82d83dd..4c9c582b 100644 --- a/misc/background_load/sculpture_fountain.jpg.import +++ b/misc/background_load/sculpture_fountain.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_fountain.jpg-dac3819d7eb39b78d36e9f6504d09bc6.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculpture_four_parts_of_earth.jpg.import b/misc/background_load/sculpture_four_parts_of_earth.jpg.import index c367608a..c7676864 100644 --- a/misc/background_load/sculpture_four_parts_of_earth.jpg.import +++ b/misc/background_load/sculpture_four_parts_of_earth.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_four_parts_of_earth.jpg-6d7b17284103f155af8220c6e7c0afb3.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculpture_lincoln.jpg.import b/misc/background_load/sculpture_lincoln.jpg.import index dc96cabc..c7496bd7 100644 --- a/misc/background_load/sculpture_lincoln.jpg.import +++ b/misc/background_load/sculpture_lincoln.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_lincoln.jpg-2309a3ef73573c72052204394b916eef.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculpture_thinker.jpg.import b/misc/background_load/sculpture_thinker.jpg.import index 29668918..d11cd226 100644 --- a/misc/background_load/sculpture_thinker.jpg.import +++ b/misc/background_load/sculpture_thinker.jpg.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_thinker.jpg-d13623267c5f848cecaa2bb8bb609f24.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculpture_venus.png.import b/misc/background_load/sculpture_venus.png.import index 210b6de7..eff7ffed 100644 --- a/misc/background_load/sculpture_venus.png.import +++ b/misc/background_load/sculpture_venus.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/sculpture_venus.png-ce0240c8ebb6a0aae05e92456d21d8f3.stex" +metadata={ +"vram_texture": false +} [deps] @@ -18,7 +21,7 @@ compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true diff --git a/misc/background_load/sculptures.gd b/misc/background_load/sculptures.gd index a15877bf..e0c0e121 100644 --- a/misc/background_load/sculptures.gd +++ b/misc/background_load/sculptures.gd @@ -1,5 +1,5 @@ extends Node2D func _on_switch_pressed(): - $switch.hide() + $CanvasLayer/switch.hide() background_load.load_scene("res://paintings.tscn") diff --git a/misc/background_load/sculptures.tscn b/misc/background_load/sculptures.tscn index 233e2a35..ceba0a30 100644 --- a/misc/background_load/sculptures.tscn +++ b/misc/background_load/sculptures.tscn @@ -122,11 +122,19 @@ texture = ExtResource( 7 ) autoplay = "colorcycle" anims/colorcycle = SubResource( 1 ) -[node name="switch" type="Button" parent="."] -margin_left = 5.0 -margin_top = 6.0 -margin_right = 137.0 -margin_bottom = 26.0 -text = "Switch to Paintings" +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true -[connection signal="pressed" from="switch" to="." method="_on_switch_pressed"] +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="switch" type="Button" parent="CanvasLayer"] +margin_left = 10.0 +margin_top = 10.0 +margin_right = 142.0 +margin_bottom = 30.0 +text = "Switch to Paintings" +__meta__ = { +"_edit_use_anchors_": false +} +[connection signal="pressed" from="CanvasLayer/switch" to="." method="_on_switch_pressed"] diff --git a/misc/instancing/container.tscn b/misc/instancing/container.tscn index d0953675..02fd6960 100644 --- a/misc/instancing/container.tscn +++ b/misc/instancing/container.tscn @@ -86,3 +86,7 @@ physics_material_override = SubResource( 9 ) [node name="ball 10" parent="." instance=ExtResource( 2 )] position = Vector2( 143.756, 295.139 ) physics_material_override = SubResource( 10 ) + +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 400, 300 ) +current = true diff --git a/misc/instancing/project.godot b/misc/instancing/project.godot index 47a09614..529eff2a 100644 --- a/misc/instancing/project.godot +++ b/misc/instancing/project.godot @@ -19,6 +19,12 @@ config/name="Scene Instancing Demo" run/main_scene="res://container.tscn" config/icon="res://icon.png" +[display] + +window/size/width=800 +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] @@ -26,3 +32,7 @@ singletons=[ ] [physics] 2d/default_gravity=300 + +[rendering] + +environment/default_clear_color=Color( 0.290196, 0.160784, 0.160784, 1 ) diff --git a/misc/joypads/diagram.png.import b/misc/joypads/diagram.png.import index fd638f80..87bcd3e8 100644 --- a/misc/joypads/diagram.png.import +++ b/misc/joypads/diagram.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/diagram.png-1621ff3c0b6dad34000ac99354b64701.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://diagram.png" -source_md5="bc20fa2375b14c17e86892fe7210e8bf" - dest_files=[ "res://.import/diagram.png-1621ff3c0b6dad34000ac99354b64701.stex" ] -dest_md5="b89deabdecbd4bf7df40baed08cb0aaa" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/misc/joypads/icon.png.import b/misc/joypads/icon.png.import index ff064f81..96cbf462 100644 --- a/misc/joypads/icon.png.import +++ b/misc/joypads/icon.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://icon.png" -source_md5="046afbd20c33eff2ded7513724d08a93" - dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] -dest_md5="9893e97a56e2f5e72cc18b6345b2e1b7" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/misc/joypads/indicators.png.import b/misc/joypads/indicators.png.import index 66cb15b8..bca15b1b 100644 --- a/misc/joypads/indicators.png.import +++ b/misc/joypads/indicators.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/indicators.png-b2d98522e44d4529354ba542a9970360.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://indicators.png" -source_md5="5a31443cd8b7034172883cd5e7da21a9" - dest_files=[ "res://.import/indicators.png-b2d98522e44d4529354ba542a9970360.stex" ] -dest_md5="5b7e33bf684419426842a3eee2108858" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/misc/joypads/joypads.gd b/misc/joypads/joypads.gd index bcf7b658..7b67ef53 100644 --- a/misc/joypads/joypads.gd +++ b/misc/joypads/joypads.gd @@ -1,4 +1,4 @@ -extends Node2D +extends Control # Joypads demo, written by Dana Olson # diff --git a/misc/joypads/joypads.tscn b/misc/joypads/joypads.tscn index 548faf9a..777511f0 100644 --- a/misc/joypads/joypads.tscn +++ b/misc/joypads/joypads.tscn @@ -3,16 +3,29 @@ [ext_resource path="res://joypads.gd" type="Script" id=1] [ext_resource path="res://jsdiagram.tscn" type="PackedScene" id=2] -[node name="joypads" type="Node2D"] +[node name="joypads" type="Control"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -270.0 +margin_top = -240.0 +margin_right = 270.0 +margin_bottom = 240.0 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="diagram" parent="." instance=ExtResource( 2 )] position = Vector2( 400, 200 ) [node name="device_info" type="Control" parent="."] -editor/display_folded = true margin_right = 40.0 margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_device" type="Label" parent="device_info"] margin_left = 10.0 @@ -23,6 +36,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Device" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="joy_num" type="SpinBox" parent="device_info"] margin_left = 65.0 @@ -32,6 +48,9 @@ margin_bottom = 34.0 size_flags_horizontal = 2 size_flags_vertical = 2 max_value = 16.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="joy_name" type="Label" parent="device_info"] margin_left = 10.0 @@ -41,11 +60,16 @@ margin_bottom = 50.0 size_flags_horizontal = 2 size_flags_vertical = 0 custom_colors/font_color = Color( 0.229156, 1, 0.239205, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="axes" type="Control" parent="."] -editor/display_folded = true margin_right = 40.0 margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog0" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -56,6 +80,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog1" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -66,6 +93,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog2" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -76,6 +106,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog3" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -86,6 +119,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog4" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -96,6 +132,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog5" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -106,6 +145,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog6" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -116,6 +158,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog7" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -126,6 +171,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog8" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -136,6 +184,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog9" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -146,6 +197,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_prog10" type="ProgressBar" parent="axes"] margin_left = 60.0 @@ -156,6 +210,9 @@ size_flags_horizontal = 2 min_value = -100.0 step = 0.0001 percent_visible = false +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val0" type="Label" parent="axes"] margin_left = 60.0 @@ -167,6 +224,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val1" type="Label" parent="axes"] margin_left = 60.0 @@ -178,6 +238,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val2" type="Label" parent="axes"] margin_left = 60.0 @@ -189,6 +252,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val3" type="Label" parent="axes"] margin_left = 60.0 @@ -200,6 +266,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val4" type="Label" parent="axes"] margin_left = 60.0 @@ -211,6 +280,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val5" type="Label" parent="axes"] margin_left = 60.0 @@ -222,6 +294,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val6" type="Label" parent="axes"] margin_left = 60.0 @@ -233,6 +308,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val7" type="Label" parent="axes"] margin_left = 60.0 @@ -244,6 +322,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val8" type="Label" parent="axes"] margin_left = 60.0 @@ -255,6 +336,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val9" type="Label" parent="axes"] margin_left = 60.0 @@ -266,6 +350,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="axis_val10" type="Label" parent="axes"] margin_left = 60.0 @@ -277,6 +364,9 @@ size_flags_vertical = 0 text = "0" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis0" type="Label" parent="axes"] margin_left = 10.0 @@ -287,6 +377,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 0" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis1" type="Label" parent="axes"] margin_left = 10.0 @@ -297,6 +390,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 1" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis2" type="Label" parent="axes"] margin_left = 10.0 @@ -307,6 +403,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 2" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis3" type="Label" parent="axes"] margin_left = 10.0 @@ -317,6 +416,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 3" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis4" type="Label" parent="axes"] margin_left = 10.0 @@ -327,6 +429,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 4" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis5" type="Label" parent="axes"] margin_left = 10.0 @@ -337,6 +442,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 5" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis6" type="Label" parent="axes"] margin_left = 10.0 @@ -347,6 +455,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 6" valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis7" type="Label" parent="axes"] margin_left = 10.0 @@ -357,6 +468,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 7" valign = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis8" type="Label" parent="axes"] margin_left = 10.0 @@ -367,6 +481,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 8" valign = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis9" type="Label" parent="axes"] margin_left = 10.0 @@ -377,6 +494,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 9" valign = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_axis10" type="Label" parent="axes"] margin_left = 10.0 @@ -387,11 +507,16 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "Axis 10" valign = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="buttons" type="Control" parent="."] -editor/display_folded = true margin_right = 40.0 margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="label_buttons" type="Label" parent="buttons"] margin_left = 10.0 @@ -401,6 +526,9 @@ margin_bottom = 304.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Buttons:" +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn0" type="Label" parent="buttons"] margin_left = 20.0 @@ -411,6 +539,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "0" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn1" type="Label" parent="buttons"] margin_left = 45.0 @@ -421,6 +552,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "1" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn2" type="Label" parent="buttons"] margin_left = 70.0 @@ -431,6 +565,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "2" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn3" type="Label" parent="buttons"] margin_left = 95.0 @@ -441,6 +578,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "3" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn4" type="Label" parent="buttons"] margin_left = 120.0 @@ -451,6 +591,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "4" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn5" type="Label" parent="buttons"] margin_left = 145.0 @@ -461,6 +604,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "5" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn6" type="Label" parent="buttons"] margin_left = 170.0 @@ -471,6 +617,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "6" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn7" type="Label" parent="buttons"] margin_left = 195.0 @@ -481,6 +630,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "7" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn8" type="Label" parent="buttons"] margin_left = 220.0 @@ -491,6 +643,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "8" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn9" type="Label" parent="buttons"] margin_left = 20.0 @@ -501,6 +656,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "9" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn10" type="Label" parent="buttons"] margin_left = 45.0 @@ -511,6 +669,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "10" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn11" type="Label" parent="buttons"] margin_left = 70.0 @@ -521,6 +682,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "11" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn12" type="Label" parent="buttons"] margin_left = 95.0 @@ -531,6 +695,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "12" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn13" type="Label" parent="buttons"] margin_left = 120.0 @@ -541,6 +708,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "13" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn14" type="Label" parent="buttons"] margin_left = 145.0 @@ -551,6 +721,9 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "14" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="btn15" type="Label" parent="buttons"] margin_left = 170.0 @@ -561,11 +734,16 @@ size_flags_horizontal = 2 size_flags_vertical = 0 text = "15" align = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="vibration" type="Control" parent="."] -editor/display_folded = true margin_right = 40.0 margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="weak_label" type="Label" parent="vibration"] margin_left = 10.0 @@ -575,6 +753,9 @@ margin_bottom = 389.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Vibration Weak Motor:" +__meta__ = { +"_edit_use_anchors_": false +} [node name="strong_label" type="Label" parent="vibration"] margin_left = 10.0 @@ -584,6 +765,9 @@ margin_bottom = 427.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Vibration Strong Motor:" +__meta__ = { +"_edit_use_anchors_": false +} [node name="duration_label" type="Label" parent="vibration"] margin_left = 10.0 @@ -593,6 +777,9 @@ margin_bottom = 468.0 size_flags_horizontal = 2 size_flags_vertical = 0 text = "Vibration Duration:" +__meta__ = { +"_edit_use_anchors_": false +} [node name="vibration_weak_value" type="SpinBox" parent="vibration"] margin_left = 165.0 @@ -604,6 +791,9 @@ size_flags_vertical = 2 max_value = 1.0 step = 0.05 value = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="vibration_strong_value" type="SpinBox" parent="vibration"] margin_left = 165.0 @@ -615,6 +805,9 @@ size_flags_vertical = 2 max_value = 1.0 step = 0.05 value = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="vibration_duration_value" type="SpinBox" parent="vibration"] margin_left = 165.0 @@ -626,6 +819,9 @@ size_flags_vertical = 2 max_value = 10.0 step = 0.1 value = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="start_vibration" type="Button" parent="vibration"] margin_left = 290.0 @@ -637,6 +833,9 @@ size_flags_horizontal = 2 size_flags_vertical = 2 enabled_focus_mode = 0 text = "Start Vibration" +__meta__ = { +"_edit_use_anchors_": false +} [node name="stop_vibration" type="Button" parent="vibration"] margin_left = 408.0 @@ -646,6 +845,8 @@ margin_bottom = 420.0 size_flags_horizontal = 2 size_flags_vertical = 2 text = "Stop Vibration" - +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="pressed" from="vibration/start_vibration" to="." method="_on_start_vibration_pressed"] [connection signal="pressed" from="vibration/stop_vibration" to="." method="_on_stop_vibration_pressed"] diff --git a/misc/joypads/jsdiagram.tscn b/misc/joypads/jsdiagram.tscn index 3ed32bdd..9c07238f 100644 --- a/misc/joypads/jsdiagram.tscn +++ b/misc/joypads/jsdiagram.tscn @@ -9,7 +9,6 @@ scale = Vector2( 0.432859, 0.446287 ) texture = ExtResource( 1 ) [node name="buttons" type="Node2D" parent="."] -editor/display_folded = true [node name="0" type="Sprite" parent="buttons"] position = Vector2( 147.73, 120.925 ) @@ -187,4 +186,3 @@ texture = ExtResource( 2 ) flip_v = true region_enabled = true region_rect = Rect2( 50, 0, 54, 14 ) - diff --git a/misc/joypads/project.godot b/misc/joypads/project.godot index 9957ec6e..082f7cb1 100644 --- a/misc/joypads/project.godot +++ b/misc/joypads/project.godot @@ -25,8 +25,10 @@ gdscript/warnings/return_value_discarded=false [display] -window/size/width=540 -window/size/height=480 +window/size/width=600 +window/size/height=540 +window/stretch/mode="2d" +window/stretch/aspect="expand" [gdnative] diff --git a/misc/multitouch_cubes/icon.png.import b/misc/multitouch_cubes/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/multitouch_cubes/icon.png.import +++ b/misc/multitouch_cubes/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/opensimplexnoise/OpenSimplexNoise_Viewer.gd b/misc/opensimplexnoise/OpenSimplexNoise_Viewer.gd index 48ccb88d..6e87c7b2 100644 --- a/misc/opensimplexnoise/OpenSimplexNoise_Viewer.gd +++ b/misc/opensimplexnoise/OpenSimplexNoise_Viewer.gd @@ -15,94 +15,94 @@ const use_noise_texture = false # Called when the node enters the scene tree for the first time. func _ready(): - + #Set up noise with basic info $ParameterContainer/SeedSpinBox.value = noise.seed $ParameterContainer/LacunaritySpinBox.value = noise.lacunarity $ParameterContainer/OctavesSpinBox.value = noise.octaves $ParameterContainer/PeriodSpinBox.value = noise.period $ParameterContainer/PersistenceSpinBox.value = noise.persistence - + #Render the noise _refresh_noise_images() - + #Do we need to set up a noise texture? if use_noise_texture: noise_texture.noise = noise $SeamlessNoiseTexture.texture = noise_texture - + func _refresh_noise_images(): - + #Adjust min/max for shader var _min = ((min_noise + 1)/2) var _max = ((max_noise + 1)/2) var _material = $SeamlessNoiseTexture.material _material.set_shader_param("min_value", _min) _material.set_shader_param("max_value", _max) - + #Are we using noise textures instead? if use_noise_texture: return - + #Get a new image if we aren't using a NoiseTexture var image = noise.get_seamless_image(500) var image_texture = ImageTexture.new() - + #Draw it image_texture.create_from_image(image) $SeamlessNoiseTexture.texture = image_texture - + func _on_DocumentationButton_pressed(): OS.shell_open("https://docs.godotengine.org/en/latest/classes/class_opensimplexnoise.html") - + func _on_SeedSpinBox_value_changed(value): - + #Update the noise seed noise.seed = value _refresh_noise_images() - + func _on_LacunaritySpinBox_value_changed(value): - + #Update noise noise.lacunarity = value _refresh_noise_images() - + func _on_OctavesSpinBox_value_changed(value): - + #Update noise noise.octaves = value _refresh_noise_images() - + func _on_PeriodSpinBox_value_changed(value): - + #Update noise noise.period = value _refresh_noise_images() - + func _on_PersistenceSpinBox_value_changed(value): - + #Update noise noise.persistence = value _refresh_noise_images() - + func _on_MinClipSpinBox_value_changed(value): - + #Just refresh min_noise = value _refresh_noise_images() - + func _on_MaxClipSpinBox_value_changed(value): - + #Just refresh max_noise = value _refresh_noise_images() - + diff --git a/misc/opensimplexnoise/OpenSimplexNoise_Viewer.tscn b/misc/opensimplexnoise/OpenSimplexNoise_Viewer.tscn index a77aef39..6122f327 100644 --- a/misc/opensimplexnoise/OpenSimplexNoise_Viewer.tscn +++ b/misc/opensimplexnoise/OpenSimplexNoise_Viewer.tscn @@ -11,14 +11,22 @@ margin_top = -5.26315 margin_right = 8.42114 margin_bottom = -5.26318 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="DocumentationButton" type="Button" parent="."] anchor_left = 1.0 anchor_right = 1.0 -margin_top = 20.0 -margin_right = -20.0 +margin_left = -170.0 +margin_top = 30.0 +margin_right = -33.0 +margin_bottom = 50.0 grow_horizontal = 0 text = "API Documentation" +__meta__ = { +"_edit_use_anchors_": false +} [node name="SeamlessNoiseTexture" type="TextureRect" parent="."] material = ExtResource( 2 ) @@ -26,25 +34,30 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = 30.0 +margin_left = 40.0 margin_top = -20.0 -margin_right = 70.0 +margin_right = 80.0 margin_bottom = 20.0 grow_horizontal = 2 grow_vertical = 2 +__meta__ = { +"_edit_use_anchors_": false +} [node name="ParameterContainer" type="VBoxContainer" parent="."] -editor/display_folded = true margin_left = 20.0 -margin_top = 20.0 +margin_top = 30.0 margin_right = 300.0 -margin_bottom = 40.0 +margin_bottom = 166.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="SeedSpinBox" type="SpinBox" parent="ParameterContainer"] margin_right = 280.0 margin_bottom = 24.0 -min_value = -1.53049e+009 -max_value = 1.53049e+009 +min_value = -1.53049e+09 +max_value = 1.53049e+09 rounded = true allow_greater = true allow_lesser = true @@ -54,7 +67,7 @@ prefix = "Seed:" margin_top = 28.0 margin_right = 280.0 margin_bottom = 52.0 -max_value = 1e+008 +max_value = 1e+08 step = 0.01 allow_greater = true prefix = "Lacunarity:" @@ -63,8 +76,8 @@ prefix = "Lacunarity:" margin_top = 56.0 margin_right = 280.0 margin_bottom = 80.0 -min_value = -1e+008 -max_value = 1e+008 +min_value = -1e+08 +max_value = 1e+08 step = 0.01 allow_greater = true prefix = "Period:" @@ -73,7 +86,7 @@ prefix = "Period:" margin_top = 84.0 margin_right = 280.0 margin_bottom = 108.0 -max_value = 1e+008 +max_value = 1e+08 step = 0.01 allow_greater = true prefix = "Persistance:" diff --git a/misc/opensimplexnoise/project.godot b/misc/opensimplexnoise/project.godot index fbcd2305..e158a1cb 100644 --- a/misc/opensimplexnoise/project.godot +++ b/misc/opensimplexnoise/project.godot @@ -19,6 +19,11 @@ config/name="OpenSimplexNoise Viewer" run/main_scene="res://OpenSimplexNoise_Viewer.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [rendering] quality/driver/driver_name="GLES2" diff --git a/misc/pause/icon.png.import b/misc/pause/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/pause/icon.png.import +++ b/misc/pause/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/pause/project.godot b/misc/pause/project.godot index 13af4676..aab8c08d 100644 --- a/misc/pause/project.godot +++ b/misc/pause/project.godot @@ -19,6 +19,15 @@ config/name="Pause" run/main_scene="res://spinpause.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] + +[rendering] + +quality/filters/msaa=2 diff --git a/misc/regex/icon.png.import b/misc/regex/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/regex/icon.png.import +++ b/misc/regex/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/regex/project.godot b/misc/regex/project.godot index aeaf00e7..a36068d3 100644 --- a/misc/regex/project.godot +++ b/misc/regex/project.godot @@ -19,6 +19,11 @@ config/name="RegEx" run/main_scene="res://regex.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/misc/regex/regex.tscn b/misc/regex/regex.tscn index b01677dc..58d9c5be 100644 --- a/misc/regex/regex.tscn +++ b/misc/regex/regex.tscn @@ -5,24 +5,29 @@ [node name="VBoxContainer" type="VBoxContainer"] anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = 14.0 +margin_top = 20.0 +margin_right = -14.0 +margin_bottom = -20.0 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="Expression" type="LineEdit" parent="."] -margin_right = 1024.0 +margin_right = 996.0 margin_bottom = 24.0 text = "\"((?:\\\\.|[^\"])*)\"" [node name="Text" type="TextEdit" parent="."] margin_top = 28.0 -margin_right = 1024.0 +margin_right = 996.0 margin_bottom = 328.0 rect_min_size = Vector2( 0, 300 ) -mouse_default_cursor_shape = 0 [node name="List" type="VBoxContainer" parent="."] margin_top = 332.0 -margin_right = 1024.0 +margin_right = 996.0 margin_bottom = 332.0 - [connection signal="text_changed" from="Expression" to="." method="update_expression"] [connection signal="text_changed" from="Text" to="." method="update_text"] diff --git a/misc/scene_changer/project.godot b/misc/scene_changer/project.godot index 7f5648cb..7554e8c7 100644 --- a/misc/scene_changer/project.godot +++ b/misc/scene_changer/project.godot @@ -22,6 +22,11 @@ run/main_scene="res://scene_a.tscn" gdscript/warnings/return_value_discarded=false +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/misc/scene_changer/scene_a.tscn b/misc/scene_changer/scene_a.tscn index 1a60fa3e..7389db8f 100644 --- a/misc/scene_changer/scene_a.tscn +++ b/misc/scene_changer/scene_a.tscn @@ -8,6 +8,9 @@ anchor_bottom = 1.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="label" type="Label" parent="."] margin_left = 64.0 @@ -25,5 +28,4 @@ margin_bottom = 160.0 size_flags_horizontal = 2 size_flags_vertical = 2 text = "Go to Scene B" - [connection signal="pressed" from="goto_scene" to="." method="_on_goto_scene_pressed"] diff --git a/misc/threads/mona.png.import b/misc/threads/mona.png.import index e3877121..db2c6625 100644 --- a/misc/threads/mona.png.import +++ b/misc/threads/mona.png.import @@ -3,20 +3,21 @@ importer="texture" type="StreamTexture" path="res://.import/mona.png-a5ce9963ac8c7ef765aeb0f5428366a9.stex" +metadata={ +"vram_texture": false +} [deps] source_file="res://mona.png" -source_md5="322f77c3c7a57eec5c262ca7939d8e7d" - dest_files=[ "res://.import/mona.png-a5ce9963ac8c7ef765aeb0f5428366a9.stex" ] -dest_md5="a7cbd29df4074aa0e6aee6f38442e987" [params] compress/mode=0 compress/lossy_quality=0.7 compress/hdr_mode=0 +compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 flags/filter=true @@ -26,6 +27,7 @@ flags/srgb=2 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false +process/invert_color=false stream=false size_limit=0 detect_3d=true diff --git a/misc/threads/project.godot b/misc/threads/project.godot index 5918c41c..cf31ebf3 100644 --- a/misc/threads/project.godot +++ b/misc/threads/project.godot @@ -18,6 +18,11 @@ _global_script_class_icons={ config/name="Loading in a Thread" run/main_scene="res://thread.tscn" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/misc/threads/thread.tscn b/misc/threads/thread.tscn index f749beac..f36c6df5 100644 --- a/misc/threads/thread.tscn +++ b/misc/threads/thread.tscn @@ -6,15 +6,21 @@ script = ExtResource( 1 ) [node name="load" type="Button" parent="."] -margin_left = 192.0 -margin_top = 32.0 -margin_right = 320.0 -margin_bottom = 64.0 +margin_left = 432.0 +margin_top = 82.0 +margin_right = 560.0 +margin_bottom = 114.0 size_flags_horizontal = 2 size_flags_vertical = 2 text = "Load in Thread" +__meta__ = { +"_edit_use_anchors_": false +} [node name="sprite" type="Sprite" parent="."] -position = Vector2( 248, 256 ) +position = Vector2( 494, 336 ) +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true [connection signal="pressed" from="load" to="." method="_on_load_pressed"] diff --git a/misc/tween/godot.png.import b/misc/tween/godot.png.import index 288f7fe8..ca7237f1 100644 --- a/misc/tween/godot.png.import +++ b/misc/tween/godot.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/godot.png-5e0da45ed3d6786d5794553e04f58a8c.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/tween/icon.png.import b/misc/tween/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/tween/icon.png.import +++ b/misc/tween/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/tween/main.tscn b/misc/tween/main.tscn index ac0e2187..f6f4e6da 100644 --- a/misc/tween/main.tscn +++ b/misc/tween/main.tscn @@ -4,14 +4,22 @@ [ext_resource path="res://godot.png" type="Texture" id=2] [node name="main" type="Control"] -margin_right = 800.0 -margin_bottom = 600.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -512.0 +margin_top = -384.0 +margin_right = 512.0 +margin_bottom = 384.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="trans" type="VBoxContainer" parent="."] -editor/display_folded = true margin_left = 56.0 margin_top = 288.0 margin_right = 129.0 @@ -118,7 +126,6 @@ toggle_mode = true text = "back" [node name="eases" type="VBoxContainer" parent="."] -editor/display_folded = true margin_left = 152.0 margin_top = 288.0 margin_right = 215.0 @@ -162,7 +169,6 @@ toggle_mode = true text = "out_in" [node name="modes" type="VBoxContainer" parent="."] -editor/display_folded = true margin_left = 240.0 margin_top = 288.0 margin_right = 317.0 @@ -243,15 +249,18 @@ text = "pause" [node name="colors" type="HBoxContainer" parent="."] margin_left = 352.0 -margin_top = 288.0 -margin_right = 858.0 -margin_bottom = 626.0 +margin_top = 273.0 +margin_right = 1008.0 +margin_bottom = 753.0 size_flags_horizontal = 2 size_flags_vertical = 2 custom_constants/separation = 40 +__meta__ = { +"_edit_use_anchors_": false +} [node name="color_from" type="VBoxContainer" parent="colors"] -margin_right = 290.0 +margin_right = 308.0 margin_bottom = 480.0 rect_min_size = Vector2( 0, 320 ) size_flags_horizontal = 2 @@ -266,15 +275,15 @@ text = "Color From:" [node name="picker" type="ColorPicker" parent="colors/color_from"] margin_top = 18.0 -margin_right = 290.0 +margin_right = 308.0 margin_bottom = 480.0 rect_min_size = Vector2( 0, 320 ) size_flags_horizontal = 2 size_flags_vertical = 2 [node name="color_to" type="VBoxContainer" parent="colors"] -margin_left = 330.0 -margin_right = 620.0 +margin_left = 348.0 +margin_right = 656.0 margin_bottom = 480.0 rect_min_size = Vector2( 0, 320 ) size_flags_horizontal = 2 @@ -289,7 +298,7 @@ text = "Color To:" [node name="picker" type="ColorPicker" parent="colors/color_to"] margin_top = 18.0 -margin_right = 290.0 +margin_right = 308.0 margin_bottom = 480.0 rect_min_size = Vector2( 0, 320 ) size_flags_horizontal = 2 @@ -300,10 +309,14 @@ repeat = true playback/repeat = true [node name="area" type="Panel" parent="tween"] -margin_left = 32.0 -margin_top = 32.0 -margin_right = 896.0 -margin_bottom = 232.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -420.0 +margin_top = -352.0 +margin_right = 444.0 +margin_bottom = -152.0 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -327,12 +340,18 @@ position = Vector2( 736, 0 ) texture = ExtResource( 2 ) [node name="timeline" type="HSlider" parent="."] -margin_left = 48.0 -margin_top = 240.0 -margin_right = 880.0 -margin_bottom = 256.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -416.0 +margin_top = -144.0 +margin_right = 416.0 +margin_bottom = -128.0 size_flags_horizontal = 2 value = 1.0 - +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="tween_step" from="tween" to="." method="_on_tween_step"] [connection signal="value_changed" from="timeline" to="." method="_on_timeline_value_changed"] diff --git a/misc/tween/project.godot b/misc/tween/project.godot index b7310804..d7df53bc 100644 --- a/misc/tween/project.godot +++ b/misc/tween/project.godot @@ -27,6 +27,8 @@ gdscript/warnings/return_value_discarded=false [display] window/size/height=768 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch/aspect="keep_width" stretch/mode="2d" @@ -37,3 +39,7 @@ singletons=[ ] [memory] multithread/thread_rid_pool_prealloc=60 + +[rendering] + +environment/default_clear_color=Color( 0.2349, 0.2349, 0.27, 1 ) diff --git a/misc/window_management/icon.png.import b/misc/window_management/icon.png.import index 45ee6af7..96cbf462 100644 --- a/misc/window_management/icon.png.import +++ b/misc/window_management/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/misc/window_management/project.godot b/misc/window_management/project.godot index 5036207e..dd6296be 100644 --- a/misc/window_management/project.godot +++ b/misc/window_management/project.godot @@ -22,6 +22,8 @@ config/icon="res://icon.png" [display] window/size/width=800 +window/stretch/mode="2d" +window/stretch/aspect="expand" window/fullscreen=false window/resizable=true diff --git a/misc/window_management/window_management.tscn b/misc/window_management/window_management.tscn index 1f883f10..75819531 100644 --- a/misc/window_management/window_management.tscn +++ b/misc/window_management/window_management.tscn @@ -346,7 +346,6 @@ across platforms. Your platform lacks at the moment the following methods: " - [connection signal="pressed" from="Control/Button_Fullscreen" to="Control" method="_on_Button_Fullscreen_pressed"] [connection signal="pressed" from="Control/Button_FixedSize" to="Control" method="_on_Button_FixedSize_pressed"] [connection signal="pressed" from="Control/Button_Minimized" to="Control" method="_on_Button_Minimized_pressed"] diff --git a/networking/multiplayer_bomber/brickfloor.png.import b/networking/multiplayer_bomber/brickfloor.png.import index a4897e66..04f146ff 100644 --- a/networking/multiplayer_bomber/brickfloor.png.import +++ b/networking/multiplayer_bomber/brickfloor.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/brickfloor.png-bab1cbace80ab627972eea565951db9e.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/networking/multiplayer_bomber/charwalk.png.import b/networking/multiplayer_bomber/charwalk.png.import index 43756e6e..8a829b03 100644 --- a/networking/multiplayer_bomber/charwalk.png.import +++ b/networking/multiplayer_bomber/charwalk.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/charwalk.png-a9f067962a6454cc2f52a6e82832cbc5.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/networking/multiplayer_bomber/explosion.png.import b/networking/multiplayer_bomber/explosion.png.import index 6e8c5f0e..b5f186fc 100644 --- a/networking/multiplayer_bomber/explosion.png.import +++ b/networking/multiplayer_bomber/explosion.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/explosion.png-730076d88b39dbfd5c22ad71f1135b01.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/networking/multiplayer_bomber/lobby.tscn b/networking/multiplayer_bomber/lobby.tscn index 23f50174..cfb2bce7 100644 --- a/networking/multiplayer_bomber/lobby.tscn +++ b/networking/multiplayer_bomber/lobby.tscn @@ -8,13 +8,20 @@ anchor_bottom = 1.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="players" type="Panel" parent="."] visible = false -margin_left = 393.0 -margin_top = 113.0 -margin_right = 645.0 -margin_bottom = 468.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -126.0 +margin_top = -177.5 +margin_right = 126.0 +margin_bottom = 177.5 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -45,10 +52,14 @@ size_flags_horizontal = 2 size_flags_vertical = 2 [node name="connect" type="Panel" parent="."] -margin_left = 370.0 -margin_top = 157.0 -margin_right = 647.0 -margin_bottom = 324.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -138.5 +margin_top = -83.5 +margin_right = 138.5 +margin_bottom = 83.5 size_flags_horizontal = 2 size_flags_vertical = 2 @@ -121,7 +132,6 @@ margin_right = 55.0 margin_bottom = 58.0 size_flags_horizontal = 2 size_flags_vertical = 2 - [connection signal="pressed" from="players/start" to="." method="_on_start_pressed"] [connection signal="pressed" from="connect/host" to="." method="_on_host_pressed"] [connection signal="pressed" from="connect/join" to="." method="_on_join_pressed"] diff --git a/networking/multiplayer_bomber/project.godot b/networking/multiplayer_bomber/project.godot index 2502b607..65317ce5 100644 --- a/networking/multiplayer_bomber/project.godot +++ b/networking/multiplayer_bomber/project.godot @@ -26,6 +26,12 @@ gamestate="*res://gamestate.gd" gdscript/warnings/return_value_discarded=false +[display] + +window/vsync/use_vsync=false +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/networking/multiplayer_bomber/rock_bit.png.import b/networking/multiplayer_bomber/rock_bit.png.import index 1fbebcad..be7c7914 100644 --- a/networking/multiplayer_bomber/rock_bit.png.import +++ b/networking/multiplayer_bomber/rock_bit.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/rock_bit.png-cd30ec3dce7edf848ee632b29d4d0c95.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/networking/multiplayer_bomber/tile_scene.tscn b/networking/multiplayer_bomber/tile_scene.tscn index 3e389213..9c7d10bc 100644 --- a/networking/multiplayer_bomber/tile_scene.tscn +++ b/networking/multiplayer_bomber/tile_scene.tscn @@ -21,4 +21,3 @@ shape = SubResource( 1 ) position = Vector2( 72, 24 ) texture = ExtResource( 1 ) region_rect = Rect2( 48, 0, 48, 48 ) - diff --git a/networking/multiplayer_bomber/world.tscn b/networking/multiplayer_bomber/world.tscn index 77aaba1a..31d805d6 100644 --- a/networking/multiplayer_bomber/world.tscn +++ b/networking/multiplayer_bomber/world.tscn @@ -15,13 +15,12 @@ font_data = ExtResource( 4 ) tile_set = ExtResource( 1 ) cell_size = Vector2( 48, 48 ) format = 1 -tile_data = PoolIntArray( 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 65536, 0, 0, 65537, 1, 0, 65538, 1, 0, 65539, 1, 0, 65540, 1, 0, 65541, 1, 0, 65542, 1, 0, 65543, 1, 0, 65544, 1, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 65551, 1, 0, 65552, 1, 0, 65553, 1, 0, 65554, 1, 0, 65555, 1, 0, 65556, 0, 0, 65557, 0, 0, 131072, 0, 0, 131073, 1, 0, 131074, 0, 0, 131075, 1, 0, 131076, 0, 0, 131077, 1, 0, 131078, 0, 0, 131079, 1, 0, 131080, 0, 0, 131081, 1, 0, 131082, 0, 0, 131083, 0, 0, 131084, 0, 0, 131085, 0, 0, 131086, 0, 0, 131087, 1, 0, 131088, 0, 0, 131089, 1, 0, 131090, 0, 0, 131091, 1, 0, 131092, 0, 0, 131093, 0, 0, 196608, 0, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 0, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 0, 0, 196619, 1, 0, 196620, 1, 0, 196621, 1, 0, 196622, 1, 0, 196623, 1, 0, 196624, 1, 0, 196625, 1, 0, 196626, 1, 0, 196627, 1, 0, 196628, 0, 0, 196629, 0, 0, 262144, 0, 0, 262145, 1, 0, 262146, 0, 0, 262147, 1, 0, 262148, 0, 0, 262149, 1, 0, 262150, 0, 0, 262151, 1, 0, 262152, 0, 0, 262153, 1, 0, 262154, 0, 0, 262155, 1, 0, 262156, 0, 0, 262157, 1, 0, 262158, 0, 0, 262159, 1, 0, 262160, 0, 0, 262161, 1, 0, 262162, 0, 0, 262163, 1, 0, 262164, 0, 0, 262165, 0, 0, 327680, 0, 0, 327681, 1, 0, 327682, 1, 0, 327683, 1, 0, 327684, 1, 0, 327685, 1, 0, 327686, 0, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 327691, 1, 0, 327692, 1, 0, 327693, 1, 0, 327694, 1, 0, 327695, 1, 0, 327696, 1, 0, 327697, 1, 0, 327698, 0, 0, 327699, 1, 0, 327700, 0, 0, 327701, 0, 0, 393216, 0, 0, 393217, 1, 0, 393218, 0, 0, 393219, 1, 0, 393220, 0, 0, 393221, 1, 0, 393222, 0, 0, 393223, 1, 0, 393224, 0, 0, 393225, 1, 0, 393226, 0, 0, 393227, 1, 0, 393228, 0, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 393232, 0, 0, 393233, 1, 0, 393234, 0, 0, 393235, 1, 0, 393236, 0, 0, 393237, 0, 0, 458752, 0, 0, 458753, 1, 0, 458754, 1, 0, 458755, 1, 0, 458756, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 458763, 1, 0, 458764, 1, 0, 458765, 1, 0, 458766, 1, 0, 458767, 1, 0, 458768, 1, 0, 458769, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 0, 0, 458773, 0, 0, 524288, 0, 0, 524289, 1, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 1, 0, 524294, 0, 0, 524295, 1, 0, 524296, 0, 0, 524297, 1, 0, 524298, 0, 0, 524299, 1, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 1, 0, 524304, 0, 0, 524305, 1, 0, 524306, 0, 0, 524307, 1, 0, 524308, 0, 0, 524309, 0, 0, 589824, 0, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589832, 0, 0, 589833, 1, 0, 589834, 1, 0, 589835, 1, 0, 589836, 0, 0, 589837, 1, 0, 589838, 1, 0, 589839, 1, 0, 589840, 1, 0, 589841, 1, 0, 589842, 1, 0, 589843, 1, 0, 589844, 0, 0, 589845, 0, 0, 655360, 0, 0, 655361, 1, 0, 655362, 0, 0, 655363, 1, 0, 655364, 0, 0, 655365, 1, 0, 655366, 0, 0, 655367, 1, 0, 655368, 0, 0, 655369, 1, 0, 655370, 0, 0, 655371, 1, 0, 655372, 0, 0, 655373, 1, 0, 655374, 0, 0, 655375, 1, 0, 655376, 0, 0, 655377, 1, 0, 655378, 0, 0, 655379, 1, 0, 655380, 0, 0, 655381, 0, 0, 720896, 0, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 0, 0, 720917, 0, 0, 786432, 0, 0, 786433, 0, 0, 786434, 0, 0, 786435, 0, 0, 786436, 0, 0, 786437, 0, 0, 786438, 0, 0, 786439, 0, 0, 786440, 0, 0, 786441, 0, 0, 786442, 0, 0, 786443, 0, 0, 786444, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786448, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 786452, 0, 0, 786453, 0, 0 ) +tile_data = PoolIntArray( -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -589809, 0, 0, -589808, 0, 0, -589807, 0, 0, -589806, 0, 0, -589805, 0, 0, -589804, 0, 0, -589803, 0, 0, -589802, 0, 0, -589801, 0, 0, -589800, 0, 0, -589799, 0, 0, -589798, 0, 0, -589797, 0, 0, -589796, 0, 0, -589795, 0, 0, -589794, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -524273, 0, 0, -524272, 0, 0, -524271, 0, 0, -524270, 0, 0, -524269, 0, 0, -524268, 0, 0, -524267, 0, 0, -524266, 0, 0, -524265, 0, 0, -524264, 0, 0, -524263, 0, 0, -524262, 0, 0, -524261, 0, 0, -524260, 0, 0, -524259, 0, 0, -524258, 0, 0, -393225, 0, 0, -393224, 0, 0, -393223, 0, 0, -393222, 0, 0, -393221, 0, 0, -393220, 0, 0, -393219, 0, 0, -393218, 0, 0, -393217, 0, 0, -458752, 0, 0, -458751, 0, 0, -458750, 0, 0, -458749, 0, 0, -458748, 0, 0, -458747, 0, 0, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -458737, 0, 0, -458736, 0, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0, -458730, 0, 0, -458729, 0, 0, -458728, 0, 0, -458727, 0, 0, -458726, 0, 0, -458725, 0, 0, -458724, 0, 0, -458723, 0, 0, -458722, 0, 0, -327689, 0, 0, -327688, 0, 0, -327687, 0, 0, -327686, 0, 0, -327685, 0, 0, -327684, 0, 0, -327683, 0, 0, -327682, 0, 0, -327681, 0, 0, -393216, 0, 0, -393215, 0, 0, -393214, 0, 0, -393213, 0, 0, -393212, 0, 0, -393211, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0, -393201, 0, 0, -393200, 0, 0, -393199, 0, 0, -393198, 0, 0, -393197, 0, 0, -393196, 0, 0, -393195, 0, 0, -393194, 0, 0, -393193, 0, 0, -393192, 0, 0, -393191, 0, 0, -393190, 0, 0, -393189, 0, 0, -393188, 0, 0, -393187, 0, 0, -393186, 0, 0, -262153, 0, 0, -262152, 0, 0, -262151, 0, 0, -262150, 0, 0, -262149, 0, 0, -262148, 0, 0, -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, 0, 0, -327679, 0, 0, -327678, 0, 0, -327677, 0, 0, -327676, 0, 0, -327675, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -327666, 0, 0, -327665, 0, 0, -327664, 0, 0, -327663, 0, 0, -327662, 0, 0, -327661, 0, 0, -327660, 0, 0, -327659, 0, 0, -327658, 0, 0, -327657, 0, 0, -327656, 0, 0, -327655, 0, 0, -327654, 0, 0, -327653, 0, 0, -327652, 0, 0, -327651, 0, 0, -327650, 0, 0, -196617, 0, 0, -196616, 0, 0, -196615, 0, 0, -196614, 0, 0, -196613, 0, 0, -196612, 0, 0, -196611, 0, 0, -196610, 0, 0, -196609, 0, 0, -262144, 0, 0, -262143, 0, 0, -262142, 0, 0, -262141, 0, 0, -262140, 0, 0, -262139, 0, 0, -262138, 0, 0, -262137, 0, 0, -262136, 0, 0, -262135, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -262130, 0, 0, -262129, 0, 0, -262128, 0, 0, -262127, 0, 0, -262126, 0, 0, -262125, 0, 0, -262124, 0, 0, -262123, 0, 0, -262122, 0, 0, -262121, 0, 0, -262120, 0, 0, -262119, 0, 0, -262118, 0, 0, -262117, 0, 0, -262116, 0, 0, -262115, 0, 0, -262114, 0, 0, -131081, 0, 0, -131080, 0, 0, -131079, 0, 0, -131078, 0, 0, -131077, 0, 0, -131076, 0, 0, -131075, 0, 0, -131074, 0, 0, -131073, 0, 0, -196608, 0, 0, -196607, 0, 0, -196606, 0, 0, -196605, 0, 0, -196604, 0, 0, -196603, 0, 0, -196602, 0, 0, -196601, 0, 0, -196600, 0, 0, -196599, 0, 0, -196598, 0, 0, -196597, 0, 0, -196596, 0, 0, -196595, 0, 0, -196594, 0, 0, -196593, 0, 0, -196592, 0, 0, -196591, 0, 0, -196590, 0, 0, -196589, 0, 0, -196588, 0, 0, -196587, 0, 0, -196586, 0, 0, -196585, 0, 0, -196584, 0, 0, -196583, 0, 0, -196582, 0, 0, -196581, 0, 0, -196580, 0, 0, -196579, 0, 0, -196578, 0, 0, -65545, 0, 0, -65544, 0, 0, -65543, 0, 0, -65542, 0, 0, -65541, 0, 0, -65540, 0, 0, -65539, 0, 0, -65538, 0, 0, -65537, 0, 0, -131072, 0, 0, -131071, 0, 0, -131070, 0, 0, -131069, 0, 0, -131068, 0, 0, -131067, 0, 0, -131066, 0, 0, -131065, 0, 0, -131064, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0, -131058, 0, 0, -131057, 0, 0, -131056, 0, 0, -131055, 0, 0, -131054, 0, 0, -131053, 0, 0, -131052, 0, 0, -131051, 0, 0, -131050, 0, 0, -131049, 0, 0, -131048, 0, 0, -131047, 0, 0, -131046, 0, 0, -131045, 0, 0, -131044, 0, 0, -131043, 0, 0, -131042, 0, 0, -9, 0, 0, -8, 0, 0, -7, 0, 0, -6, 0, 0, -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0, -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, -65524, 0, 0, -65523, 0, 0, -65522, 0, 0, -65521, 0, 0, -65520, 0, 0, -65519, 0, 0, -65518, 0, 0, -65517, 0, 0, -65516, 0, 0, -65515, 0, 0, -65514, 0, 0, -65513, 0, 0, -65512, 0, 0, -65511, 0, 0, -65510, 0, 0, -65509, 0, 0, -65508, 0, 0, -65507, 0, 0, -65506, 0, 0, 65527, 0, 0, 65528, 0, 0, 65529, 0, 0, 65530, 0, 0, 65531, 0, 0, 65532, 0, 0, 65533, 0, 0, 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 17, 0, 0, 18, 0, 0, 19, 0, 0, 20, 0, 0, 21, 0, 0, 22, 0, 0, 23, 0, 0, 24, 0, 0, 25, 0, 0, 26, 0, 0, 27, 0, 0, 28, 0, 0, 29, 0, 0, 30, 0, 0, 131063, 0, 0, 131064, 0, 0, 131065, 0, 0, 131066, 0, 0, 131067, 0, 0, 131068, 0, 0, 131069, 0, 0, 131070, 0, 0, 131071, 0, 0, 65536, 0, 0, 65537, 1, 0, 65538, 1, 0, 65539, 1, 0, 65540, 1, 0, 65541, 1, 0, 65542, 1, 0, 65543, 1, 0, 65544, 1, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 65551, 1, 0, 65552, 1, 0, 65553, 1, 0, 65554, 1, 0, 65555, 1, 0, 65556, 0, 0, 65557, 0, 0, 65558, 0, 0, 65559, 0, 0, 65560, 0, 0, 65561, 0, 0, 65562, 0, 0, 65563, 0, 0, 65564, 0, 0, 65565, 0, 0, 65566, 0, 0, 196599, 0, 0, 196600, 0, 0, 196601, 0, 0, 196602, 0, 0, 196603, 0, 0, 196604, 0, 0, 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 1, 0, 131074, 0, 0, 131075, 1, 0, 131076, 0, 0, 131077, 1, 0, 131078, 0, 0, 131079, 1, 0, 131080, 0, 0, 131081, 1, 0, 131082, 0, 0, 131083, 0, 0, 131084, 0, 0, 131085, 0, 0, 131086, 0, 0, 131087, 1, 0, 131088, 0, 0, 131089, 1, 0, 131090, 0, 0, 131091, 1, 0, 131092, 0, 0, 131093, 0, 0, 131094, 0, 0, 131095, 0, 0, 131096, 0, 0, 131097, 0, 0, 131098, 0, 0, 131099, 0, 0, 131100, 0, 0, 131101, 0, 0, 131102, 0, 0, 262135, 0, 0, 262136, 0, 0, 262137, 0, 0, 262138, 0, 0, 262139, 0, 0, 262140, 0, 0, 262141, 0, 0, 262142, 0, 0, 262143, 0, 0, 196608, 0, 0, 196609, 1, 0, 196610, 1, 0, 196611, 1, 0, 196612, 0, 0, 196613, 1, 0, 196614, 1, 0, 196615, 1, 0, 196616, 1, 0, 196617, 1, 0, 196618, 0, 0, 196619, 1, 0, 196620, 1, 0, 196621, 1, 0, 196622, 1, 0, 196623, 1, 0, 196624, 1, 0, 196625, 1, 0, 196626, 1, 0, 196627, 1, 0, 196628, 0, 0, 196629, 0, 0, 196630, 0, 0, 196631, 0, 0, 196632, 0, 0, 196633, 0, 0, 196634, 0, 0, 196635, 0, 0, 196636, 0, 0, 196637, 0, 0, 196638, 0, 0, 327671, 0, 0, 327672, 0, 0, 327673, 0, 0, 327674, 0, 0, 327675, 0, 0, 327676, 0, 0, 327677, 0, 0, 327678, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 1, 0, 262146, 0, 0, 262147, 1, 0, 262148, 0, 0, 262149, 1, 0, 262150, 0, 0, 262151, 1, 0, 262152, 0, 0, 262153, 1, 0, 262154, 0, 0, 262155, 1, 0, 262156, 0, 0, 262157, 1, 0, 262158, 0, 0, 262159, 1, 0, 262160, 0, 0, 262161, 1, 0, 262162, 0, 0, 262163, 1, 0, 262164, 0, 0, 262165, 0, 0, 262166, 0, 0, 262167, 0, 0, 262168, 0, 0, 262169, 0, 0, 262170, 0, 0, 262171, 0, 0, 262172, 0, 0, 262173, 0, 0, 262174, 0, 0, 393207, 0, 0, 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0, 393212, 0, 0, 393213, 0, 0, 393214, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 1, 0, 327682, 1, 0, 327683, 1, 0, 327684, 1, 0, 327685, 1, 0, 327686, 0, 0, 327687, 1, 0, 327688, 1, 0, 327689, 1, 0, 327690, 1, 0, 327691, 1, 0, 327692, 1, 0, 327693, 1, 0, 327694, 1, 0, 327695, 1, 0, 327696, 1, 0, 327697, 1, 0, 327698, 0, 0, 327699, 1, 0, 327700, 0, 0, 327701, 0, 0, 327702, 0, 0, 327703, 0, 0, 327704, 0, 0, 327705, 0, 0, 327706, 0, 0, 327707, 0, 0, 327708, 0, 0, 327709, 0, 0, 327710, 0, 0, 458743, 0, 0, 458744, 0, 0, 458745, 0, 0, 458746, 0, 0, 458747, 0, 0, 458748, 0, 0, 458749, 0, 0, 458750, 0, 0, 458751, 0, 0, 393216, 0, 0, 393217, 1, 0, 393218, 0, 0, 393219, 1, 0, 393220, 0, 0, 393221, 1, 0, 393222, 0, 0, 393223, 1, 0, 393224, 0, 0, 393225, 1, 0, 393226, 0, 0, 393227, 1, 0, 393228, 0, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 393232, 0, 0, 393233, 1, 0, 393234, 0, 0, 393235, 1, 0, 393236, 0, 0, 393237, 0, 0, 393238, 0, 0, 393239, 0, 0, 393240, 0, 0, 393241, 0, 0, 393242, 0, 0, 393243, 0, 0, 393244, 0, 0, 393245, 0, 0, 393246, 0, 0, 524279, 0, 0, 524280, 0, 0, 524281, 0, 0, 524282, 0, 0, 524283, 0, 0, 524284, 0, 0, 524285, 0, 0, 524286, 0, 0, 524287, 0, 0, 458752, 0, 0, 458753, 1, 0, 458754, 1, 0, 458755, 1, 0, 458756, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0, 458762, 1, 0, 458763, 1, 0, 458764, 1, 0, 458765, 1, 0, 458766, 1, 0, 458767, 1, 0, 458768, 1, 0, 458769, 1, 0, 458770, 1, 0, 458771, 1, 0, 458772, 0, 0, 458773, 0, 0, 458774, 0, 0, 458775, 0, 0, 458776, 0, 0, 458777, 0, 0, 458778, 0, 0, 458779, 0, 0, 458780, 0, 0, 458781, 0, 0, 458782, 0, 0, 589815, 0, 0, 589816, 0, 0, 589817, 0, 0, 589818, 0, 0, 589819, 0, 0, 589820, 0, 0, 589821, 0, 0, 589822, 0, 0, 589823, 0, 0, 524288, 0, 0, 524289, 1, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 1, 0, 524294, 0, 0, 524295, 1, 0, 524296, 0, 0, 524297, 1, 0, 524298, 0, 0, 524299, 1, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 1, 0, 524304, 0, 0, 524305, 1, 0, 524306, 0, 0, 524307, 1, 0, 524308, 0, 0, 524309, 0, 0, 524310, 0, 0, 524311, 0, 0, 524312, 0, 0, 524313, 0, 0, 524314, 0, 0, 524315, 0, 0, 524316, 0, 0, 524317, 0, 0, 524318, 0, 0, 655351, 0, 0, 655352, 0, 0, 655353, 0, 0, 655354, 0, 0, 655355, 0, 0, 655356, 0, 0, 655357, 0, 0, 655358, 0, 0, 655359, 0, 0, 589824, 0, 0, 589825, 1, 0, 589826, 1, 0, 589827, 1, 0, 589828, 1, 0, 589829, 1, 0, 589830, 1, 0, 589831, 1, 0, 589832, 0, 0, 589833, 1, 0, 589834, 1, 0, 589835, 1, 0, 589836, 0, 0, 589837, 1, 0, 589838, 1, 0, 589839, 1, 0, 589840, 1, 0, 589841, 1, 0, 589842, 1, 0, 589843, 1, 0, 589844, 0, 0, 589845, 0, 0, 589846, 0, 0, 589847, 0, 0, 589848, 0, 0, 589849, 0, 0, 589850, 0, 0, 589851, 0, 0, 589852, 0, 0, 589853, 0, 0, 589854, 0, 0, 720887, 0, 0, 720888, 0, 0, 720889, 0, 0, 720890, 0, 0, 720891, 0, 0, 720892, 0, 0, 720893, 0, 0, 720894, 0, 0, 720895, 0, 0, 655360, 0, 0, 655361, 1, 0, 655362, 0, 0, 655363, 1, 0, 655364, 0, 0, 655365, 1, 0, 655366, 0, 0, 655367, 1, 0, 655368, 0, 0, 655369, 1, 0, 655370, 0, 0, 655371, 1, 0, 655372, 0, 0, 655373, 1, 0, 655374, 0, 0, 655375, 1, 0, 655376, 0, 0, 655377, 1, 0, 655378, 0, 0, 655379, 1, 0, 655380, 0, 0, 655381, 0, 0, 655382, 0, 0, 655383, 0, 0, 655384, 0, 0, 655385, 0, 0, 655386, 0, 0, 655387, 0, 0, 655388, 0, 0, 655389, 0, 0, 655390, 0, 0, 786423, 0, 0, 786424, 0, 0, 786425, 0, 0, 786426, 0, 0, 786427, 0, 0, 786428, 0, 0, 786429, 0, 0, 786430, 0, 0, 786431, 0, 0, 720896, 0, 0, 720897, 1, 0, 720898, 1, 0, 720899, 1, 0, 720900, 1, 0, 720901, 1, 0, 720902, 1, 0, 720903, 1, 0, 720904, 1, 0, 720905, 1, 0, 720906, 1, 0, 720907, 1, 0, 720908, 1, 0, 720909, 1, 0, 720910, 1, 0, 720911, 1, 0, 720912, 1, 0, 720913, 1, 0, 720914, 1, 0, 720915, 1, 0, 720916, 0, 0, 720917, 0, 0, 720918, 0, 0, 720919, 0, 0, 720920, 0, 0, 720921, 0, 0, 720922, 0, 0, 720923, 0, 0, 720924, 0, 0, 720925, 0, 0, 720926, 0, 0, 851959, 0, 0, 851960, 0, 0, 851961, 0, 0, 851962, 0, 0, 851963, 0, 0, 851964, 0, 0, 851965, 0, 0, 851966, 0, 0, 851967, 0, 0, 786432, 0, 0, 786433, 0, 0, 786434, 0, 0, 786435, 0, 0, 786436, 0, 0, 786437, 0, 0, 786438, 0, 0, 786439, 0, 0, 786440, 0, 0, 786441, 0, 0, 786442, 0, 0, 786443, 0, 0, 786444, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786448, 0, 0, 786449, 0, 0, 786450, 0, 0, 786451, 0, 0, 786452, 0, 0, 786453, 0, 0, 786454, 0, 0, 786455, 0, 0, 786456, 0, 0, 786457, 0, 0, 786458, 0, 0, 786459, 0, 0, 786460, 0, 0, 786461, 0, 0, 786462, 0, 0, 917495, 0, 0, 917496, 0, 0, 917497, 0, 0, 917498, 0, 0, 917499, 0, 0, 917500, 0, 0, 917501, 0, 0, 917502, 0, 0, 917503, 0, 0, 851968, 0, 0, 851969, 0, 0, 851970, 0, 0, 851971, 0, 0, 851972, 0, 0, 851973, 0, 0, 851974, 0, 0, 851975, 0, 0, 851976, 0, 0, 851977, 0, 0, 851978, 0, 0, 851979, 0, 0, 851980, 0, 0, 851981, 0, 0, 851982, 0, 0, 851983, 0, 0, 851984, 0, 0, 851985, 0, 0, 851986, 0, 0, 851987, 0, 0, 851988, 0, 0, 851989, 0, 0, 851990, 0, 0, 851991, 0, 0, 851992, 0, 0, 851993, 0, 0, 851994, 0, 0, 851995, 0, 0, 851996, 0, 0, 851997, 0, 0, 851998, 0, 0, 983031, 0, 0, 983032, 0, 0, 983033, 0, 0, 983034, 0, 0, 983035, 0, 0, 983036, 0, 0, 983037, 0, 0, 983038, 0, 0, 983039, 0, 0, 917504, 0, 0, 917505, 0, 0, 917506, 0, 0, 917507, 0, 0, 917508, 0, 0, 917509, 0, 0, 917510, 0, 0, 917511, 0, 0, 917512, 0, 0, 917513, 0, 0, 917514, 0, 0, 917515, 0, 0, 917516, 0, 0, 917517, 0, 0, 917518, 0, 0, 917519, 0, 0, 917520, 0, 0, 917521, 0, 0, 917522, 0, 0, 917523, 0, 0, 917524, 0, 0, 917525, 0, 0, 917526, 0, 0, 917527, 0, 0, 917528, 0, 0, 917529, 0, 0, 917530, 0, 0, 917531, 0, 0, 917532, 0, 0, 917533, 0, 0, 917534, 0, 0, 1048567, 0, 0, 1048568, 0, 0, 1048569, 0, 0, 1048570, 0, 0, 1048571, 0, 0, 1048572, 0, 0, 1048573, 0, 0, 1048574, 0, 0, 1048575, 0, 0, 983040, 0, 0, 983041, 0, 0, 983042, 0, 0, 983043, 0, 0, 983044, 0, 0, 983045, 0, 0, 983046, 0, 0, 983047, 0, 0, 983048, 0, 0, 983049, 0, 0, 983050, 0, 0, 983051, 0, 0, 983052, 0, 0, 983053, 0, 0, 983054, 0, 0, 983055, 0, 0, 983056, 0, 0, 983057, 0, 0, 983058, 0, 0, 983059, 0, 0, 983060, 0, 0, 983061, 0, 0, 983062, 0, 0, 983063, 0, 0, 983064, 0, 0, 983065, 0, 0, 983066, 0, 0, 983067, 0, 0, 983068, 0, 0, 983069, 0, 0, 983070, 0, 0, 1114103, 0, 0, 1114104, 0, 0, 1114105, 0, 0, 1114106, 0, 0, 1114107, 0, 0, 1114108, 0, 0, 1114109, 0, 0, 1114110, 0, 0, 1114111, 0, 0, 1048576, 0, 0, 1048577, 0, 0, 1048578, 0, 0, 1048579, 0, 0, 1048580, 0, 0, 1048581, 0, 0, 1048582, 0, 0, 1048583, 0, 0, 1048584, 0, 0, 1048585, 0, 0, 1048586, 0, 0, 1048587, 0, 0, 1048588, 0, 0, 1048589, 0, 0, 1048590, 0, 0, 1048591, 0, 0, 1048592, 0, 0, 1048593, 0, 0, 1048594, 0, 0, 1048595, 0, 0, 1048596, 0, 0, 1048597, 0, 0, 1048598, 0, 0, 1048599, 0, 0, 1048600, 0, 0, 1048601, 0, 0, 1048602, 0, 0, 1048603, 0, 0, 1048604, 0, 0, 1048605, 0, 0, 1048606, 0, 0, 1179639, 0, 0, 1179640, 0, 0, 1179641, 0, 0, 1179642, 0, 0, 1179643, 0, 0, 1179644, 0, 0, 1179645, 0, 0, 1179646, 0, 0, 1179647, 0, 0, 1114112, 0, 0, 1114113, 0, 0, 1114114, 0, 0, 1114115, 0, 0, 1114116, 0, 0, 1114117, 0, 0, 1114118, 0, 0, 1114119, 0, 0, 1114120, 0, 0, 1114121, 0, 0, 1114122, 0, 0, 1114123, 0, 0, 1114124, 0, 0, 1114125, 0, 0, 1114126, 0, 0, 1114127, 0, 0, 1114128, 0, 0, 1114129, 0, 0, 1114130, 0, 0, 1114131, 0, 0, 1114132, 0, 0, 1114133, 0, 0, 1114134, 0, 0, 1114135, 0, 0, 1114136, 0, 0, 1114137, 0, 0, 1114138, 0, 0, 1114139, 0, 0, 1114140, 0, 0, 1114141, 0, 0, 1114142, 0, 0, 1245175, 0, 0, 1245176, 0, 0, 1245177, 0, 0, 1245178, 0, 0, 1245179, 0, 0, 1245180, 0, 0, 1245181, 0, 0, 1245182, 0, 0, 1245183, 0, 0, 1179648, 0, 0, 1179649, 0, 0, 1179650, 0, 0, 1179651, 0, 0, 1179652, 0, 0, 1179653, 0, 0, 1179654, 0, 0, 1179655, 0, 0, 1179656, 0, 0, 1179657, 0, 0, 1179658, 0, 0, 1179659, 0, 0, 1179660, 0, 0, 1179661, 0, 0, 1179662, 0, 0, 1179663, 0, 0, 1179664, 0, 0, 1179665, 0, 0, 1179666, 0, 0, 1179667, 0, 0, 1179668, 0, 0, 1179669, 0, 0, 1179670, 0, 0, 1179671, 0, 0, 1179672, 0, 0, 1179673, 0, 0, 1179674, 0, 0, 1179675, 0, 0, 1179676, 0, 0, 1179677, 0, 0, 1179678, 0, 0, 1310711, 0, 0, 1310712, 0, 0, 1310713, 0, 0, 1310714, 0, 0, 1310715, 0, 0, 1310716, 0, 0, 1310717, 0, 0, 1310718, 0, 0, 1310719, 0, 0, 1245184, 0, 0, 1245185, 0, 0, 1245186, 0, 0, 1245187, 0, 0, 1245188, 0, 0, 1245189, 0, 0, 1245190, 0, 0, 1245191, 0, 0, 1245192, 0, 0, 1245193, 0, 0, 1245194, 0, 0, 1245195, 0, 0, 1245196, 0, 0, 1245197, 0, 0, 1245198, 0, 0, 1245199, 0, 0, 1245200, 0, 0, 1245201, 0, 0, 1245202, 0, 0, 1245203, 0, 0, 1245204, 0, 0, 1245205, 0, 0, 1245206, 0, 0, 1245207, 0, 0, 1245208, 0, 0, 1245209, 0, 0, 1245210, 0, 0, 1245211, 0, 0, 1245212, 0, 0, 1245213, 0, 0, 1245214, 0, 0, 1376247, 0, 0, 1376248, 0, 0, 1376249, 0, 0, 1376250, 0, 0, 1376251, 0, 0, 1376252, 0, 0, 1376253, 0, 0, 1376254, 0, 0, 1376255, 0, 0, 1310720, 0, 0, 1310721, 0, 0, 1310722, 0, 0, 1310723, 0, 0, 1310724, 0, 0, 1310725, 0, 0, 1310726, 0, 0, 1310727, 0, 0, 1310728, 0, 0, 1310729, 0, 0, 1310730, 0, 0, 1310731, 0, 0, 1310732, 0, 0, 1310733, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310737, 0, 0, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 1310745, 0, 0, 1310746, 0, 0, 1310747, 0, 0, 1310748, 0, 0, 1310749, 0, 0, 1310750, 0, 0, 1441783, 0, 0, 1441784, 0, 0, 1441785, 0, 0, 1441786, 0, 0, 1441787, 0, 0, 1441788, 0, 0, 1441789, 0, 0, 1441790, 0, 0, 1441791, 0, 0, 1376256, 0, 0, 1376257, 0, 0, 1376258, 0, 0, 1376259, 0, 0, 1376260, 0, 0, 1376261, 0, 0, 1376262, 0, 0, 1376263, 0, 0, 1376264, 0, 0, 1376265, 0, 0, 1376266, 0, 0, 1376267, 0, 0, 1376268, 0, 0, 1376269, 0, 0, 1376270, 0, 0, 1376271, 0, 0, 1376272, 0, 0, 1376273, 0, 0, 1376274, 0, 0, 1376275, 0, 0, 1376276, 0, 0, 1376277, 0, 0, 1376278, 0, 0, 1376279, 0, 0, 1376280, 0, 0, 1376281, 0, 0, 1376282, 0, 0, 1376283, 0, 0, 1376284, 0, 0, 1376285, 0, 0, 1376286, 0, 0 ) __meta__ = { "_edit_lock_": true } [node name="spawn_points" type="Node2D" parent="."] -editor/display_folded = true [node name="0" type="Position2D" parent="spawn_points"] position = Vector2( 72, 72 ) @@ -305,4 +304,7 @@ size_flags_vertical = 2 custom_fonts/font = SubResource( 1 ) text = "EXIT GAME" +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true [connection signal="pressed" from="winner/exit_game" to="score" method="_on_exit_game_pressed"] diff --git a/networking/multiplayer_pong/ball.png.import b/networking/multiplayer_pong/ball.png.import index 90e1c1f0..f239f238 100644 --- a/networking/multiplayer_pong/ball.png.import +++ b/networking/multiplayer_pong/ball.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/ball.png-9a4ca347acb7532f6ae347744a6b04f7.stex" +metadata={ +"vram_texture": false +} [deps] @@ -17,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/networking/multiplayer_pong/icon.png.import b/networking/multiplayer_pong/icon.png.import index 45ee6af7..96cbf462 100644 --- a/networking/multiplayer_pong/icon.png.import +++ b/networking/multiplayer_pong/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/networking/multiplayer_pong/lobby.gd b/networking/multiplayer_pong/lobby.gd index 33d50df6..8a99d4f0 100644 --- a/networking/multiplayer_pong/lobby.gd +++ b/networking/multiplayer_pong/lobby.gd @@ -9,7 +9,7 @@ func _player_connected(_id): #someone connected, start the game! var pong = load("res://pong.tscn").instance() pong.connect("game_finished", self, "_end_game", [], CONNECT_DEFERRED) # connect deferred so we can safely erase it from the callback - + get_tree().get_root().add_child(pong) hide() @@ -24,20 +24,20 @@ func _player_disconnected(_id): func _connected_ok(): # will not use this one pass - -# callback from SceneTree, only for clients (not server) + +# callback from SceneTree, only for clients (not server) func _connected_fail(): _set_status("Couldn't connect",false) - + get_tree().set_network_peer(null) #remove peer - + get_node("panel/join").set_disabled(false) get_node("panel/host").set_disabled(false) func _server_disconnected(): _end_game("Server disconnected") - + ##### Game creation functions ###### func _end_game(with_error=""): @@ -45,16 +45,16 @@ func _end_game(with_error=""): #erase pong scene get_node("/root/pong").free() # erase immediately, otherwise network might show errors (this is why we connected deferred above) show() - + get_tree().set_network_peer(null) #remove peer - + get_node("panel/join").set_disabled(false) get_node("panel/host").set_disabled(false) - + _set_status(with_error, false) func _set_status(text, isok): - #simple way to show status + #simple way to show status if isok: get_node("panel/status_ok").set_text(text) get_node("panel/status_fail").set_text("") @@ -70,7 +70,7 @@ func _on_host_pressed(): #is another server running? _set_status("Can't host, address in use.",false) return - + get_tree().set_network_peer(host) get_node("panel/join").set_disabled(true) get_node("panel/host").set_disabled(true) @@ -81,17 +81,17 @@ func _on_join_pressed(): if not ip.is_valid_ip_address(): _set_status("IP address is invalid", false) return - + var host = NetworkedMultiplayerENet.new() host.set_compression_mode(NetworkedMultiplayerENet.COMPRESS_RANGE_CODER) host.create_client(ip, DEFAULT_PORT) get_tree().set_network_peer(host) - + _set_status("Connecting..", true) ### INITIALIZER #### - + func _ready(): # connect all the callbacks related to networking get_tree().connect("network_peer_connected", self, "_player_connected") @@ -99,4 +99,4 @@ func _ready(): get_tree().connect("connected_to_server", self, "_connected_ok") get_tree().connect("connection_failed", self, "_connected_fail") get_tree().connect("server_disconnected", self, "_server_disconnected") - + diff --git a/networking/multiplayer_pong/lobby.tscn b/networking/multiplayer_pong/lobby.tscn index a1de8d05..810d890a 100644 --- a/networking/multiplayer_pong/lobby.tscn +++ b/networking/multiplayer_pong/lobby.tscn @@ -3,11 +3,20 @@ [ext_resource path="res://lobby.gd" type="Script" id=1] [node name="lobby" type="Control"] -margin_right = 40.0 -margin_bottom = 40.0 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -320.0 +margin_top = -200.0 +margin_right = 320.0 +margin_bottom = 200.0 size_flags_horizontal = 2 size_flags_vertical = 2 script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="title" type="Label" parent="."] margin_left = 210.0 @@ -83,6 +92,5 @@ size_flags_horizontal = 2 size_flags_vertical = 0 custom_colors/font_color = Color( 1, 0, 0, 1 ) align = 1 - [connection signal="pressed" from="panel/host" to="." method="_on_host_pressed"] [connection signal="pressed" from="panel/join" to="." method="_on_join_pressed"] diff --git a/networking/multiplayer_pong/paddle.png.import b/networking/multiplayer_pong/paddle.png.import index 4ee95b53..3363f632 100644 --- a/networking/multiplayer_pong/paddle.png.import +++ b/networking/multiplayer_pong/paddle.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/paddle.png-0e798fb0912613386507c9904d5cc01a.stex" +metadata={ +"vram_texture": false +} [deps] @@ -17,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/networking/multiplayer_pong/pong.gd b/networking/multiplayer_pong/pong.gd index 19391bf4..7ea0d697 100644 --- a/networking/multiplayer_pong/pong.gd +++ b/networking/multiplayer_pong/pong.gd @@ -12,36 +12,36 @@ sync func update_score(add_to_left): score_left += 1 get_node("score_left").set_text(str(score_left)) else: - + score_right += 1 get_node("score_right").set_text(str(score_right)) - + var game_ended = false - + if score_left == SCORE_TO_WIN: get_node("winner_left").show() game_ended = true elif score_right == SCORE_TO_WIN: get_node("winner_right").show() game_ended = true - + if game_ended: get_node("exit_game").show() get_node("ball").rpc("stop") func _on_exit_game_pressed(): - emit_signal("game_finished") + emit_signal("game_finished") func _ready(): # by default, all nodes in server inherit from master # while all nodes in clients inherit from puppet - if get_tree().is_network_server(): + if get_tree().is_network_server(): #if in the server, get control of player 2 to the other peeer, this function is tree recursive by default get_node("player2").set_network_master(get_tree().get_network_connected_peers()[0]) else: #if in the client, give control of player 2 to itself, this function is tree recursive by default get_node("player2").set_network_master(get_tree().get_network_unique_id()) - + #let each paddle know which one is left, too get_node("player1").left = true get_node("player2").left = false diff --git a/networking/multiplayer_pong/pong.tscn b/networking/multiplayer_pong/pong.tscn index ba99a818..62b06bed 100644 --- a/networking/multiplayer_pong/pong.tscn +++ b/networking/multiplayer_pong/pong.tscn @@ -2,29 +2,37 @@ [ext_resource path="res://pong.gd" type="Script" id=1] [ext_resource path="res://separator.png" type="Texture" id=2] -[ext_resource path="res://paddle.tscn" type="PackedScene" id=3] -[ext_resource path="res://ball.tscn" type="PackedScene" id=4] +[ext_resource path="res://ball.tscn" type="PackedScene" id=3] +[ext_resource path="res://paddle.tscn" type="PackedScene" id=4] [node name="pong" type="Node2D"] script = ExtResource( 1 ) +[node name="ColorRect" type="ColorRect" parent="."] +margin_right = 640.0 +margin_bottom = 400.0 +color = Color( 0.141176, 0.152941, 0.164706, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + [node name="separator" type="Sprite" parent="."] position = Vector2( 320, 200 ) texture = ExtResource( 2 ) -[node name="player1" parent="." instance=ExtResource( 3 )] +[node name="player1" parent="." instance=ExtResource( 4 )] position = Vector2( 32.49, 188.622 ) [node name="sprite" parent="player1" index="0"] self_modulate = Color( 1, 0, 0.960938, 1 ) -[node name="player2" parent="." instance=ExtResource( 3 )] +[node name="player2" parent="." instance=ExtResource( 4 )] position = Vector2( 608.88, 188.622 ) [node name="sprite" parent="player2" index="0"] self_modulate = Color( 0, 0.929688, 1, 1 ) -[node name="ball" parent="." instance=ExtResource( 4 )] +[node name="ball" parent="." instance=ExtResource( 3 )] position = Vector2( 320.387, 189.525 ) [node name="score_left" type="Label" parent="."] @@ -77,6 +85,9 @@ size_flags_horizontal = 2 size_flags_vertical = 2 text = "Exit Game" +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 320, 200 ) +current = true [connection signal="pressed" from="exit_game" to="." method="_on_exit_game_pressed"] [editable path="player1"] diff --git a/networking/multiplayer_pong/project.godot b/networking/multiplayer_pong/project.godot index 4fa5561e..221400cd 100644 --- a/networking/multiplayer_pong/project.godot +++ b/networking/multiplayer_pong/project.godot @@ -27,6 +27,8 @@ gdscript/warnings/return_value_discarded=false window/size/width=640 window/size/height=400 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch_2d=true [gdnative] @@ -48,4 +50,5 @@ move_up={ [rendering] +quality/2d/use_pixel_snap=true viewport/default_clear_color=Color( 0, 0, 0, 1 ) diff --git a/networking/multiplayer_pong/separator.png.import b/networking/multiplayer_pong/separator.png.import index c4710ca5..a8527c62 100644 --- a/networking/multiplayer_pong/separator.png.import +++ b/networking/multiplayer_pong/separator.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/separator.png-f981c8489b9148e2e1dc63398273da74.stex" +metadata={ +"vram_texture": false +} [deps] @@ -17,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/networking/webrtc_minimal/main.gd b/networking/webrtc_minimal/main.gd index c61b3ab2..e86b17a7 100644 --- a/networking/webrtc_minimal/main.gd +++ b/networking/webrtc_minimal/main.gd @@ -14,4 +14,4 @@ func _ready(): # Wait a second and send message from P2 yield(get_tree().create_timer(1), "timeout") - p2.send_message("Hi from %s" % p2.get_path()) \ No newline at end of file + p2.send_message("Hi from %s" % p2.get_path()) diff --git a/networking/webrtc_minimal/minimal.gd b/networking/webrtc_minimal/minimal.gd index 944c375d..06b37a25 100644 --- a/networking/webrtc_minimal/minimal.gd +++ b/networking/webrtc_minimal/minimal.gd @@ -36,4 +36,4 @@ func _process(delta): if ch1.get_ready_state() == ch1.STATE_OPEN and ch1.get_available_packet_count() > 0: print("P1 received: ", ch1.get_packet().get_string_from_utf8()) if ch2.get_ready_state() == ch2.STATE_OPEN and ch2.get_available_packet_count() > 0: - print("P2 received: ", ch2.get_packet().get_string_from_utf8()) \ No newline at end of file + print("P2 received: ", ch2.get_packet().get_string_from_utf8()) diff --git a/networking/webrtc_minimal/project.godot b/networking/webrtc_minimal/project.godot index 46973240..37cb0254 100644 --- a/networking/webrtc_minimal/project.godot +++ b/networking/webrtc_minimal/project.godot @@ -22,6 +22,11 @@ run/main_scene="res://main.tscn" Signaling="*res://Signaling.gd" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] -singletons=[ "res://webrtc/webrtc.tres" ] +singletons=[ ] diff --git a/networking/webrtc_signaling/demo/client_ui.tscn b/networking/webrtc_signaling/demo/client_ui.tscn index 2ef2dbd6..83371a18 100644 --- a/networking/webrtc_signaling/demo/client_ui.tscn +++ b/networking/webrtc_signaling/demo/client_ui.tscn @@ -19,6 +19,7 @@ script = ExtResource( 2 ) [node name="vbox" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +custom_constants/separation = 8 __meta__ = { "_edit_use_anchors_": false } @@ -55,9 +56,10 @@ margin_bottom = 24.0 placeholder_text = "secret" [node name="HBoxContainer" type="HBoxContainer" parent="vbox"] -margin_top = 28.0 +margin_top = 32.0 margin_right = 1024.0 -margin_bottom = 48.0 +margin_bottom = 52.0 +custom_constants/separation = 10 __meta__ = { "_edit_use_anchors_": false } @@ -68,31 +70,31 @@ margin_bottom = 20.0 text = "Start" [node name="Stop" type="Button" parent="vbox/HBoxContainer"] -margin_left = 45.0 -margin_right = 85.0 +margin_left = 51.0 +margin_right = 91.0 margin_bottom = 20.0 text = "Stop" [node name="Seal" type="Button" parent="vbox/HBoxContainer"] -margin_left = 89.0 -margin_right = 127.0 +margin_left = 101.0 +margin_right = 139.0 margin_bottom = 20.0 text = "Seal" [node name="Ping" type="Button" parent="vbox/HBoxContainer"] -margin_left = 131.0 -margin_right = 170.0 +margin_left = 149.0 +margin_right = 188.0 margin_bottom = 20.0 text = "Ping" [node name="Peers" type="Button" parent="vbox/HBoxContainer"] -margin_left = 174.0 -margin_right = 256.0 +margin_left = 198.0 +margin_right = 280.0 margin_bottom = 20.0 text = "Print peers" [node name="TextEdit" type="TextEdit" parent="vbox"] -margin_top = 52.0 +margin_top = 60.0 margin_right = 1024.0 margin_bottom = 600.0 size_flags_vertical = 3 diff --git a/networking/webrtc_signaling/demo/main.gd b/networking/webrtc_signaling/demo/main.gd index 6d17afcb..619eafac 100644 --- a/networking/webrtc_signaling/demo/main.gd +++ b/networking/webrtc_signaling/demo/main.gd @@ -11,4 +11,4 @@ func _on_listen_toggled(button_pressed): $Server.stop() func _on_LinkButton_pressed(): - OS.shell_open("https://github.com/godotengine/webrtc-native/releases") \ No newline at end of file + OS.shell_open("https://github.com/godotengine/webrtc-native/releases") diff --git a/networking/webrtc_signaling/demo/main.tscn b/networking/webrtc_signaling/demo/main.tscn index 0b1377e4..47176216 100644 --- a/networking/webrtc_signaling/demo/main.tscn +++ b/networking/webrtc_signaling/demo/main.tscn @@ -5,8 +5,12 @@ [ext_resource path="res://server/ws_webrtc_server.gd" type="Script" id=3] [node name="Control" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_left = 0.0136719 +anchor_top = 0.0166667 +anchor_right = 0.986328 +anchor_bottom = 0.983333 +margin_top = 4.32134e-07 +margin_bottom = -9.53674e-06 script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": true @@ -21,7 +25,7 @@ __meta__ = { } [node name="Signaling" type="HBoxContainer" parent="vbox"] -margin_right = 1024.0 +margin_right = 996.0 margin_bottom = 24.0 [node name="Label" type="Label" parent="vbox/Signaling"] @@ -47,43 +51,47 @@ text = "Listen" [node name="CenterContainer" type="CenterContainer" parent="vbox/Signaling"] margin_left = 241.0 -margin_right = 1024.0 +margin_right = 996.0 margin_bottom = 24.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="LinkButton" type="LinkButton" parent="vbox/Signaling/CenterContainer"] -margin_left = 118.0 +margin_left = 104.0 margin_top = 5.0 -margin_right = 664.0 +margin_right = 650.0 margin_bottom = 19.0 text = "Make sure to download the GDNative WebRTC Plugin and place it in the project folder" [node name="Clients" type="GridContainer" parent="vbox"] margin_top = 74.0 -margin_right = 1024.0 -margin_bottom = 600.0 +margin_right = 996.0 +margin_bottom = 580.0 size_flags_horizontal = 3 size_flags_vertical = 3 +custom_constants/vseparation = 15 +custom_constants/hseparation = 15 columns = 2 [node name="ClientUI" parent="vbox/Clients" instance=ExtResource( 2 )] -margin_right = 510.0 -margin_bottom = 261.0 +margin_right = 490.0 +margin_bottom = 245.0 [node name="ClientUI2" parent="vbox/Clients" instance=ExtResource( 2 )] -margin_left = 514.0 -margin_bottom = 261.0 +margin_left = 505.0 +margin_right = 995.0 +margin_bottom = 245.0 [node name="ClientUI3" parent="vbox/Clients" instance=ExtResource( 2 )] -margin_top = 265.0 -margin_right = 510.0 -margin_bottom = 526.0 +margin_top = 260.0 +margin_right = 490.0 +margin_bottom = 505.0 [node name="ClientUI4" parent="vbox/Clients" instance=ExtResource( 2 )] -margin_left = 514.0 -margin_top = 265.0 -margin_bottom = 526.0 +margin_left = 505.0 +margin_top = 260.0 +margin_right = 995.0 +margin_bottom = 505.0 [node name="Server" type="Node" parent="."] script = ExtResource( 3 ) diff --git a/networking/webrtc_signaling/project.godot b/networking/webrtc_signaling/project.godot index f782dff0..5db1f359 100644 --- a/networking/webrtc_signaling/project.godot +++ b/networking/webrtc_signaling/project.godot @@ -24,9 +24,14 @@ gdscript/warnings/shadowed_variable=false gdscript/warnings/unused_argument=false gdscript/warnings/return_value_discarded=false +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] -singletons=[ "res://webrtc/webrtc.tres" ] +singletons=[ ] singletons_disabled=[ ] [network] diff --git a/viewport/3d_in_2d/3D_in_2D.gd b/viewport/3d_in_2d/3D_in_2D.gd index abcdbcbd..20820a35 100644 --- a/viewport/3d_in_2d/3D_in_2D.gd +++ b/viewport/3d_in_2d/3D_in_2D.gd @@ -5,28 +5,34 @@ var viewport = null var sprite = null var viewport_sprite = null +var viewport_initial_size = Vector2() + # variables for the sprite animation const MAX_FRAME_FOR_SPRITE = 4 const FRAME_SWITCH_TIME = 0.2 var frame_switch_timer = 0 func _ready(): + get_viewport().connect("size_changed", self, "_root_viewport_size_changed") + viewport = get_node("Viewport") sprite = get_node("Sprite") viewport_sprite = get_node("Viewport_Sprite") + viewport_initial_size = viewport.size + # Assign the sprite's texture to the viewport texture viewport.set_clear_mode(Viewport.CLEAR_MODE_ONLY_NEXT_FRAME) - + # Let two frames pass to make sure the screen was captured yield(get_tree(), "idle_frame") yield(get_tree(), "idle_frame") viewport_sprite.texture = viewport.get_texture() - + set_process(true) -# Simple frame based animation +# Simple frame-based animation func _process(delta): frame_switch_timer += delta if frame_switch_timer >= FRAME_SWITCH_TIME: @@ -34,3 +40,11 @@ func _process(delta): sprite.frame += 1 if sprite.frame > MAX_FRAME_FOR_SPRITE: sprite.frame = 0 + +# Called when the root's viewport size changes (i.e. when the window is resized). +# This is done to handle multiple resolutions without losing quality. +func _root_viewport_size_changed(): + # The viewport is resized depending on the window height. + # To compensate for the larger resolution, the viewport sprite is scaled down. + viewport.size = Vector2.ONE * get_viewport().size.y + viewport_sprite.scale = Vector2.ONE * viewport_initial_size.y / get_viewport().size.y diff --git a/viewport/3d_in_2d/3D_in_2D.tscn b/viewport/3d_in_2d/3D_in_2D.tscn index db006fdd..428a0b0c 100644 --- a/viewport/3d_in_2d/3D_in_2D.tscn +++ b/viewport/3d_in_2d/3D_in_2D.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://3D_in_2D.gd" type="Script" id=1] +[ext_resource path="res://player.scn" type="PackedScene" id=1] [ext_resource path="res://robot_demo.png" type="Texture" id=2] -[ext_resource path="res://player.scn" type="PackedScene" id=3] +[ext_resource path="res://3D_in_2D.gd" type="Script" id=3] [node name="3D_in_2D" type="Node2D"] -script = ExtResource( 1 ) +script = ExtResource( 3 ) [node name="Sprite" type="Sprite" parent="."] position = Vector2( 339.942, 311.204 ) @@ -23,12 +23,17 @@ rotation = 3.14159 size = Vector2( 300, 300 ) own_world = true transparent_bg = true +msaa = 2 hdr = false +usage = 3 -[node name="player" parent="Viewport" instance=ExtResource( 3 )] +[node name="player" parent="Viewport" instance=ExtResource( 1 )] [node name="Camera" parent="Viewport/player" index="1"] current = true +[node name="Camera2D" type="Camera2D" parent="."] +offset = Vector2( 512, 300 ) +current = true [editable path="Viewport/player"] diff --git a/viewport/3d_in_2d/default_env.tres b/viewport/3d_in_2d/default_env.tres index ff3a41bd..7e078d2d 100644 --- a/viewport/3d_in_2d/default_env.tres +++ b/viewport/3d_in_2d/default_env.tres @@ -12,4 +12,3 @@ ground_curve = 0.01 background_mode = 2 background_sky = SubResource( 1 ) ssao_blur = 1 - diff --git a/viewport/3d_in_2d/icon.png.import b/viewport/3d_in_2d/icon.png.import index 45ee6af7..96cbf462 100644 --- a/viewport/3d_in_2d/icon.png.import +++ b/viewport/3d_in_2d/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/viewport/3d_in_2d/player.gd b/viewport/3d_in_2d/player.gd index f5735800..c6b22647 100644 --- a/viewport/3d_in_2d/player.gd +++ b/viewport/3d_in_2d/player.gd @@ -11,4 +11,4 @@ func _ready(): func _process(delta): - model.rotation_degrees.y += delta * SPEED \ No newline at end of file + model.rotation_degrees.y += delta * SPEED diff --git a/viewport/3d_in_2d/project.godot b/viewport/3d_in_2d/project.godot index 09a56017..9bdf4cb2 100644 --- a/viewport/3d_in_2d/project.godot +++ b/viewport/3d_in_2d/project.godot @@ -19,6 +19,11 @@ config/name="3D in 2D" run/main_scene="res://3D_in_2D.tscn" config/icon="res://icon.png" +[display] + +window/stretch/mode="2d" +window/stretch/aspect="expand" + [gdnative] singletons=[ ] diff --git a/viewport/3d_in_2d/robot_demo.png.import b/viewport/3d_in_2d/robot_demo.png.import index 94e6d702..c6bd4821 100644 --- a/viewport/3d_in_2d/robot_demo.png.import +++ b/viewport/3d_in_2d/robot_demo.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/robot_demo.png-8502817e0037b3f31eaca3dae49dcfc5.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/viewport/screen_capture/capture_screen.tscn b/viewport/screen_capture/capture_screen.tscn index 782957ff..ed84f734 100644 --- a/viewport/screen_capture/capture_screen.tscn +++ b/viewport/screen_capture/capture_screen.tscn @@ -35,4 +35,3 @@ margin_top = 53.0 margin_right = 188.0 margin_bottom = 113.0 text = "Capture screen" - diff --git a/viewport/screen_capture/default_env.tres b/viewport/screen_capture/default_env.tres index 02de4365..dd375181 100644 --- a/viewport/screen_capture/default_env.tres +++ b/viewport/screen_capture/default_env.tres @@ -12,4 +12,3 @@ ground_curve = 0.01 background_mode = 2 background_sky = SubResource( 1 ) ssao_blur = 1 - diff --git a/viewport/screen_capture/icon.png.import b/viewport/screen_capture/icon.png.import index 45ee6af7..96cbf462 100644 --- a/viewport/screen_capture/icon.png.import +++ b/viewport/screen_capture/icon.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/viewport/screen_capture/mountains.png.import b/viewport/screen_capture/mountains.png.import index 321a30e0..25c54337 100644 --- a/viewport/screen_capture/mountains.png.import +++ b/viewport/screen_capture/mountains.png.import @@ -3,6 +3,9 @@ importer="texture" type="StreamTexture" path="res://.import/mountains.png-03f302fbd9195711fc86ea8f28ca435e.stex" +metadata={ +"vram_texture": false +} [deps] diff --git a/viewport/screen_capture/project.godot b/viewport/screen_capture/project.godot index 266f3d98..6fa6adc9 100644 --- a/viewport/screen_capture/project.godot +++ b/viewport/screen_capture/project.godot @@ -23,6 +23,11 @@ config/icon="res://icon.png" gdscript/warnings/return_value_discarded=false +[display] + +window/stretch/mode="2d" +window/stretch/aspect="keep" + [gdnative] singletons=[ ] diff --git a/viewport/screen_capture/screen_capture.gd b/viewport/screen_capture/screen_capture.gd index 445cd598..212ed2d8 100644 --- a/viewport/screen_capture/screen_capture.gd +++ b/viewport/screen_capture/screen_capture.gd @@ -14,7 +14,7 @@ func _on_button_pressed(): # Retrieve the captured image var img = get_viewport().get_texture().get_data() - + # Flip it on the y-axis (because it's flipped) img.flip_y() diff --git a/visual_script/visual_pong/ball.png.import b/visual_script/visual_pong/ball.png.import index a5df6b66..f239f238 100644 --- a/visual_script/visual_pong/ball.png.import +++ b/visual_script/visual_pong/ball.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/visual_script/visual_pong/left_pallete.png.import b/visual_script/visual_pong/left_pallete.png.import index c546b14c..a80bf581 100644 --- a/visual_script/visual_pong/left_pallete.png.import +++ b/visual_script/visual_pong/left_pallete.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/visual_script/visual_pong/pong.tscn b/visual_script/visual_pong/pong.tscn index c7c4f860..5630fdab 100644 --- a/visual_script/visual_pong/pong.tscn +++ b/visual_script/visual_pong/pong.tscn @@ -23,6 +23,14 @@ extents = Vector2( 320, 10 ) [node name="game" type="Node2D"] +[node name="TextureRect" type="ColorRect" parent="."] +margin_right = 640.0 +margin_bottom = 400.0 +color = Color( 0.141176, 0.152941, 0.164706, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + [node name="left" type="Area2D" parent="."] position = Vector2( 67.6285, 192.594 ) script = ExtResource( 1 ) @@ -87,6 +95,9 @@ y_direction = -1.0 [node name="collision" type="CollisionShape2D" parent="floor"] 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"] [connection signal="area_entered" from="left_wall" to="left_wall" method="_on_area_entered"] diff --git a/visual_script/visual_pong/project.godot b/visual_script/visual_pong/project.godot index 4f1a3d36..c6b270c0 100644 --- a/visual_script/visual_pong/project.godot +++ b/visual_script/visual_pong/project.godot @@ -23,6 +23,8 @@ config/icon="res://icon.png" window/size/width=640 window/size/height=400 +window/stretch/mode="2d" +window/stretch/aspect="expand" stretch_2d=true [gdnative] @@ -55,4 +57,5 @@ right_move_up={ [rendering] +quality/2d/use_pixel_snap=true viewport/default_clear_color=Color( 0, 0, 0, 1 ) diff --git a/visual_script/visual_pong/right_pallete.png.import b/visual_script/visual_pong/right_pallete.png.import index d94086b3..4b442ffb 100644 --- a/visual_script/visual_pong/right_pallete.png.import +++ b/visual_script/visual_pong/right_pallete.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/visual_script/visual_pong/separator.png.import b/visual_script/visual_pong/separator.png.import index 32091d99..a8527c62 100644 --- a/visual_script/visual_pong/separator.png.import +++ b/visual_script/visual_pong/separator.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2