devel/godot: update to 2.0.3

PR:		209639
Submitted by:	FreeBSD@Shaneware.biz (maintainer)

5 files changed, 90 insertions, 101 deletions

diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index 7701b1a0cc01..865446991d68 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	godot
-PORTVERSION=	2.0
+PORTVERSION=	2.0.3
 DISTVERSIONSUFFIX=	-stable
 CATEGORIES=	devel games
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libasound.so:audio/alsa-lib
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	okamstudio
+GH_ACCOUNT=	godotengine
 
 USES=		scons pkgconfig compiler
 USE_XORG=	x11 xcursor xinerama
diff --git a/devel/godot/distinfo b/devel/godot/distinfo
index 7c258eb98e89..9183668c7c7b 100644
--- a/devel/godot/distinfo
+++ b/devel/godot/distinfo
@@ -1,2 +1,3 @@
-SHA256 (okamstudio-godot-2.0-stable_GH0.tar.gz) = 5947331b210f046f7cbd0b88aba1cc4216a50347983662c46b1e91ae581e5a7c
-SIZE (okamstudio-godot-2.0-stable_GH0.tar.gz) = 54214296
+TIMESTAMP = 1463653508
+SHA256 (godotengine-godot-2.0.3-stable_GH0.tar.gz) = 8112742141fc5b3467e19206c677aa81738eded0681280d7c3817520afedc383
+SIZE (godotengine-godot-2.0.3-stable_GH0.tar.gz) = 32804039
diff --git a/devel/godot/files/patch-SConstruct b/devel/godot/files/patch-SConstruct
index 82748b51d192..de10c67a8f61 100644
--- a/devel/godot/files/patch-SConstruct
+++ b/devel/godot/files/patch-SConstruct
@@ -1,14 +1,5 @@
 --- SConstruct.orig	2016-02-29 11:52:09 UTC
 +++ SConstruct
-@@ -63,7 +63,7 @@ elif (os.name=="nt"):
- 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
- 		custom_tools=['mingw']
- 
--env_base=Environment(tools=custom_tools,ENV = {'PATH' : os.environ['PATH']});
-+env_base=Environment(tools=custom_tools,ENV = os.environ);
- 
- #env_base=Environment(tools=custom_tools);
- env_base.global_defaults=global_defaults
 @@ -223,15 +223,17 @@ if selected_platform in platform_list:
  	if env["extra_suffix"] != '' :
  		env.extra_suffix += '.'+env["extra_suffix"]
diff --git a/devel/godot/pkg-descr b/devel/godot/pkg-descr
index 712e60c5eba2..c2c98d6198da 100644
--- a/devel/godot/pkg-descr
+++ b/devel/godot/pkg-descr
@@ -1,6 +1,6 @@
 Godot is a multi-platform 2D and 3D game engine. It also provides a feature rich
 development environment.
 
-Easily deploy your game on IOS, android, OSX, Linux, Windows or PS3.
+Easily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3.
 
 WWW: http://www.godotengine.org
