aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | scrolling fixesIan2017-11-185-194/+310
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | TextEdit code foldingIan2017-11-176-63/+489
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13051 from akien-mga/check-gles3-supportRémi Verschelde2017-11-201-23/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether GL context supports the expected API
| * | | | | | | | | | | | | | | | | | | | | | | | Check whether GL context supports the expected APIRémi Verschelde2017-11-191-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13042 from gad-o/customIconFixRémi Verschelde2017-11-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #10798: Fixes Change Type does not change icon
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix #10798: Fixes Change Type does not change iconOrkun2017-11-191-0/+2
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13059 from dragmz/13009Rémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Regression: running current scene (unsaved) will ask for main scene
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix Regression: running current scene (unsaved) will ask for main sceneMarcin Zawiejski2017-11-191-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13030 from Krakean/masterRémi Verschelde2017-11-192-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "View FPS" in 3D->Perspective's popup.
| * | | | | | | | | | | | | | | | | | | | | | | | | Add "View FPS" in 3D->Perspective's popup.Dmitry Koteroff2017-11-202-0/+44
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes" to make it acceptable by clang-format. "Fixes" to make it acceptable by clang-format.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13056 from RoyBerube/masterRémi Verschelde2017-11-191-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio project creation bug fix [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio project creation bug fixRoyBerube2017-11-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13000 from djrm/pr_import_fixesRémi Verschelde2017-11-194-22/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | import fixes
| * | | | | | | | | | | | | | | | | | | | | | | | | Improved packed scene previews.Daniel J. Ramirez2017-11-173-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixed mesh importing when multiple materials are presentDaniel J. Ramirez2017-11-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Revert "change low cpu delay to 1 usec, should make editor smoother and not ↵Rémi Verschelde2017-11-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13018 from hoelzl/pr-cpp-hintRémi Verschelde2017-11-193-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cpp.hint file to improve IntelliSense
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add cpp.hint file to improve IntelliSenseMatthias Hoelzl2017-11-193-0/+15
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13045 from akien-mga/gles2-cleanupRémi Verschelde2017-11-1922-133/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup old references to GLES2 renderer
| * | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup old references to GLES2 rendererRémi Verschelde2017-11-1922-133/+31
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13052 from djrm/pr_fixesRémi Verschelde2017-11-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix import obj as scene.
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix import obj as scene.Daniel J. Ramirez2017-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13001 from capnm/fix_class_docs_inline_markupRémi Verschelde2017-11-1910-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the class docs for the rst-syntax errors. [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix the class docs for the rst-syntax errors.Martin Capitanio2017-11-1910-10/+11
|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13046 from AndreaCatania/kinfixRémi Verschelde2017-11-194-88/+177
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Some Bullet bug fix
| * | | | | | | | | | | | | | | | | | | | | | | | Added null check in Bullet cast_motion APIAndreaCatania2017-11-191-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed gravity scaleAndreaCatania2017-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Removed dynamic_cast from Bullet ServerAndreaCatania2017-11-191-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed kinematic movement on concave shapeAndreaCatania2017-11-194-64/+146
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13044 from eska014/enginejsRémi Verschelde2017-11-195-94/+137
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change HTML5 start-up API
| * | | | | | | | | | | | | | | | | | | | | | | | Change HTML5 start-up APILeon Krause2017-11-195-94/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename engine.start() to startGame(), new start() takes string arguments handed directly to main(). Rename Engine.loadEngine() to load(). Add setLocale(), setResizeCanvasOnStart(), setExecutableName() and preloadFile().
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13043 from volzhs/post-importRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore post_import function
| * | | | | | | | | | | | | | | | | | | | | | | | | Restore post_import functionvolzhs2017-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13040 from RandomShaper/fix-signals-dupRémi Verschelde2017-11-192-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplication of signals
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplication of signalsPedro J. Estébanez2017-11-192-4/+22
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Partially revert 6496b53549aca7b1be57c3be55815f32a4842201, adding a comment about why duplications of signals must happen as a second phase. - Add fallback logic for connections to nodes not in the duplicated hierarchy. - Remove redundant call to `Node::_duplicate_signals()`. Fixes #12951.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13039 from sketchyfun/animation_key_selection_fixRémi Verschelde2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixed issues with clicking animation keys that are on frame 0
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with animation keys that are on frame 0 being difficult to clickBenH2017-11-191-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12955 from groud/editor_canvas_item_api_reworkPoommetee Ketson2017-11-2031-498/+285
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Editor canvas item api rework
| * | | | | | | | | | | | | | | | | | | | | | | | | Rework the canvas_item API for further improves to the canvas item editorGilles Roudiere2017-11-1931-498/+285
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13033 from MednauN/masterRémi Verschelde2017-11-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add currency code to iOS product details response
| * | | | | | | | | | | | | | | | | | | | | | | | | Add currency code to iOS product details responseEvgeny Zuev2017-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13031 from YeldhamDev/dock_labelRémi Verschelde2017-11-191-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Added a label to the Dock Positioner
| * | | | | | | | | | | | | | | | | | | | | | | | | Added a label to the Dock Positioner.Michael Alexsander Silva Dias2017-11-191-1/+6
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13015 from hoelzl/pr-vs-no-progressRémi Verschelde2017-11-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress progress messages in Visual Studio output pane [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | | | | Suppress progress messages in Visual Studio output paneMatthias Hoelzl2017-11-181-3/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13016 from neikeq/issue-13011Rémi Verschelde2017-11-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono: Fix compiler error with Variant::operator AABB()
| * | | | | | | | | | | | | | | | | | | | | | | | | Mono: Fix compiler error with Variant::operator AABB()Ignacio Etcheverry2017-11-182-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #13024 from omar25h/set_current_tab_fixGeorge Marques2017-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix set_current_tab: Indexp_current=-1 out of size
| * | | | | | | | | | | | | | | | | | | | | | | | | fix set_current_tab: Indexp_current=-1 out of sizeOmar Al Halabi2017-11-191-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12961 from eska014/platform-docRémi Verschelde2017-11-1912-35/+211
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Facilitate documenting platform-exclusive classes