summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--main/main.cpp2
-rw-r--r--tools/editor/editor_settings.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index 2586a5ea0d..fcf0c3ac6a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
![GODOT](/logo.png)
-http://www.godotengine.org
+https://godotengine.org
### The Engine
@@ -13,17 +13,17 @@ Godot has been developed by Juan Linietsky and Ariel Manzur for several years, a
### Documentation
-Documentation has been moved to [ReadTheDocs](http://docs.godotengine.org).
+Documentation is hosted on [ReadTheDocs](http://docs.godotengine.org).
### Binary Downloads, Community, etc.
Binary downloads, community, etc. can be found in Godot homepage:
-http://www.godotengine.org
+https://godotengine.org
### Compiling from Source
-Compilation instructions for every platform can be found in the Wiki:
+See docs for compilation instructions for every platform:
http://docs.godotengine.org/en/latest/reference/_compiling.html
[![Build Status](https://travis-ci.org/godotengine/godot.svg?branch=master)](https://travis-ci.org/godotengine/godot)
diff --git a/main/main.cpp b/main/main.cpp
index 9352055246..0a92971bae 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1639,7 +1639,7 @@ bool Main::iteration() {
}
if (OS::get_singleton()->is_in_low_processor_usage_mode() || !OS::get_singleton()->can_draw())
- OS::get_singleton()->delay_usec(25000); //apply some delay to force idle time
+ OS::get_singleton()->delay_usec(16600); //apply some delay to force idle time (results in about 60 FPS max)
else {
uint32_t frame_delay = OS::get_singleton()->get_frame_delay();
if (frame_delay)
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 91d7e7ebd4..316394c537 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -401,7 +401,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("text_editor/engine_type_color",Color::html("83d3ff"));
set("text_editor/function_color",Color::html("66a2ce"));
set("text_editor/member_variable_color",Color::html("e64e59"));
- set("text_editor/comment_color",Color::html("983d1b"));
+ set("text_editor/comment_color",Color::html("676767"));
set("text_editor/string_color",Color::html("ef6ebe"));
set("text_editor/number_color",Color::html("EB9532"));
set("text_editor/symbol_color",Color::html("badfff"));