diff --git a/devel/godot/pkg-plist b/devel/godot/pkg-plist
index 47e880e0b4b5..dd1784e6b218 100644
--- a/devel/godot/pkg-plist
+++ b/devel/godot/pkg-plist
@@ -5,14 +5,14 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/input.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/input.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/area_input/input.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/ball.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/box.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/circle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/dynamic_colobjs.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/dynamic_colobjs.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/dynamic_colobjs.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/dynamic_collision_shapes/poly.png
@@ -20,15 +20,15 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/floor.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/fog.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/tile_edit.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/tileset_edit.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/fog_of_war/troll.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/beach_cave.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/beach_cave.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/beach_cave.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hdr/ocean_beach.png
@@ -63,25 +63,25 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/WWT-26.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/map.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/tiles.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/tileset.res
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/map.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/tileset_edit.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/troll.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/troll.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/troll.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/bastiles.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/dungeon.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/hexamap/troll.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/dungeon.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/isotiles.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/tileset.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/tileset_edit.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/troll.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/troll.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/troll.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/character_shder.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/column.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric/troll.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/character_shader.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/column.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio/idle0001.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio/idle0002.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/cubio/idle0003.png
@@ -248,108 +248,107 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/faceMask.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/faceNormal.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/fire.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/floor_shader.res
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/floor_shader.tres
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/light2.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/map.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/map.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/map.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/shadow_blob.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/shoot.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/shoot.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/shoot.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/shoot_halo.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/tileset.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/tileset_scene.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/torch.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/tileset_edit.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/torch.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/torch_light.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/torch_shader.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/wall_shader.res
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/torch_shader.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/isometric_light/wall_shader.tres
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/circle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/colworld.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/colworld.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/colworld.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/long_obstacle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/obstacle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/player.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/player.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/player.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/player.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_char/princess.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/colworld.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/colworld.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/obstacle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/player.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/player.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/player.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/kinematic_col/player.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/burano.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/lightmask.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/lightmask.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/light_mask/splat.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/bg.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/caster.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/light.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/light_shadows.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/light_shadows.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lights_shadows/spot.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/arrow.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/lookat.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/lookat.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/lookat/lookat.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/car.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/motion/motion.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/motion/motion.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/motion/motion.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/agent.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/navigation.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/navpoly/path.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/diffuse.jpg
-%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/diffuse.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/light.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal_material.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normalmap.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal.jpg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normal_material.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/normalmaps/normalmap.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/fire_particle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/mask.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/particles/particles.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/particles/particles.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/smoke_particle.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/particles/spark_particle2.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/bullet.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/bullet.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/bullet.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/bullet.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/coin.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/coin.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/coin.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/coin.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/enemy.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/enemy.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/enemy.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/enemy.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/moving_platform.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/moving_platform.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/moving_platform.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/moving_platform.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/music.ogg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/one_way_platform.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/one_way_platform.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/one_way_platform.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/osb_fire.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/osb_jump.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/osb_left.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/osb_right.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/parallax_bg.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/parallax_bg.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/plank.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/plankpin.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/player.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/player.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/player.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/robot_demo.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/scroll_bg_cloud_1.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/scroll_bg_cloud_2.png
@@ -357,24 +356,23 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/scroll_bg_fg_1.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/scroll_bg_fg_2.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/scroll_bg_sky.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/seesaw.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/seesaw.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_coin.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_explode.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_hit.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_jump.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/sound_shoot.wav
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/stage.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/stage.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tiles_demo.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tiles_demo.png.flags
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset_edit.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/types.cache
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/platformer/tileset_edit.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/ball.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/left_pallete.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/pong.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/pong/pong.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/pong/pong.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/right_pallete.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/pong/separator.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/art/bowling_ball.png
@@ -383,33 +381,32 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/art/platform.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/art/seesaw_base.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/art/seesaw_top.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/ball.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/box.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/domino.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/ball.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/box.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/domino.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/pendulum.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/platform.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/rubegoldberg.xml
-%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/seesaw.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/pendulum.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/platform.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/rubegoldberg.tscn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/rubegoldberg/seesaw.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/burano.jpg
-%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/burano.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/filmgrain.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/filmgrain.png.flags
-%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/forest.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/mountains.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/platformer.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/forest.jpg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/mountains.jpg
+%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/platformer.jpg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/vignette.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/art/white.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/screen_shaders.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/screen_shaders.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/screen_space_shaders/screen_shaders.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/KaushanScript-Regular.otf
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/font.fnt
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/sdf.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/sdf_font/sdf.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/bullet.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/bullets.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/engine.cfg
@@ -417,43 +414,43 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/face_sad.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/shower.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/shower.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/shower_of_bullets/shower.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/asteroid.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/asteroid.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/asteroid.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/bg_gradient.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/big_star.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy1.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy2.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/enemy_shot.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/engine.cfg
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/explosion.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/explosion.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/fire.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/game_state.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level.scn
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level_tiles.res
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level_tiles.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/level.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/main_menu.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/main_menu.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/main_menu.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/meteorite.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/parallax.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/parallax.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/rail.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.gd
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/ship.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shoot.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shot.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shot.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/shot.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/small_star.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/sound_explode.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/sound_shoot.wav
 %%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/tile.png
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/tileset.tres
+%%EXAMPLES%%%%DATADIR%%/demos/2d/space_shooter/tileset_edit.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg_layer_1.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/bg_layer_2.png
@@ -462,7 +459,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/freesans.fnt
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_01.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_02.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/splash/splash_03.png
@@ -475,22 +472,22 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/cubio.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/icon.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/sprite_shaders.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/sprite_shaders/sprite_shaders.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/block.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/grid.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/grid.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/grid.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/tetris.png
-%%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/tetris.xml
+%%EXAMPLES%%%%DATADIR%%/demos/2d/tetris/tetris.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/OpenCV_Chessboard.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/bubble.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/bubbles.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/bubbles.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/bubbles.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/burano.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/engine.cfg
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/icon.png
 %%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/lens.gd
-%%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/lens.scn
+%%EXAMPLES%%%%DATADIR%%/demos/2d/texscreen/lens.tscn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/fixed_materials/brick_color.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/fixed_materials/brick_detail.png
 %%EXAMPLES%%%%DATADIR%%/demos/3d/fixed_materials/brick_detail_emission.png
@@ -607,6 +604,7 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/truck_scene.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/trucktown.scn
 %%EXAMPLES%%%%DATADIR%%/demos/3d/truck_town/vehicle.gd
+%%EXAMPLES%%%%DATADIR%%/demos/LICENSE.md
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/drag_and_drop.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/drag_drop_script.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/drag_and_drop/engine.cfg
@@ -639,7 +637,6 @@ bin/godot.x11%%BINSUFF%%
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/main.gd
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/main.scn
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/noto.fnt
-%%EXAMPLES%%%%DATADIR%%/demos/gui/translation/notosans.otf
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/text.csv
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/translations/text.en.xl
 %%EXAMPLES%%%%DATADIR%%/demos/gui/translation/translations/text.es.xl