summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-20Merge pull request #13061 from eska014/html5-exportRémi Verschelde
Export boot splash image and add option for custom HTML shell file in HTML5 export
2017-11-20Merge pull request #13053 from akien-mga/methods-mkstrRémi Verschelde
Remove need to _MKSTR version strings and rename "revision" to "build"
2017-11-20Fix TextEdit::cursor_set_line bindingsRémi Verschelde
As spotted by @neikeq - fixes #13068.
2017-11-20Merge pull request #13065 from DoctorAlpaca/masterRémi Verschelde
Fix the prevention for sliding on slopes in the 2d version of move_and_slide
2017-11-20Merge pull request #13073 from kosz78/android-compile-sdk-versionRémi Verschelde
Up android 'compileSdkVersion' to 24 [ci skip]
2017-11-20EditorSettings: Dehardcode major in config file nameRémi Verschelde
It was readded in panic after I mistakenly removed the hardcoded "-3" in #12988, forgetting that Windows would still use the same path and thus conflict with 2.1 (contrarily to macOS and Linux).
2017-11-20Set android 'compileSdkVersion' to 24Konstantin Zaitsev
2017-11-20Merge pull request #13072 from sersoong/master-test2George Marques
[3.0] - Change editor_settings.tres to editor_settings-3.tres
2017-11-20Change editor_settings.tres to editor_settings-3.tressersoong
2017-11-19Ability to change indirect light energy.Juan Linietsky
2017-11-20Fix the prevention for sliding on slopes in the 2d version of move_and_slideEric Wiltfang
Done by using the same method the 3d counterpart uses. Fixes #13063.
2017-11-20Rename the version's "revision" to "build"Rémi Verschelde
That "revision" was inherited from SVN days but had been since then used to give information about the build: "custom_build", "official", "<some distro's build>". It can now be overridden with the BUILD_NAME environment variable.
2017-11-20Pass engine name and version parts as proper stringsRémi Verschelde
Removes the need for _MKSTR all over the place which has the drawback of converting _MKSTR(UNKNOWN_DEFINE) to "UKNOWN_DEFINE" instead of throwing a compilation error.
2017-11-20Merge pull request #12988 from akien-mga/xdg-home-pathsRémi Verschelde
Add support for XDG Base Directory spec
2017-11-20Merge pull request #12936 from n-pigeon/planar_scale_gizmoRémi Verschelde
Implemented planar scaling with two modes.
2017-11-20Merge pull request #12950 from ianb96/code_foldingRémi Verschelde
Code Folding
2017-11-20Merge pull request #13051 from akien-mga/check-gles3-supportRémi Verschelde
Check whether GL context supports the expected API
2017-11-20Merge pull request #13042 from gad-o/customIconFixRémi Verschelde
Fix #10798: Fixes Change Type does not change icon
2017-11-20Export boot splash and add custom HTML file option in HTML5 exportLeon Krause
2017-11-19Merge pull request #13059 from dragmz/13009Rémi Verschelde
Fix Regression: running current scene (unsaved) will ask for main scene
2017-11-19Merge pull request #13030 from Krakean/masterRémi Verschelde
Add "View FPS" in 3D->Perspective's popup.
2017-11-19Fix Regression: running current scene (unsaved) will ask for main sceneMarcin Zawiejski
2017-11-20Add "View FPS" in 3D->Perspective's popup.Dmitry Koteroff
"Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
2017-11-19Merge pull request #13056 from RoyBerube/masterRémi Verschelde
Visual Studio project creation bug fix [ci skip]
2017-11-19Merge pull request #13000 from djrm/pr_import_fixesRémi Verschelde
import fixes
2017-11-19Visual Studio project creation bug fixRoyBerube
A bug in the /drivers SCons script was preventing files in the /drivers and some in the /thirdparty directories from being added to the VS project. This will only affect builds that use the 'vsproj=yes' option.
2017-11-19Revert "change low cpu delay to 1 usec, should make editor smoother and not ↵Rémi Verschelde
really use" This reverts commit ca194033061b4b29fe00d8e9bddf2f0478b3c3f0. See discussion in https://github.com/godotengine/godot/commit/ca194033061b4b29fe00d8e9bddf2f0478b3c3f0#commitcomment-25715906 It also did not fix the issue it claimed to fix.
2017-11-19Merge pull request #13018 from hoelzl/pr-cpp-hintRémi Verschelde
Add cpp.hint file to improve IntelliSense
2017-11-19Merge pull request #13045 from akien-mga/gles2-cleanupRémi Verschelde
Cleanup old references to GLES2 renderer
2017-11-19Merge pull request #13052 from djrm/pr_fixesRémi Verschelde
Fix import obj as scene.
2017-11-19Merge pull request #13001 from capnm/fix_class_docs_inline_markupRémi Verschelde
Fix the class docs for the rst-syntax errors. [ci skip]
2017-11-19Add cpp.hint file to improve IntelliSenseMatthias Hoelzl
2017-11-19Use new XDG folders to dehardcode pathsRémi Verschelde
2017-11-19Add initial support for the XDG Base Directory specRémi Verschelde
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html (latest as of this commit). Three virtual methods are added to OS for the various XDG paths we will use: - OS::get_data_path gives XDG_DATA_HOME, or if missing: ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows - OS::get_config_path gives XDG_CONFIG_HOME, or if missing: ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows - OS::get_cache_path gives XDG_CACHE_HOME, or if missing: ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows So for Windows there are no changes, for Linux we follow the full split spec and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot. Support for system-wide installation of templates on Unix was removed for now, as it's a bit hackish and I don't think anyone uses it. user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by default, but when using the application/config/use_shared_user_dir option it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame. For now everything still goes in EditorSettings::get_settings_dir(), but this will be changed in a later commit to make use of the new splitting where relevant. Part of #3513.
2017-11-19Fix import obj as scene.Daniel J. Ramirez
2017-11-19Check whether GL context supports the expected APIRémi Verschelde
I couldn't test it yet myself (GPU supports GL 4.5), so we'll need to see if it behaves as expected on systems that don't support OpenGL 3.3 or GL ES 3.0.
2017-11-19Fix the class docs for the rst-syntax errors.Martin Capitanio
- Generate a correkt rst-syntax for the [/code] inline markup. (http://www.sphinx-doc.org/en/1.6.5/rest.html#inline-markup) - Fix xml souce bugs for the sphinx's rst syntax werrors: class_area.rst:319: WARNING: Inline literal start-string without end-string. class_area2d.rst:287: WARNING: Inline literal start-string without end-string. class_audioserver.rst:287: WARNING: Inline literal start-string without end-string. class_control.rst:509: WARNING: Inline literal start-string without end-string. class_image.rst:422: WARNING: Inline literal start-string without end-string. class_image.rst:434: WARNING: Inline literal start-string without end-string. class_inputevent.rst:74: WARNING: Inline literal start-string without end-string. class_inputeventaction.rst:45: WARNING: Inline literal start-string without end-string. class_inputmap.rst:47: WARNING: Inline literal start-string without end-string. class_kinematicbody.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string. class_kinematicbody2d.rst:80: WARNING: Inline interpreted text or phrase reference start-string without end-string. class_line2d.rst:182: WARNING: Inline literal start-string without end-string. class_thread.rst:51: WARNING: Inline literal start-string without end-string. class_treeitem.rst:160: WARNING: Inline literal start-string without end-string.
2017-11-19Merge pull request #13046 from AndreaCatania/kinfixRémi Verschelde
Some Bullet bug fix
2017-11-19Merge pull request #13044 from eska014/enginejsRémi Verschelde
Change HTML5 start-up API
2017-11-19Merge pull request #13043 from volzhs/post-importRémi Verschelde
Restore post_import function
2017-11-19Merge pull request #13040 from RandomShaper/fix-signals-dupRémi Verschelde
Fix duplication of signals
2017-11-19Merge pull request #13039 from sketchyfun/animation_key_selection_fixRémi Verschelde
Fixed issues with clicking animation keys that are on frame 0
2017-11-19Fix #10798: Fixes Change Type does not change iconOrkun
Problem : While replacing old node properties with new ones, we also copy meta data of old node's icon Solve: don't copy meta so don't override _editor_icon
2017-11-19Added null check in Bullet cast_motion APIAndreaCatania
2017-11-20Merge pull request #12955 from groud/editor_canvas_item_api_reworkPoommetee Ketson
Editor canvas item api rework
2017-11-19Merge pull request #13033 from MednauN/masterRémi Verschelde
Add currency code to iOS product details response
2017-11-19Merge pull request #13031 from YeldhamDev/dock_labelRémi Verschelde
Added a label to the Dock Positioner
2017-11-19Fixed gravity scaleAndreaCatania
2017-11-19Cleanup old references to GLES2 rendererRémi Verschelde
There are still some left in the Android Java code, even stuff to swap between GLES1 and GLES2 support from early Godot days... would be good to see some cleanup there too one day. The "graphics/api" option for Android exports is removed, as only GLES 3.0 is supported. It can be readded when GLES 2.0 support comes back. Fixes #13004.
2017-11-19Removed dynamic_cast from Bullet ServerAndreaCatania