changed build system to be more self contained

SConstruct

@@ -24,6 +24,7 @@ result_name = ARGUMENTS.get('n', ARGUMENTS.get('name', os.path.relpath('.', '..'
 if target_platform == 'linux':
     result_name += '.linux.' + target_arch
 
+    env['CXX']='g++'
     if ARGUMENTS.get('use_llvm', 'no') == 'yes':
         env['CXX'] = 'clang++'
 
@@ -86,10 +87,13 @@ env.Append(CPPPATH=['.', godot_headers, 'include', 'include/gen', 'include/core'
 # Generate bindings?
 json_api_file = ''
 
+# Generate bindings?
+json_api_file = ''
+
 if ARGUMENTS.get('use_custom_api_file', 'no') == 'yes':
     json_api_file = ARGUMENTS.get('custom_api_file', '')
 else:
-    json_api_file = os.path.join(os.getcwd(), 'godot_api.json')
+    json_api_file = os.path.join(os.getcwd(), 'godot_headers', 'api.json')
 
 if ARGUMENTS.get('generate_bindings', 'no') == 'yes':
     # actually create the bindings here
@@ -98,6 +102,8 @@ if ARGUMENTS.get('generate_bindings', 'no') == 'yes':
 
     binding_generator.generate_bindings(json_api_file)
 
+
+# source to compile
 sources = []
 add_sources(sources, 'src/core', 'cpp')
 add_sources(sources, 'src/gen', 'cpp')

include/gen/ARVRAnchor.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 

include/gen/ARVRCamera.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Camera.hpp>
+#include "Camera.hpp"
 namespace godot {
 
 

include/gen/ARVRController.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <ARVRPositionalTracker.hpp>
+#include "ARVRPositionalTracker.hpp"
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 

include/gen/ARVRInterface.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <ARVRInterface.hpp>
+#include "ARVRInterface.hpp"
 
-#include <Reference.hpp>
+#include "Reference.hpp"
 namespace godot {
 
 

include/gen/ARVRInterfaceGDNative.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <ARVRInterface.hpp>
+#include "ARVRInterface.hpp"
 namespace godot {
 
 

include/gen/ARVROrigin.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 

include/gen/ARVRPositionalTracker.hpp

@@ -7,10 +7,10 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <ARVRServer.hpp>
-#include <ARVRPositionalTracker.hpp>
+#include "ARVRServer.hpp"
+#include "ARVRPositionalTracker.hpp"
 
-#include <Object.hpp>
+#include "Object.hpp"
 namespace godot {
 
 

include/gen/ARVRServer.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Object.hpp>
+#include "Object.hpp"
 namespace godot {
 
 class ARVRInterface;

include/gen/AStar.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Reference.hpp>
+#include "Reference.hpp"
 namespace godot {
 
 

include/gen/AcceptDialog.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <WindowDialog.hpp>
+#include "WindowDialog.hpp"
 namespace godot {
 
 class Button;

include/gen/AnimatedSprite.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 class SpriteFrames;
@@ -48,6 +48,8 @@ public:
 	bool is_flipped_v() const;
 	void set_frame(const int64_t frame);
 	int64_t get_frame() const;
+	void set_speed_scale(const double speed_scale);
+	double get_speed_scale() const;
 	void _res_changed();
 
 };

include/gen/AnimatedSprite3D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <SpriteBase3D.hpp>
+#include "SpriteBase3D.hpp"
 namespace godot {
 
 class SpriteFrames;

include/gen/Animation.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Animation.hpp>
+#include "Animation.hpp"
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 class Animation;

include/gen/AnimationPlayer.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AnimationPlayer.hpp>
+#include "AnimationPlayer.hpp"
 
-#include <Node.hpp>
+#include "Node.hpp"
 namespace godot {
 
 class Object;
@@ -63,6 +63,7 @@ public:
 	bool is_active() const;
 	void set_speed_scale(const double speed);
 	double get_speed_scale() const;
+	double get_playing_speed() const;
 	void set_autoplay(const String name);
 	String get_autoplay() const;
 	void set_root(const NodePath path);

include/gen/AnimationTreePlayer.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AnimationTreePlayer.hpp>
+#include "AnimationTreePlayer.hpp"
 
-#include <Node.hpp>
+#include "Node.hpp"
 namespace godot {
 
 class Animation;

include/gen/Area.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Area.hpp>
+#include "Area.hpp"
 
-#include <CollisionObject.hpp>
+#include "CollisionObject.hpp"
 namespace godot {
 
 class Object;

include/gen/Area2D.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Area2D.hpp>
+#include "Area2D.hpp"
 
-#include <CollisionObject2D.hpp>
+#include "CollisionObject2D.hpp"
 namespace godot {
 
 class Object;

include/gen/ArrayMesh.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Mesh.hpp>
+#include "Mesh.hpp"
 
-#include <Mesh.hpp>
+#include "Mesh.hpp"
 namespace godot {
 
 class Material;

include/gen/AtlasTexture.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Texture.hpp>
+#include "Texture.hpp"
 namespace godot {
 
 class Texture;

include/gen/AudioBusLayout.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 

include/gen/AudioEffect.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 

include/gen/AudioEffectAmplify.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectBandLimitFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectBandPassFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectChorus.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectCompressor.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectDelay.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectDistortion.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioEffectDistortion.hpp>
+#include "AudioEffectDistortion.hpp"
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectEQ.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectEQ10.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectEQ.hpp>
+#include "AudioEffectEQ.hpp"
 namespace godot {
 
 

include/gen/AudioEffectEQ21.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectEQ.hpp>
+#include "AudioEffectEQ.hpp"
 namespace godot {
 
 

include/gen/AudioEffectEQ6.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectEQ.hpp>
+#include "AudioEffectEQ.hpp"
 namespace godot {
 
 

include/gen/AudioEffectFilter.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectHighPassFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectHighShelfFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectLimiter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectLowPassFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectLowShelfFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectNotchFilter.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffectFilter.hpp>
+#include "AudioEffectFilter.hpp"
 namespace godot {
 
 

include/gen/AudioEffectPanner.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectPhaser.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectPitchShift.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectReverb.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioEffectStereoEnhance.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioEffect.hpp>
+#include "AudioEffect.hpp"
 namespace godot {
 
 

include/gen/AudioServer.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioServer.hpp>
+#include "AudioServer.hpp"
 
-#include <Object.hpp>
+#include "Object.hpp"
 namespace godot {
 
 class AudioEffect;
@@ -76,6 +76,9 @@ public:
 	void unlock();
 	AudioServer::SpeakerMode get_speaker_mode() const;
 	double get_mix_rate() const;
+	Array get_device_list();
+	String get_device();
+	void set_device(const String arg0);
 	void set_bus_layout(const Ref<AudioBusLayout> bus_layout);
 	Ref<AudioBusLayout> generate_bus_layout() const;
 

include/gen/AudioStream.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 

include/gen/AudioStreamOGGVorbis.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioStream.hpp>
+#include "AudioStream.hpp"
 namespace godot {
 
 

include/gen/AudioStreamPlayback.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Reference.hpp>
+#include "Reference.hpp"
 namespace godot {
 
 

include/gen/AudioStreamPlayer.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioStreamPlayer.hpp>
+#include "AudioStreamPlayer.hpp"
 
-#include <Node.hpp>
+#include "Node.hpp"
 namespace godot {
 
 class AudioStream;

include/gen/AudioStreamPlayer2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 class AudioStream;

include/gen/AudioStreamPlayer3D.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioStreamPlayer3D.hpp>
+#include "AudioStreamPlayer3D.hpp"
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 class AudioStream;

include/gen/AudioStreamRandomPitch.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AudioStream.hpp>
+#include "AudioStream.hpp"
 namespace godot {
 
 class AudioStream;

include/gen/AudioStreamSample.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <AudioStreamSample.hpp>
+#include "AudioStreamSample.hpp"
 
-#include <AudioStream.hpp>
+#include "AudioStream.hpp"
 namespace godot {
 
 

include/gen/BackBufferCopy.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <BackBufferCopy.hpp>
+#include "BackBufferCopy.hpp"
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 

include/gen/BakedLightmap.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <BakedLightmap.hpp>
+#include "BakedLightmap.hpp"
 
-#include <VisualInstance.hpp>
+#include "VisualInstance.hpp"
 namespace godot {
 
 class BakedLightmapData;

include/gen/BakedLightmapData.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 class Texture;

include/gen/BaseButton.hpp

@@ -7,10 +7,10 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <BaseButton.hpp>
-#include <Control.hpp>
+#include "BaseButton.hpp"
+#include "Control.hpp"
 
-#include <Control.hpp>
+#include "Control.hpp"
 namespace godot {
 
 class InputEvent;
@@ -53,6 +53,8 @@ public:
 	bool is_disabled() const;
 	void set_action_mode(const int64_t mode);
 	BaseButton::ActionMode get_action_mode() const;
+	void set_button_mask(const int64_t mask);
+	int64_t get_button_mask() const;
 	BaseButton::DrawMode get_draw_mode() const;
 	void set_enabled_focus_mode(const int64_t mode);
 	Control::FocusMode get_enabled_focus_mode() const;

include/gen/BitMap.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 class Image;

include/gen/BitmapFont.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Font.hpp>
+#include "Font.hpp"
 namespace godot {
 
 class Texture;

include/gen/BoneAttachment.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 

include/gen/BoxContainer.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <BoxContainer.hpp>
+#include "BoxContainer.hpp"
 
-#include <Container.hpp>
+#include "Container.hpp"
 namespace godot {
 
 

include/gen/BoxShape.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape.hpp>
+#include "Shape.hpp"
 namespace godot {
 
 

include/gen/BulletPhysicsDirectBodyState.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <PhysicsDirectBodyState.hpp>
+#include "PhysicsDirectBodyState.hpp"
 namespace godot {
 
 

include/gen/BulletPhysicsServer.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <PhysicsServer.hpp>
+#include "PhysicsServer.hpp"
 namespace godot {
 
 

include/gen/Button.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Button.hpp>
+#include "Button.hpp"
 
-#include <BaseButton.hpp>
+#include "BaseButton.hpp"
 namespace godot {
 
 class Texture;

include/gen/ButtonGroup.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 class BaseButton;

include/gen/Camera.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Camera.hpp>
+#include "Camera.hpp"
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 class Environment;

include/gen/Camera2D.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Camera2D.hpp>
+#include "Camera2D.hpp"
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 class Object;

include/gen/CanvasItem.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node.hpp>
+#include "Node.hpp"
 namespace godot {
 
 class Texture;
@@ -29,18 +29,19 @@ public:
 
 	// enums
 	enum BlendMode {
+		BLEND_MODE_PREMULT_ALPHA = 4,
 		BLEND_MODE_SUB = 2,
+		BLEND_MODE_DISABLED = 5,
 		BLEND_MODE_MUL = 3,
 		BLEND_MODE_MIX = 0,
-		BLEND_MODE_PREMULT_ALPHA = 4,
 		BLEND_MODE_ADD = 1,
 	};
 
 	// constants
 	const static int NOTIFICATION_VISIBILITY_CHANGED = 31;
 	const static int NOTIFICATION_TRANSFORM_CHANGED = 29;
-	const static int NOTIFICATION_DRAW = 30;
 	const static int NOTIFICATION_EXIT_CANVAS = 33;
+	const static int NOTIFICATION_DRAW = 30;
 	const static int NOTIFICATION_ENTER_CANVAS = 32;
 
 	// methods
@@ -51,7 +52,8 @@ public:
 	Dictionary _edit_get_state() const;
 	void _edit_set_position(const Vector2 position);
 	Vector2 _edit_get_position() const;
-	bool _edit_use_position() const;
+	void _edit_set_scale(const Vector2 scale);
+	Vector2 _edit_get_scale() const;
 	void _edit_set_rect(const Rect2 rect);
 	Rect2 _edit_get_rect() const;
 	bool _edit_use_rect() const;

include/gen/CanvasItemMaterial.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <CanvasItemMaterial.hpp>
+#include "CanvasItemMaterial.hpp"
 
-#include <Material.hpp>
+#include "Material.hpp"
 namespace godot {
 
 

include/gen/CanvasLayer.hpp

@@ -8,12 +8,11 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node.hpp>
+#include "Node.hpp"
 namespace godot {
 
 class Object;
 class Node;
-class World2D;
 
 class CanvasLayer : public Node {
 public:
@@ -45,7 +44,7 @@ public:
 	Vector2 get_scale() const;
 	void set_custom_viewport(const Object *viewport);
 	Node *get_custom_viewport() const;
-	Ref<World2D> get_world_2d() const;
+	RID get_canvas() const;
 
 };
 

include/gen/CanvasModulate.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 

include/gen/CapsuleMesh.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <PrimitiveMesh.hpp>
+#include "PrimitiveMesh.hpp"
 namespace godot {
 
 

include/gen/CapsuleShape.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape.hpp>
+#include "Shape.hpp"
 namespace godot {
 
 

include/gen/CapsuleShape2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape2D.hpp>
+#include "Shape2D.hpp"
 namespace godot {
 
 

include/gen/CenterContainer.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Container.hpp>
+#include "Container.hpp"
 namespace godot {
 
 

include/gen/CheckBox.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Button.hpp>
+#include "Button.hpp"
 namespace godot {
 
 

include/gen/CheckButton.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Button.hpp>
+#include "Button.hpp"
 namespace godot {
 
 

include/gen/CircleShape2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape2D.hpp>
+#include "Shape2D.hpp"
 namespace godot {
 
 

include/gen/ClassDB.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Object.hpp>
+#include "Object.hpp"
 namespace godot {
 
 class Object;

include/gen/CollisionObject.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 class Object;

include/gen/CollisionObject2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 class Object;

include/gen/CollisionPolygon.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 
@@ -34,6 +34,7 @@ public:
 	PoolVector2Array get_polygon() const;
 	void set_disabled(const bool disabled);
 	bool is_disabled() const;
+	bool _is_editable_3d_polygon() const;
 
 };
 

include/gen/CollisionPolygon2D.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <CollisionPolygon2D.hpp>
+#include "CollisionPolygon2D.hpp"
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 

include/gen/CollisionShape.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Spatial.hpp>
+#include "Spatial.hpp"
 namespace godot {
 
 class Resource;

include/gen/CollisionShape2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Node2D.hpp>
+#include "Node2D.hpp"
 namespace godot {
 
 class Shape2D;

include/gen/ColorPicker.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <BoxContainer.hpp>
+#include "BoxContainer.hpp"
 namespace godot {
 
 class Object;

include/gen/ColorPickerButton.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Button.hpp>
+#include "Button.hpp"
 namespace godot {
 
 class ColorPicker;
@@ -37,6 +37,7 @@ public:
 	void set_edit_alpha(const bool show);
 	bool is_editing_alpha() const;
 	void _color_changed(const Color arg0);
+	void _modal_closed();
 
 };
 

include/gen/ColorRect.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Control.hpp>
+#include "Control.hpp"
 namespace godot {
 
 

include/gen/ConcavePolygonShape.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape.hpp>
+#include "Shape.hpp"
 namespace godot {
 
 

include/gen/ConcavePolygonShape2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape2D.hpp>
+#include "Shape2D.hpp"
 namespace godot {
 
 

include/gen/ConeTwistJoint.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Joint.hpp>
+#include "Joint.hpp"
 namespace godot {
 
 

include/gen/ConfigFile.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Reference.hpp>
+#include "Reference.hpp"
 namespace godot {
 
 

include/gen/ConfirmationDialog.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <AcceptDialog.hpp>
+#include "AcceptDialog.hpp"
 namespace godot {
 
 class Button;

include/gen/Container.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Control.hpp>
+#include "Control.hpp"
 namespace godot {
 
 class Object;

include/gen/Control.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <Control.hpp>
+#include "Control.hpp"
 
-#include <CanvasItem.hpp>
+#include "CanvasItem.hpp"
 namespace godot {
 
 class InputEvent;
@@ -71,6 +71,7 @@ public:
 	};
 	enum GrowDirection {
 		GROW_DIRECTION_END = 1,
+		GROW_DIRECTION_BOTH = 2,
 		GROW_DIRECTION_BEGIN = 0,
 	};
 	enum SizeFlags {
@@ -107,6 +108,8 @@ public:
 	const static int NOTIFICATION_FOCUS_EXIT = 44;
 	const static int NOTIFICATION_MODAL_CLOSE = 46;
 	const static int NOTIFICATION_RESIZED = 40;
+	const static int NOTIFICATION_SCROLL_END = 48;
+	const static int NOTIFICATION_SCROLL_BEGIN = 47;
 
 
 	static Control *_new();

include/gen/ConvexPolygonShape.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape.hpp>
+#include "Shape.hpp"
 namespace godot {
 
 

include/gen/ConvexPolygonShape2D.hpp

@@ -8,7 +8,7 @@
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
 
-#include <Shape2D.hpp>
+#include "Shape2D.hpp"
 namespace godot {
 
 

include/gen/CubeMap.hpp

@@ -7,9 +7,9 @@
 
 #include <core/CoreTypes.hpp>
 #include <core/Ref.hpp>
-#include <CubeMap.hpp>
+#include "CubeMap.hpp"
 
-#include <Resource.hpp>
+#include "Resource.hpp"
 namespace godot {
 
 class Image;