Fixed too many little issues, check the issues closed today.

2 files changed, 16 insertions, 0 deletions

diff --git a/core/os/os.cpp b/core/os/os.cpp
index 819ecd2f22..53ca7c3a49 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -474,6 +474,16 @@ OS::MouseMode OS::get_mouse_mode() const{
 	return MOUSE_MODE_VISIBLE;
 }
 
+void OS::set_time_scale(float p_scale) {
+
+	_time_scale=p_scale;
+}
+
+float OS::get_time_scale() const {
+
+	return _time_scale;
+}
+
 
 OS::OS() {
 	last_error=NULL;
@@ -489,6 +499,7 @@ OS::OS() {
 	_fps=1;
 	_target_fps=0;
 	_render_thread_mode=RENDER_THREAD_SAFE;
+	_time_scale=1.0;
 	Math::seed(1234567);
 }
 
diff --git a/core/os/os.h b/core/os/os.h
index 71f53330c7..ed7e1e4324 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -55,6 +55,7 @@ class OS {
 	int _orientation;
 	float _fps;
 	int _target_fps;
+	float _time_scale;
 
 	char *last_error;
 
@@ -332,6 +333,10 @@ public:
 	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, Object* p_obj, String p_callback);
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, Object* p_obj, String p_callback);
 
+
+	void set_time_scale(float p_scale);
+	float get_time_scale() const;
+
 	OS();	
 	virtual ~OS();