Merge upstream #18
Merged
Merge upstream #18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
…d_slide Done by using the same method the 3d counterpart uses. Fixes godotengine#13063.
[3.0] - Change editor_settings.tres to editor_settings-3.tres
It was readded in panic after I mistakenly removed the hardcoded "-3" in godotengine#12988, forgetting that Windows would still use the same path and thus conflict with 2.1 (contrarily to macOS and Linux).
…version Up android 'compileSdkVersion' to 24 [ci skip]
Fix the prevention for sliding on slopes in the 2d version of move_and_slide
As spotted by @neikeq - fixes godotengine#13068.
Remove need to _MKSTR version strings and rename "revision" to "build"
Export boot splash image and add option for custom HTML shell file in HTML5 export
…l_transport Use parallel transport in PathFollow2D.
…licate Let SceneTreeDock duplicate nodes via Node::duplicate()
[3.0] - Add close other tabs to Script Editor
Few fixes for asset store browser
…l-hover-signal RichTextLabel: Adding ability for single meta hovering
Add Scene button and tab scrolling
Allow exporting enums from GDScript
3.0 - add open feture to dependency_editor.cpp(View Owner..)
…t_fix Fixed a bug where materials and/or meshes weren't assigned to scene on first import.
Added loop_begin and loop_end to OggVorbisStream
New contributors added as AUTHORS: @AndreaCatania, @sheepandshepherd, @poke1024, @DmitriySalnikov, @ianb96, @hoelzl, @mhilbrunner, @n-pigeon. [ci skip]
Basis accepts Vector3 as constructor argument.
Make particles with DISABLE_Z active respect ALIGN_Y. Fixes godotengine#12865
Fix not being able to select an editor layout created in another language
Fix particle preprocessing
…ings_limits Add range to anisotropic filter level
…tartup_issue_2385 Restore scenes on startup, issue 2385
…ng_I_added Remove option for the rulers graduations font size
Better number format for memory usage
Item list: added new signal - nothing_selected (when mouse clicked on empty space), and two new functions - unselect_all() and is_any_selected()
…_collapseexpand_v2 Inspector: Implemented a collapse/expand all (v2)
Fix read bug in compressed bone weights
…ignals Added some new API functionality to Item List component
…ont-sizes Tweak editor help font sizes for better readability
Fix invalid transform when skip_vertex_transform used
Allow customizing user:// path (folder in OS::get_data_path())
Ammend: Removed whitespace from blank lines. Ammend2: Removed extra spaces in an attempt to make Clang happy. :)
…tweaks A few adjustments to file/dir open dialogs
Travis: Use separate SCons caches for each build job
…cursor_issue_13190 Fixes adjust viewport to cursor when line is to long, issue 13190
…as_decimalpoint Makes possible to interpret comma as decimal point in editor
Added overloads of vector parameters for shader Trig functions.
tracking upstream
…les compiled the same code with two different flagsscons will generate this error scons: *** Two environments with different actions were specified for the same target:To fix, we must not compile the library when a module is using itUpstream added a stub flag in each of the modules. All I have to do is enable it in case I want to disable audiostreamopus or upstream disable it themselves
hungrymonkey
pushed a commit
to hungrymonkey/godot
that referenced
this pull request
Feb 4, 2018
Translate README.md to English
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.