Merge pull request #553 from aaronfranke/iap-readme

Fix README files, especially in Android IAP demos

.editorconfig

@@ -0,0 +1,11 @@
+# Top-most EditorConfig file.
+root = true
+
+# Unix-style newlines with a newline ending every file.
+[*.cs]
+insert_final_newline = true
+csharp_space_after_cast = false
+indent_size = 4
+
+[*.csproj]
+indent_size = 2

.gitattributes

@@ -0,0 +1,4 @@
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf
+
+*.hdr binary

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-patreon: godotengine
-custom: https://godotengine.org/donate

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/static_checks.yml

@@ -0,0 +1,19 @@
+name: Static Checks
+on: [push, pull_request]
+
+jobs:
+  format:
+    name: File formatting (file_format.sh)
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq dos2unix recode
+
+      - name: File formatting checks (file_format.sh)
+        run: |
+          bash ./file_format.sh

.gitignore

@@ -1,10 +1,17 @@
+# Godot 4+ specific ignores
+.godot/
+
 # Godot-specific ignores
 .import/
 export.cfg
 export_presets.cfg
 
+# Imported translations (automatically generated from CSV files)
+*.translation
+
 # Mono-specific ignores
 .mono/
+data_*/
 mono_crash.*.json
 
 # System/tool-specific ignores

.travis.yml

@@ -1,18 +0,0 @@
-dist: bionic
-
-stages:
-  - build
-
-matrix:
-  include:
-    - name: Static checks (format.sh)
-      stage: build
-      os: linux
-      addons:
-        apt:
-          packages:
-            - dos2unix
-            - recode
-
-script:
-  - bash ./format.sh

2d/README.md

