updated to use Godot 3.1

.gitignore

@@ -0,0 +1,2 @@
+.import
+*.import

GameScene.tscn

@@ -1,61 +1,40 @@
-[gd_scene load_steps=6 format=1]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://scripts/parentNode2D.gd" type="Script" id=1]
-[ext_resource path="res://textures/Background@2x.png" type="Texture" id=2]
-[ext_resource path="res://scripts/GameScene.gd" type="Script" id=3]
+[ext_resource path="res://scripts/GameScene.gd" type="Script" id=2]
+[ext_resource path="res://textures/Background@2x.png" type="Texture" id=3]
 [ext_resource path="res://scripts/GameLayer.gd" type="Script" id=4]
-[ext_resource path="res://Fonts/foo_shadow_34.fnt" type="BitmapFont" id=5]
 
 [node name="ParentNode2D" type="Node"]
-
-script/script = ExtResource( 1 )
+script = ExtResource( 1 )
 __meta__ = {
 "_edit_lock_": true
 }
-background = ExtResource( 2 )
-
-[node name="Background" type="TextureFrame" parent="."]
-
-focus/ignore_mouse = true
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = -20.0
-margin/top = -56.0
-margin/right = 620.0
-margin/bottom = 1080.0
-texture = ExtResource( 2 )
-stretch_mode = 0
 
 [node name="GameScene" type="Node2D" parent="."]
+position = Vector2( 280, 360 )
+script = ExtResource( 2 )
 
-script/script = ExtResource( 3 )
-jsonFile = "res://Level/Level_1.json"
+[node name="Sprite" type="Sprite" parent="GameScene"]
+texture = ExtResource( 3 )
 
 [node name="GameLayer" type="Node2D" parent="GameScene"]
-
-transform/pos = Vector2( 300, 512 )
-script/script = ExtResource( 4 )
+script = ExtResource( 4 )
 
 [node name="TilesLayer" type="Node2D" parent="GameScene/GameLayer"]
 
 [node name="CookiesLayer" type="Node2D" parent="GameScene/GameLayer"]
 
 [node name="Shuffle" type="Button" parent="GameScene"]
-
-focus/ignore_mouse = false
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = 202.0
-margin/top = 960.0
-margin/right = 414.0
-margin/bottom = 1016.0
-custom_fonts/font = ExtResource( 5 )
-toggle_mode = false
+margin_left = -60.0
+margin_top = 400.0
+margin_right = 60.0
+margin_bottom = 438.0
+rect_min_size = Vector2( 120, 40 )
+hint_tooltip = "Shuffles all pastries on the game board"
+focus_mode = 0
+mouse_default_cursor_shape = 2
+custom_colors/font_color_pressed = Color( 0, 0, 0, 1 )
 enabled_focus_mode = 0
-shortcut = null
 text = "Shuffle"
-flat = false
-
 

project.godot

@@ -0,0 +1,44 @@
+; Engine configuration file.
+; It's best edited using the editor UI and not directly,
+; since the parameters that go here are not all obvious.
+;
+; Format:
+;   [section] ; section goes between []
+;   param=value ; assign values to parameters
+
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
+
+[application]
+
+config/name="happy crush"
+run/main_scene="res://GameScene.tscn"
+name="Happy smash"
+main_scene="res://GameScene.tscn"
+boot_splash="res://splash.png"
+icon="res://icon.png"
+
+[autoload]
+
+mainRes="*res://scripts/preloadResources.gd"
+global="*res://scripts/global.gd"
+
+[display]
+
+window/size/width=560
+window/size/height=880
+window/size/resizable=false
+window/handheld/orientation="portrait"
+borderless_window=false
+height=1028
+test_height=514
+width=600
+test_width=300
+stretch_mode="2d"
+resizable=true
+stretch_aspect="keep"
+orientation="portrait"

scene/bubbleEffect.tscn

@@ -1,33 +1,27 @@
-[gd_scene load_steps=3 format=1]
+[gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://FX/player_shield.png" type="Texture" id=1]
+[ext_resource path="res://FX/bubble.png" type="Texture" id=1]
 
 [sub_resource type="Animation" id=1]
-
-resource/name = "scaleUpDown"
 length = 0.4
 loop = true
-step = 0.1
 tracks/0/type = "value"
 tracks/0/path = NodePath(".:transform/scale")
 tracks/0/interp = 1
+tracks/0/loop_wrap = true
 tracks/0/imported = false
-tracks/0/keys = { "times":FloatArray( 0, 0.2, 0.4 ), "transitions":FloatArray( 1, 1, 1 ), "update":0, "values":[ Vector2( 0.8, 0.8 ), Vector2( 1, 1 ), Vector2( 0.8, 0.8 ) ] }
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.2, 0.4 ),
+"transitions": PoolRealArray( 1, 1, 1 ),
+"update": 0,
+"values": [ Vector2( 0.8, 0.8 ), Vector2( 1, 1 ), Vector2( 0.8, 0.8 ) ]
+}
 
 [node name="AnimatedSprite" type="Sprite"]