@@ -0,0 +1,8 @@
+# 2D Demos
+
+These demos are all 2D, but otherwise do not have a common theme.
+
+Languages: Most have GDScript, some have
+[GDSL](https://docs.godotengine.org/en/latest/tutorials/shaders/shader_reference/shading_language.html)
+
+Renderers: 6 of them are GLES 3, but most are GLES 2

2d/dodge_the_creeps/HUD.gd

@@ -13,7 +13,7 @@ func show_game_over():
 	yield($MessageTimer, "timeout")
 	$MessageLabel.text = "Dodge the\nCreeps"
 	$MessageLabel.show()
-	yield(get_tree().create_timer(1), 'timeout')
+	yield(get_tree().create_timer(1), "timeout")
 	$StartButton.show()
 
 

2d/dodge_the_creeps/Main.gd

@@ -1,6 +1,6 @@
 extends Node
 
-export (PackedScene) var Mob
+export(PackedScene) var mob_scene
 var score
 
 func _ready():
@@ -16,6 +16,7 @@ func game_over():
 
 
 func new_game():
+	get_tree().call_group("mobs", "queue_free")
 	score = 0
 	$Player.start($StartPosition.position)
 	$StartTimer.start()
@@ -25,14 +26,27 @@ func new_game():
 
 
 func _on_MobTimer_timeout():
-	$MobPath/MobSpawnLocation.offset = randi()
-	var mob = Mob.instance()
+	# Choose a random location on Path2D.
+	var mob_spawn_location = get_node("MobPath/MobSpawnLocation")
+	mob_spawn_location.offset = randi()
+
+	# Create a Mob instance and add it to the scene.
+	var mob = mob_scene.instance()
 	add_child(mob)
-	var direction = $MobPath/MobSpawnLocation.rotation + PI / 2
-	mob.position = $MobPath/MobSpawnLocation.position
+
+	# Set the mob's direction perpendicular to the path direction.
+	var direction = mob_spawn_location.rotation + PI / 2
+
+	# Set the mob's position to a random location.
+	mob.position = mob_spawn_location.position
+
+	# Add some randomness to the direction.
 	direction += rand_range(-PI / 4, PI / 4)
 	mob.rotation = direction
-	mob.linear_velocity = Vector2(rand_range(mob.min_speed, mob.max_speed), 0).rotated(direction)
+
+	# Choose the velocity.
+	var velocity = Vector2(rand_range(mob.min_speed, mob.max_speed), 0)
+	mob.linear_velocity = velocity.rotated(direction)
 
 
 func _on_ScoreTimer_timeout():

2d/dodge_the_creeps/Main.tscn

@@ -14,7 +14,7 @@ _data = {
 
 [node name="Main" type="Node"]
 script = ExtResource( 1 )
-Mob = ExtResource( 2 )
+mob_scene = ExtResource( 2 )
 
 [node name="ColorRect" type="ColorRect" parent="."]
 anchor_right = 1.0

2d/dodge_the_creeps/Mob.gd

@@ -3,11 +3,16 @@ extends RigidBody2D
 #warning-ignore-all:unused_class_variable
 export var min_speed = 150
 export var max_speed = 250
-var mob_types = ["walk", "swim", "fly"]
 
 func _ready():
+	$AnimatedSprite.playing = true
+	var mob_types = $AnimatedSprite.frames.get_animation_names()
 	$AnimatedSprite.animation = mob_types[randi() % mob_types.size()]
 
 
 func _on_VisibilityNotifier2D_screen_exited():
 	queue_free()
+
+
+func _on_start_game():
+	queue_free()

2d/dodge_the_creeps/Mob.tscn

@@ -10,11 +10,6 @@
 
 [sub_resource type="SpriteFrames" id=1]
 animations = [ {
-"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
-"loop": true,
-"name": "fly",
-"speed": 3.0
-}, {
 "frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
 "loop": true,
 "name": "walk",
@@ -24,13 +19,20 @@ animations = [ {
 "loop": true,
 "name": "swim",
 "speed": 4.0
+}, {
+"frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
+"loop": true,
+"name": "fly",
+"speed": 3.0
 } ]
 
 [sub_resource type="CapsuleShape2D" id=2]
 radius = 35.2706
 height = 23.3281
 
-[node name="Mob" type="RigidBody2D"]
+[node name="Mob" type="RigidBody2D" groups=[
+"mobs",
+]]
 collision_mask = 0
 gravity_scale = 0.0
 script = ExtResource( 1 )
@@ -42,8 +44,6 @@ __meta__ = {
 scale = Vector2( 0.75, 0.75 )
 frames = SubResource( 1 )
 animation = "walk"
-frame = 1
-playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 rotation = 1.5708

2d/dodge_the_creeps/Player.gd

@@ -2,8 +2,8 @@ extends Area2D
 
 signal hit
 
-export var speed = 400
-var screen_size
+export var speed = 400 # How fast the player will move (pixels/sec).
+var screen_size # Size of the game window.
 
 func _ready():
 	screen_size = get_viewport_rect().size
@@ -11,15 +11,22 @@ func _ready():
 
 
 func _process(delta):
-	var velocity = Vector2()
-	velocity.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
-	velocity.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
-	
+	var velocity = Vector2.ZERO # The player's movement vector.
+	if Input.is_action_pressed("move_right"):
+		velocity.x += 1
+	if Input.is_action_pressed("move_left"):
+		velocity.x -= 1
+	if Input.is_action_pressed("move_down"):
+		velocity.y += 1
+	if Input.is_action_pressed("move_up"):
+		velocity.y -= 1
+
 	if velocity.length() > 0:
 		velocity = velocity.normalized() * speed
 		$AnimatedSprite.play()
 	else:
 		$AnimatedSprite.stop()
+
 	position += velocity * delta
 	position.x = clamp(position.x, 0, screen_size.x)
 	position.y = clamp(position.y, 0, screen_size.y)
@@ -40,6 +47,7 @@ func start(pos):
 
 
 func _on_Player_body_entered(_body):
-	hide()
+	hide() # Player disappears after being hit.
 	emit_signal("hit")
+	# Must be deferred as we can't change physics properties on a physics callback.
 	$CollisionShape2D.set_deferred("disabled", true)

2d/dodge_the_creeps/README.md

@@ -14,14 +14,16 @@ Renderer: GLES 3 (particles are not available in GLES 2)
 
 Note: There is a C# version available [here](https://github.com/godotengine/godot-demo-projects/tree/master/mono/dodge_the_creeps).
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/515
+
 ## Screenshots
 
 ![GIF from the documentation](https://docs.godotengine.org/en/latest/_images/dodge_preview.gif)
 
-## Licenses
+## Copying
 
 `art/House In a Forest Loop.ogg` Copyright © 2012 [HorrorPen](https://opengameart.org/users/horrorpen), [CC-BY 3.0: Attribution](http://creativecommons.org/licenses/by/3.0/). Source: https://opengameart.org/content/loop-house-in-a-forest
 
-Images are from "Abstract Platformer". Copyright © 2010-2020 kenney.nl, [CC0 1.0 Universal](http://creativecommons.org/publicdomain/zero/1.0/). Source: https://www.kenney.nl/assets/abstract-platformer
+Images are from "Abstract Platformer". Created in 2016 by kenney.nl, [CC0 1.0 Universal](http://creativecommons.org/publicdomain/zero/1.0/). Source: https://www.kenney.nl/assets/abstract-platformer
 
 Font is "Xolonium". Copyright &copy; 2011-2016 Severin Meyer <sev.ch@web.de>, with Reserved Font Name Xolonium, SIL open font license version 1.1. Details are in `fonts/LICENSE.txt`.

2d/dodge_the_creeps/project.godot

@@ -20,8 +20,8 @@ config/description="This is a simple game where your character must move
 and avoid the enemies for as long as possible.
 
 This is a finished version of the game featured in the 'Your first game'
-tutorial in the documentation, but ported to C#. For more details,
-consider following the tutorial in the documentation."
+tutorial in the documentation. For more details, consider
+following the tutorial in the documentation."
 run/main_scene="res://Main.tscn"
 config/icon="res://icon.png"
 
@@ -64,7 +64,3 @@ move_down={
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
  ]
 }
-
-[rendering]
-
-environment/default_environment="res://default_env.tres"

2d/finite_state_machine/README.md

@@ -8,6 +8,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/516
+
 ## Why use a state machine
 
 States are common in games. You can use the pattern to:

2d/finite_state_machine/debug/Explanations.tscn

@@ -16,7 +16,7 @@ size_flags_vertical = 4
 custom_fonts/bold_font = ExtResource( 1 )
 custom_fonts/normal_font = ExtResource( 2 )
 bbcode_enabled = true
-bbcode_text = "This example shows how to apply the State programming pattern in GDscript, including Hierarchical States, and a pushdown automaton. 
+bbcode_text = "This example shows how to apply the State programming pattern in GDscript, including Hierarchical States, and a pushdown automaton.
 
 States are common in games. You can use the pattern to:
 
@@ -25,7 +25,7 @@ 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 [url=http://gameprogrammingpatterns.com/state.html]Game Programming Patterns ebook[/url]."
-text = "This example shows how to apply the State programming pattern in GDscript, including Hierarchical States, and a pushdown automaton. 
+text = "This example shows how to apply the State programming pattern in GDscript, including Hierarchical States, and a pushdown automaton.
 
 States are common in games. You can use the pattern to:
 

2d/finite_state_machine/debug/states_stack_displayer.gd

@@ -7,8 +7,8 @@ func _process(_delta):
 	var numbers = ""
 	var index = 0
 	for state in fsm_node.states_stack:
-		states_names += state.get_name() + '\n'
-		numbers += str(index) + '\n'
+		states_names += state.get_name() + "\n"
+		numbers += str(index) + "\n"
 		index += 1
 	$States.text = states_names
 	$Numbers.text = numbers

2d/finite_state_machine/default_env.tres

@@ -1,13 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

2d/finite_state_machine/player/bullet/bullet.gd

@@ -3,12 +3,14 @@ extends KinematicBody2D
 var direction = Vector2()
 export(float) var speed = 1000.0
 
+onready var root = get_tree().root
+
 func _ready():
 	set_as_toplevel(true)
 
 
 func _physics_process(delta):
-	if is_outside_view_bounds():
+	if not root.get_visible_rect().has_point(position):
 		queue_free()
 
 	var motion = direction * speed * delta
@@ -17,10 +19,5 @@ func _physics_process(delta):
 		queue_free()
 
 
-func is_outside_view_bounds():
-	return position.x > OS.get_screen_size().x or position.x < 0.0 \
-			or position.y > OS.get_screen_size().y or position.y < 0.0
-
-
 func _draw():
 	draw_circle(Vector2(), $CollisionShape2D.shape.radius, Color.white)

2d/finite_state_machine/player/bullet/bullet_spawner.gd

@@ -2,7 +2,7 @@ extends Node2D
 
 var bullet = preload("Bullet.tscn")
 
-func _input(event):
+func _unhandled_input(event):
 	if event.is_action_pressed("fire"):
 		fire(owner.look_direction)
 

2d/finite_state_machine/player/player_state_machine.gd

@@ -1,12 +1,18 @@
 extends "res://state_machine/state_machine.gd"
 
+onready var idle = $Idle
+onready var move = $Move
+onready var jump = $Jump
+onready var stagger = $Stagger
+onready var attack = $Attack
+
 func _ready():
 	states_map = {
-		"idle": $Idle,
-		"move": $Move,
-		"jump": $Jump,
-		"stagger": $Stagger,
-		"attack": $Attack,
+		"idle": idle,
+		"move": move,
+		"jump": jump,
+		"stagger": stagger,
+		"attack": attack,
 	}
 
 
@@ -16,16 +22,16 @@ func _change_state(state_name):
 		return
 	if state_name in ["stagger", "jump", "attack"]:
 		states_stack.push_front(states_map[state_name])
-	if state_name == "jump" and current_state == $Move:
-		$Jump.initialize($Move.speed, $Move.velocity)
+	if state_name == "jump" and current_state == move:
+		jump.initialize(move.speed, move.velocity)
 	._change_state(state_name)
 
 
-func _input(event):
+func _unhandled_input(event):
 	# Here we only handle input that can interrupt states, attacking in this case,
 	# otherwise we let the state node handle it.
 	if event.is_action_pressed("attack"):
-		if current_state in [$Attack, $Stagger]:
+		if current_state in [attack, stagger]:
 			return
 		_change_state("attack")
 		return

2d/finite_state_machine/player/states/motion/in_air/jump.gd

@@ -22,6 +22,7 @@ func initialize(speed, velocity):
 	max_horizontal_speed = speed if speed > 0.0 else base_max_horizontal_speed
 	enter_velocity = velocity
 
+
 func enter():
 	var input_direction = get_input_direction()
 	update_look_direction(input_direction)
@@ -31,6 +32,7 @@ func enter():
 
 	owner.get_node("AnimationPlayer").play("idle")
 
+
 func update(delta):
 	var input_direction = get_input_direction()
 	update_look_direction(input_direction)
@@ -40,6 +42,7 @@ func update(delta):
 	if height <= 0.0:
 		emit_signal("finished", "previous")
 
+
 func move_horizontally(delta, direction):
 	if direction:
 		horizontal_speed += air_acceleration * delta
@@ -53,6 +56,7 @@ func move_horizontally(delta, direction):
 
 	owner.move_and_slide(horizontal_velocity)
 
+
 func animate_jump_height(delta):
 	vertical_speed -= gravity * delta
 	height += vertical_speed * delta

2d/finite_state_machine/player/states/motion/motion.gd

@@ -7,9 +7,10 @@ func handle_input(event):
 
 
 func get_input_direction():
-	var input_direction = Vector2()
-	input_direction.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
-	input_direction.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
+	var input_direction = Vector2(
+			Input.get_action_strength("move_right") - Input.get_action_strength("move_left"),
+			Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
+	)
 	return input_direction
 
 

2d/finite_state_machine/player/weapon/sword.gd

@@ -59,7 +59,7 @@ func _change_state(new_state):
 	state = new_state
 
 
-func _input(event):
+func _unhandled_input(event):
 	if not state == States.ATTACK:
 		return
 	if attack_input_state != AttackInputStates.LISTENING:

2d/finite_state_machine/project.godot

@@ -26,6 +26,7 @@ config/icon="res://icon.png"
 
 window/size/width=1280
 window/size/height=720
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 
@@ -101,4 +102,3 @@ attack={
 [rendering]
 
 quality/driver/driver_name="GLES2"
-environment/default_environment="res://default_env.tres"

2d/finite_state_machine/state_machine/state_machine.gd

@@ -21,7 +21,9 @@ func _ready():
 	if not start_state:
 		start_state = get_child(0).get_path()
 	for child in get_children():
-		child.connect("finished", self, "_change_state")
+		var err = child.connect("finished", self, "_change_state")
+		if err:
+			printerr(err)
 	initialize(start_state)
 
 
@@ -41,7 +43,7 @@ func set_active(value):
 		current_state = null
 
 
-func _input(event):
+func _unhandled_input(event):
 	current_state.handle_input(event)
 
 

2d/gd_paint/README.md

@@ -8,6 +8,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/517
+
 ## Screenshots
 
 ![Screenshot](screenshots/gdpaint.png)

2d/gd_paint/default_env.tres

@@ -1,14 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-sun_energy = 16.0
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

2d/gd_paint/paint_control.gd

@@ -9,10 +9,15 @@ const IMAGE_SIZE = Vector2(930, 720)
 
 # Enums for the various modes and brush shapes that can be applied.
 enum BrushModes {
-	PENCIL, ERASER, CIRCLE_SHAPE, RECTANGLE_SHAPE
+	PENCIL,
+	ERASER,
+	CIRCLE_SHAPE,
+	RECTANGLE_SHAPE,
 }
+
 enum BrushShapes {
-	RECTANGLE, CIRCLE
+	RECTANGLE,
+	CIRCLE,
 }
 
 # The top-left position of the canvas.
@@ -51,20 +56,20 @@ func _ready():
 
 func _process(_delta):
 	var mouse_pos = get_viewport().get_mouse_position()
-	
+
 	# Check if the mouse is currently inside the canvas/drawing-area.
 	is_mouse_in_drawing_area = false
 	if mouse_pos.x > TL_node.global_position.x:
 		if mouse_pos.y > TL_node.global_position.y:
 			is_mouse_in_drawing_area = true
-	
+
 	if Input.is_mouse_button_pressed(BUTTON_LEFT):
 		# If we do not have a position for when the mouse was first clicked, then this must
 		# be the first time is_mouse_button_pressed has been called since the mouse button was
 		# released, so we need to store the position.
 		if mouse_click_start_pos == null:
 			mouse_click_start_pos = mouse_pos
-		
+
 		# If the mouse is inside the canvas and the mouse is 1px away from the position of the mouse last _process call.
 		if check_if_mouse_is_inside_canvas():
 			if mouse_pos.distance_to(last_mouse_pos) >= 1:
@@ -77,11 +82,11 @@ func _process(_delta):
 						undo_element_list_num = brush_data_list.size()
 					# Add the brush object to draw_elements_array.
 					add_brush(mouse_pos, brush_mode)
-	
+
 	else:
 		# We've finished our stroke, so we can set a new undo (if a new storke is made).
 		undo_set = false
-		
+
 		# If the mouse is inside the canvas.
 		if check_if_mouse_is_inside_canvas():
 			# If we're using either the circle shape mode, or the rectangle shape mode, then
@@ -94,7 +99,7 @@ func _process(_delta):
 		# Since we've released the left mouse, we need to get a new mouse_click_start_pos next time
 		#is_mouse_button_pressed is true.
 		mouse_click_start_pos = null
-	
+
 	# Store mouse_pos as last_mouse_pos now that we're done with _process.
 	last_mouse_pos = mouse_pos
 
@@ -108,7 +113,7 @@ func check_if_mouse_is_inside_canvas():
 		if mouse_click_start_pos.x > TL_node.global_position.x:
 			if mouse_click_start_pos.y > TL_node.global_position.y:
 				# Make sure the current mouse position is inside the canvas.
-				if is_mouse_in_drawing_area == true:
+				if is_mouse_in_drawing_area:
 					return true
 	return false
 
@@ -117,17 +122,17 @@ func undo_stroke():
 	# Only undo a stroke if we have one.
 	if undo_element_list_num == UNDO_NONE:
 		return
-	
+
 	# If we are undoing a shape, then we can just remove the latest brush.
 	if undo_element_list_num == UNDO_MODE_SHAPE:
 		if brush_data_list.size() > 0:
 			brush_data_list.remove(brush_data_list.size() - 1)
-		
+
 		# Now that we've undone a shape, we cannot undo again until another stoke is added.
 		undo_element_list_num = UNDO_NONE
 		# NOTE: if we only had shape brushes, then we could remove the above line and could let the user
 		# undo until we have a empty element list.
-	
+
 	# Otherwise we're removing a either a pencil stroke or a eraser stroke.
 	else:
 		# Figure out how many elements/brushes we've added in the last stroke.
@@ -136,7 +141,7 @@ func undo_stroke():
 		#warning-ignore:unused_variable
 		for elment_num in range(0, elements_to_remove):
 			brush_data_list.pop_back()
-		
+
 		# Now that we've undone a stoke, we cannot undo again until another stoke is added.
 		undo_element_list_num = UNDO_NONE
 
@@ -147,7 +152,7 @@ func undo_stroke():
 func add_brush(mouse_pos, type):
 	# Make new brush dictionary that will hold all of the data we need for the brush.
 	var new_brush = {}
-	
+
 	# Populate the dictionary with values based on the global brush variables.
 	# We will override these as needed if the brush is a rectange or circle.
 	new_brush.brush_type = type
@@ -155,13 +160,13 @@ func add_brush(mouse_pos, type):
 	new_brush.brush_shape = brush_shape
 	new_brush.brush_size = brush_size
 	new_brush.brush_color = brush_color
-	
+
 	# If the new bursh is a rectangle shape, we need to calculate the top left corner of the rectangle and the
 	# bottom right corner of the rectangle.
 	if type == BrushModes.RECTANGLE_SHAPE:
 		var TL_pos = Vector2()
 		var BR_pos = Vector2()
-		
+
 		# Figure out the left and right positions of the corners and assign them to the proper variable.
 		if mouse_pos.x < mouse_click_start_pos.x:
 			TL_pos.x = mouse_pos.x
@@ -169,7 +174,7 @@ func add_brush(mouse_pos, type):
 		else:
 			TL_pos.x = mouse_click_start_pos.x
 			BR_pos.x = mouse_pos.x
-		
+
 		# Figure out the top and bottom positions of the corners and assign them to the proper variable.
 		if mouse_pos.y < mouse_click_start_pos.y:
 			TL_pos.y = mouse_pos.y
@@ -177,11 +182,11 @@ func add_brush(mouse_pos, type):
 		else:
 			TL_pos.y = mouse_click_start_pos.y
 			BR_pos.y = mouse_pos.y
-		
+
 		# Assign the positions to the brush.
 		new_brush.brush_pos = TL_pos
 		new_brush.brush_shape_rect_pos_BR = BR_pos
-	
+
 	# If the brush isa circle shape, then we need to calculate the radius of the circle.
 	if type == BrushModes.CIRCLE_SHAPE:
 		# Get the center point inbetween the mouse position and the position of the mouse when we clicked.
@@ -190,7 +195,7 @@ func add_brush(mouse_pos, type):
 		# the center to the top/bottom positon of the mouse.
 		new_brush.brush_pos = center_pos
 		new_brush.brush_shape_circle_radius = center_pos.distance_to(Vector2(center_pos.x, mouse_pos.y))
-	
+
 	# Add the brush and update/draw all of the brushes.
 	brush_data_list.append(new_brush)
 	update()
@@ -214,7 +219,7 @@ func _draw():
 			BrushModes.ERASER:
 				# NOTE: this is a really cheap way of erasing that isn't really erasing!
 				# However, this gives similar results in a fairy simple way!
-				
+
 				# Erasing works exactly the same was as pencil does for both the rectangle shape and the circle shape,
 				# but instead of using brush.brush_color, we instead use bg_color instead.
 				if brush.brush_shape == BrushShapes.RECTANGLE:
@@ -232,18 +237,16 @@ func _draw():
 				draw_circle(brush.brush_pos, brush.brush_shape_circle_radius, brush.brush_color)
 
 
-
 func save_picture(path):
-	# Wait a couple frames so the save dialog isn't in the way.
-	yield (get_tree(), "idle_frame")
-	yield (get_tree(), "idle_frame")
-	
+	# Wait until the frame has finished before getting the texture.
+	yield(VisualServer, "frame_post_draw")
+
 	# Get the viewport image.
 	var img = get_viewport().get_texture().get_data()
 	# Crop the image so we only have canvas area.
 	var cropped_image = img.get_rect(Rect2(TL_node.global_position, IMAGE_SIZE))
 	# Flip the image on the Y-axis (it's flipped upside down by default).
 	cropped_image.flip_y()
-	
+
 	# Save the image with the passed in path we got from the save dialog.
 	cropped_image.save_png(path)

2d/gd_paint/paint_root.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://PaintControl.gd" type="Script" id=1]
-[ext_resource path="res://ToolsPanel.gd" type="Script" id=2]
-[ext_resource path="res://PaintTools.png" type="Texture" id=3]
+[ext_resource path="res://paint_control.gd" type="Script" id=1]
+[ext_resource path="res://tools_panel.gd" type="Script" id=2]
+[ext_resource path="res://paint_tools.png" type="Texture" id=3]
 
 [sub_resource type="StyleBoxFlat" id=1]
 bg_color = Color( 1, 1, 1, 1 )

2d/gd_paint/paint_tools.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/left_pallete.png-bc33611074a0f886142e37c77bd2545a.stex"
+path="res://.import/paint_tools.png-224b64b7ddb26189a369199f6d686b79.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://left_pallete.png"
-dest_files=[ "res://.import/left_pallete.png-bc33611074a0f886142e37c77bd2545a.stex" ]
+source_file="res://paint_tools.png"
+dest_files=[ "res://.import/paint_tools.png-224b64b7ddb26189a369199f6d686b79.stex" ]
 
 [params]
 

2d/gd_paint/project.godot

@@ -19,13 +19,14 @@ config/name="GD Paint"
 config/description="GD Paint is a simple image editor made using Godot and GDScript.
 It supports different types of 'brushes': a basic pen/pencil
 and eraser, as well as a rectangle and a circle brush."
-run/main_scene="res://Paint_root.tscn"
+run/main_scene="res://paint_root.tscn"
 config/icon="res://icon.png"
 
 [display]
 
 window/size/width=1280
 window/size/height=720
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="keep"
 
@@ -36,4 +37,3 @@ singletons=[  ]
 [rendering]
 
 quality/driver/driver_name="GLES2"
-environment/default_environment="res://default_env.tres"

2d/gd_paint/tools_panel.gd

@@ -1,20 +1,16 @@
 extends Panel
 
-var paint_control
-
 onready var brush_settings = $BrushSettings
-onready var label_tools = $LabelTools
-onready var label_brush_size = $BrushSettings/LabelBrushSize
-onready var label_brush_shape = $BrushSettings/LabelBrushShape
+onready var label_brush_size = brush_settings.get_node(@"LabelBrushSize")
+onready var label_brush_shape = brush_settings.get_node(@"LabelBrushShape")
 onready var label_stats = $LabelStats
+onready var label_tools = $LabelTools
 
-var save_dialog
+onready var _parent = get_parent()
+onready var save_dialog = _parent.get_node(@"SaveFileDialog")
+onready var paint_control = _parent.get_node(@"PaintControl")
 
 func _ready():
-	# Get PaintControl and SaveFileDialog.
-	paint_control = get_parent().get_node("PaintControl")
-	save_dialog = get_parent().get_node("SaveFileDialog")
-
 	# warning-ignore-all:return_value_discarded
 	# Assign all of the needed signals for the oppersation buttons.
 	$ButtonUndo.connect("pressed", self, "button_pressed", ["undo_stroke"])
@@ -34,7 +30,7 @@ func _ready():
 	$ColorPickerBackground.connect("color_changed", self, "background_color_changed")
 	$BrushSettings/HScrollBarBrushSize.connect("value_changed", self, "brush_size_changed")
 
-	# Assign the 'file_selected' signal in SaveFileDialog.
+	# Assign the "file_selected" signal in SaveFileDialog.
 	save_dialog.connect("file_selected", self, "save_file_selected")
 
 	# Set physics process so we can update the status label.
@@ -50,7 +46,7 @@ func button_pressed(button_name):
 	# If a brush mode button is pressed.
 	var tool_name = null
 	var shape_name = null
-	
+
 	if button_name == "mode_pencil":
 		paint_control.brush_mode = paint_control.BrushModes.PENCIL
 		brush_settings.modulate = Color(1, 1, 1, 1)
@@ -84,7 +80,7 @@ func button_pressed(button_name):
 		save_dialog.popup_centered()
 	elif button_name == "undo_stroke":
 		paint_control.undo_stroke()
-	
+
 	# Update the labels (in case the brush mode or brush shape has changed).
 	if tool_name != null:
 		label_tools.text = "Selected tool: " + tool_name

2d/hdr/README.md

@@ -9,6 +9,8 @@ Language: GDScript
 
 Renderer: GLES 3 (HDR is not available in GLES 2)
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/110
+
 ## Screenshots
 
 ![Screenshot](screenshots/left.png)

2d/hdr/beach_cave.gd

@@ -4,7 +4,7 @@ const CAVE_LIMIT = 1000
 
 onready var cave = $Cave
 
-func _input(event):
+func _unhandled_input(event):
 	if event is InputEventMouseMotion and event.button_mask > 0:
 		var rel_x = event.relative.x
 		var cavepos = cave.position

2d/hdr/project.godot

@@ -28,6 +28,7 @@ run/name=""
 
 window/size/width=1080
 window/size/height=720
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

2d/hexagonal_map/README.md

@@ -6,6 +6,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/111
+
 ## Screenshots
 
 ![Screenshot](screenshots/hex.png)

2d/hexagonal_map/project.godot

@@ -22,6 +22,7 @@ config/icon="res://icon.png"
 
 [display]
 
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

2d/hexagonal_map/troll.gd

@@ -1,12 +1,13 @@
 extends KinematicBody2D
 
 const MOTION_SPEED = 160 # Pixels/second.
+const TAN30DEG = tan(deg2rad(30))
 
 func _physics_process(_delta):
 	var motion = Vector2()
 	motion.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
 	motion.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
-	motion.y *= 0.57735056839 # tan(30 degrees).
+	motion.y *= TAN30DEG
 	motion = motion.normalized() * MOTION_SPEED
 	#warning-ignore:return_value_discarded
 	move_and_slide(motion)

2d/hexagonal_map/troll.tscn

@@ -9,7 +9,7 @@ radius = 16.0
 [node name="Troll" type="KinematicBody2D"]
 script = ExtResource( 1 )
 
-[node name="Sprite" type="Sprite" parent="."]
+[node name="Sprite2D" type="Sprite" parent="."]
 texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

2d/instancing/README.md

@@ -1,12 +1,14 @@
 # Instancing Demo
 
 A demo showing how to use scene instancing to
-make many duplicates of the same object. 
+make many duplicates of the same object.
 
 Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/148
+
 ## Screenshots
 
 ![Screenshot](screenshots/instancing.png)

2d/instancing/project.godot

@@ -24,6 +24,7 @@ config/icon="res://icon.png"
 [display]
 
 window/size/width=800
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

2d/isometric/README.md

@@ -3,12 +3,14 @@
 This demo shows a traditional isometric view with depth sorting.
 
 A character can move around the level and will also slide around objects,
-as well as be occluded when standing in front or behind them. 
+as well as be occluded when standing in front or behind them.
 
 Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/112
+
 ## How does it work?
 
 The level uses a [`TileMap`](https://docs.godotengine.org/en/latest/classes/class_tilemap.html#class-tilemap)

2d/isometric/project.godot

@@ -25,6 +25,7 @@ config/icon="res://icon.png"
 
 [display]
 
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

2d/isometric/tileset.tres

@@ -20,6 +20,10 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 0/tile_mode = 0
 0/occluder_offset = Vector2( 67.5, 52.5 )
 0/navigation_offset = Vector2( 67.5, 52.5 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape_one_way = false
+0/shape_one_way_margin = 0.0
 0/shapes = [  ]
 0/z_index = 0
 1/name = "Base2"
@@ -30,6 +34,10 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 1/tile_mode = 0
 1/occluder_offset = Vector2( 67.5, 52.5 )
 1/navigation_offset = Vector2( 67.5, 52.5 )
+1/shape_offset = Vector2( 0, 0 )
+1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape_one_way = false
+1/shape_one_way_margin = 0.0
 1/shapes = [  ]
 1/z_index = 0
 2/name = "Wall"
@@ -40,6 +48,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 2/tile_mode = 0
 2/occluder_offset = Vector2( 70, 70 )
 2/navigation_offset = Vector2( 70, 70 )
+2/shape_offset = Vector2( 70, 70 )
+2/shape_transform = Transform2D( 1, 0, 0, 1, 70, 70 )
+2/shape = SubResource( 1 )
+2/shape_one_way = false
+2/shape_one_way_margin = 1.0
 2/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
@@ -56,6 +69,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 3/tile_mode = 0
 3/occluder_offset = Vector2( 27.5, 47.5 )
 3/navigation_offset = Vector2( 27.5, 47.5 )
+3/shape_offset = Vector2( 29.5, 47.5 )
+3/shape_transform = Transform2D( 1, 0, 0, 1, 29.5, 47.5 )
+3/shape = SubResource( 2 )
+3/shape_one_way = false
+3/shape_one_way_margin = 1.0
 3/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
@@ -72,6 +90,11 @@ points = PoolVector2Array( -40, 16, 24, -16, 40, -8, -24, 24 )
 4/tile_mode = 0
 4/occluder_offset = Vector2( 42.5, 55 )
 4/navigation_offset = Vector2( 42.5, 55 )
+4/shape_offset = Vector2( 42.5, 55 )
+4/shape_transform = Transform2D( 1, 0, 0, 1, 42.5, 55 )
+4/shape = SubResource( 3 )
+4/shape_one_way = false
+4/shape_one_way_margin = 1.0
 4/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,

2d/isometric/troll.gd

@@ -6,7 +6,7 @@ func _physics_process(_delta):
 	var motion = Vector2()
 	motion.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
 	motion.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
-	motion.y *= 0.5
+	motion.y /= 2
 	motion = motion.normalized() * MOTION_SPEED
 	#warning-ignore:return_value_discarded
 	move_and_slide(motion)

2d/kinematic_character/README.md

@@ -9,6 +9,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/113
+
 ## Screenshots
 
 ![Screenshot](screenshots/kinematic.png)

2d/kinematic_character/project.godot

@@ -26,6 +26,7 @@ config/icon="res://icon.png"
 
 window/size/width=530
 window/size/height=495
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 stretch/aspect="keep"

2d/light2d_as_mask/README.md

@@ -6,6 +6,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/115
+
 ## Screenshots
 
 ![Screenshot](screenshots/mask.png)

2d/light2d_as_mask/project.godot

@@ -22,6 +22,7 @@ config/icon="res://icon.png"
 
 [display]
 
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

2d/lights_and_shadows/README.md

@@ -8,6 +8,8 @@ Language: GDScript
 
 Renderer: GLES 2
 
+Check out this demo on the asset library: https://godotengine.org/asset-library/asset/116
+
 ## Screenshots
 
 ![Screenshot](screenshots/lights.png)

2d/lights_and_shadows/godot.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/PaintTools.png-636e86a6d210b52282c946752bbcc6f1.stex"
+path="res://.import/godot.png-5e0da45ed3d6786d5794553e04f58a8c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://PaintTools.png"
-dest_files=[ "res://.import/PaintTools.png-636e86a6d210b52282c946752bbcc6f1.stex" ]
+source_file="res://godot.png"
+dest_files=[ "res://.import/godot.png-5e0da45ed3d6786d5794553e04f58a8c.stex" ]
 
 [params]
 

2d/lights_and_shadows/godot_normal.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/right_pallete.png-fc6e4a6a7c8197834656482b94708e47.stex"
+path="res://.import/godot_normal.png-7f91d6bfda6a23aaa1320ed999c27a39.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://right_pallete.png"
-dest_files=[ "res://.import/right_pallete.png-fc6e4a6a7c8197834656482b94708e47.stex" ]
+source_file="res://godot_normal.png"
+dest_files=[ "res://.import/godot_normal.png-7f91d6bfda6a23aaa1320ed999c27a39.stex" ]
 
 [params]