-
-transform/scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 1 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-
-playback/process_mode = 1
-playback/default_blend_time = 0.0
-root/root = NodePath("..")
-anims/scaleUpDown = SubResource( 1 )
-playback/active = true
-playback/speed = 1.0
-blend_times = [  ]
 autoplay = "scaleUpDown"
-
+anims/scaleUpDown = SubResource( 1 )
 

scene/explode_star.tscn

@@ -1,37 +1,32 @@
-[gd_scene load_steps=3 format=1]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://FX/star_particle01_16.png" type="Texture" id=1]
 
-[sub_resource type="ColorRamp" id=1]
+[sub_resource type="Curve" id=1]
+_data = [ Vector2( 0.0105601, 0.672666 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.118266 ), 0.0, 0.0, 0, 0 ]
 
-offsets = FloatArray( 0, 1 )
-colors = ColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
+[sub_resource type="CurveTexture" id=2]
+curve = SubResource( 1 )
 
-[node name="Particles2D" type="Particles2D"]
-
-config/amount = 8
-config/lifetime = 1.5
-config/preprocess = 0.001
-config/explosiveness = 0.1
-config/texture = ExtResource( 1 )
-params/direction = 180.0
-params/spread = 180.0
-params/linear_velocity = 50.0
-params/spin_velocity = 50.0
-params/orbit_velocity = 0.0
-params/gravity_direction = 0.0
-params/gravity_strength = 0.0
-params/radial_accel = 10.0
-params/tangential_accel = 10.0
-params/damping = 45.0
-params/initial_angle = 0.0
-params/initial_size = 0.6
-params/final_size = 0.2
-params/hue_variation = 0.0
-params/anim_speed_scale = 1.0
-params/anim_initial_pos = 1.0
-randomness/linear_velocity = 0.2
-randomness/spin_velocity = 0.5
-color/color_ramp = SubResource( 1 )
+[sub_resource type="ParticlesMaterial" id=3]
+flag_disable_z = true
+spread = 180.0
+gravity = Vector3( 0, 0, 0 )
+initial_velocity = 50.0
+angular_velocity = 50.0
+angular_velocity_random = 0.5
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+radial_accel = 10.0
+tangential_accel = 10.0
+damping = 45.0
+angle = 180.0
+scale_curve = SubResource( 2 )
 
+[node name="Particles2D" type="Particles2D"]
+lifetime = 1.5
+explosiveness = 0.1
+randomness = 0.5
+process_material = SubResource( 3 )
+texture = ExtResource( 1 )
 

scene/gradient_White_trans.tres

@@ -0,0 +1,5 @@
+[gd_resource type="Gradient" format=2]
+
+[resource]
+colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 0 )
+

scene/tail.tscn

@@ -1,31 +1,25 @@
-[gd_scene load_steps=3 format=1]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://FX/snow-ball-white.png" type="Texture" id=1]
-[ext_resource path="res://scene/colorRamp_White_trans.tres" type="ColorRamp" id=2]
 
-[node name="Particles2D" type="Particles2D"]
+[sub_resource type="Curve" id=1]
+_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.0733891 ), -2.13179, 0.0, 0, 0 ]
+
+[sub_resource type="CurveTexture" id=2]
+curve = SubResource( 1 )
 
-visibility/blend_mode = 1
-transform/scale = Vector2( 1, 1.02251 )
-config/amount = 32
-config/lifetime = 2.0
-config/texture = ExtResource( 1 )
-params/direction = 90.0
-params/spread = 0.0
-params/linear_velocity = 30.0
-params/spin_velocity = 0.0
-params/orbit_velocity = 0.0
-params/gravity_direction = 0.0
-params/gravity_strength = 0.0
-params/radial_accel = 0.0
-params/tangential_accel = 0.0
-params/damping = 0.0
-params/initial_angle = 0.0
-params/initial_size = 1.0
-params/final_size = 0.2
-params/hue_variation = 0.0
-params/anim_speed_scale = 1.0
-params/anim_initial_pos = 0.0
-color/color_ramp = ExtResource( 2 )
+[sub_resource type="ParticlesMaterial" id=3]
+flag_disable_z = true
+gravity = Vector3( 0, 98, 0 )
+initial_velocity = 30.0
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+angle = 90.0
+scale_curve = SubResource( 2 )
 
+[node name="Particles2D" type="Particles2D"]
+amount = 32
+lifetime = 2.0
+process_material = SubResource( 3 )
+texture = ExtResource( 1 )