aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #19553 from guilhermefelipecgs/fix_solarized_themeRémi Verschelde2018-06-151-2/+2
|\ \ \ | |/ / |/| | Small improvement to solarized theme
| * | Small improvement to solarized themeGuilherme Felipe2018-06-141-2/+2
| |/
* | Merge pull request #19544 from RandomShaper/gltf-shapes-namesRémi Verschelde2018-06-151-1/+4
|\ \ | | | | | | Import morph target names from glTF
| * | Import morph target names from glTFPedro J. Estébanez2018-06-141-1/+4
| | | | | | | | | | | | If mesh.extras.targetNames is available. Keep the former naming pattern as fallback.
* | | Merge pull request #19574 from letheed/tweak-guideline-colorRémi Verschelde2018-06-151-2/+2
|\ \ \ | | | | | | | | Tweak adaptative guideline and completion_background color
| * | | Tweak adaptative guideline and completion_background colorletheed2018-06-151-2/+2
| | |/ | |/|
* | | doc: Remove extraneous empty lines in descriptionsRémi Verschelde2018-06-1510-17/+0
| | |
* | | Merge pull request #19575 from tagcup/skeleton_docRémi Verschelde2018-06-151-2/+10
|\ \ \ | |/ / |/| | Added some details in skeleton docs.
| * | Added some details in skeleton docs.tagcup2018-06-141-2/+10
|/ / | | | | | | Workaround for #19551.
* | Merge pull request #19545 from akien-mga/gizmos-defvalRémi Verschelde2018-06-133-3/+7
|\ \ | |/ |/| Fix invalid DEFVAL in SpatialEditorGizmo::add_unscaled_billboard
| * Fix invalid DEFVAL in SpatialEditorGizmo::add_unscaled_billboardRémi Verschelde2018-06-133-3/+7
|/ | | | | Likely added by mistake in #19487. Should fix #19543.
* Merge pull request #19488 from Paulb23/text_editor_colour_refactorRémi Verschelde2018-06-134-94/+56
|\ | | | | Text editor colour refactor
| * Removed duplicate default colours and removed GDScriptHighligher colours ↵Paulb232018-06-134-61/+46
| | | | | | | | from main editor.
| * Theme saving no longer hard codedPaulb232018-06-131-33/+10
|/
* Merge pull request #19541 from SaracenOne/ime2Rémi Verschelde2018-06-131-4/+5
|\ | | | | Make LineEdit IME position hook ignore placeholder text
| * LineEdit IME position will now ignore placeholder text.Saracen2018-06-131-4/+5
| |
* | Merge pull request #19487 from JFonS/better_3d_selectRémi Verschelde2018-06-1310-83/+483
|\ \ | |/ |/| Improve 3D selection
| * Polished 3D selectionJFonS2018-06-1310-83/+483
| |
* | Merge pull request #19539 from nemerle/masterRémi Verschelde2018-06-131-1/+1
|\ \ | | | | | | A typo in ShaderCompilerGLES2 constructor code '==' used instead of '='
| * | A typo in ShaderCompilerGLES2 constructor code '==' used instead of '='nemerle2018-06-131-1/+1
|/ /
* | Merge pull request #19503 from akien-mga/osx-ctrl-cmdRémi Verschelde2018-06-134-39/+62
|\ \ | | | | | | Fix shortcuts using KEY_MASK_CTRL instead of KEY_MASK_CMD
| * | Fix shortcuts using KEY_MASK_CTRL instead of KEY_MASK_CMDRémi Verschelde2018-06-114-39/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEY_MASK_CMD is automatically replaced by KEY_MASK_CTRL on non-OSX and KEY_MASK_META (Command key) on OSX, so it should be used for all Ctrl/Cmd + key shortcuts. Also de-hacked the macOS shortcut replacements with proper conditional definition. Not tested on macOS, cannot judge if they are good shortcuts. Fixes #10761.
* | | Merge pull request #19505 from BastiaanOlij/improve_stereo_renderJuan Linietsky2018-06-132-13/+91
|\ \ \ | | | | | | | | Improvement for stereo render, reuse culling and lighting for both eyes
| * | | Moved culling, updated lights and shadows into a prepare function so it is ↵Bastiaan Olij2018-06-112-13/+91
| | | | | | | | | | | | | | | | only called once for stereo rendering
* | | | Merge pull request #19509 from SaracenOne/imeRémi Verschelde2018-06-1311-4/+79
|\ \ \ \ | | | | | | | | | | IME context detection.
| * | | | IME context detection.Saracen2018-06-1111-4/+79
| | | | |
* | | | | Merge pull request #19514 from Chaosus/solarized_themesRémi Verschelde2018-06-133-15/+25
|\ \ \ \ \ | | | | | | | | | | | | Added Solarized Dark and Light themes
| * | | | | Added Solarized Dark and Light themesChaosus2018-06-133-15/+25
| |/ / / /
* | | | | Merge pull request #19516 from groud/fix_crash_on_hoverRémi Verschelde2018-06-132-38/+56
|\ \ \ \ \ | | | | | | | | | | | | Fixes a crash on draw_hover
| * | | | | Fixes a crash on draw_hovergroud2018-06-122-38/+56
| | | | | |
* | | | | | Merge pull request #19528 from guilhermefelipecgs/fix_tab_resizeRémi Verschelde2018-06-131-0/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix TabContainer not showing tabs on left when resizing.
| * | | | | | Fix TabContainer not showing tabs on left when resizing.Guilherme Felipe2018-06-121-0/+40
| |/ / / / / | | | | | | | | | | | | | | | | | | Fix #19510.
* | | | | | Style fixes for commit d5bb6faaRémi Verschelde2018-06-135-102/+117
| | | | | |
* | | | | | Merge pull request #19526 from robojumper/fix_tutorialsRémi Verschelde2018-06-1378-99/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for tutorial links to makerst.py
| * | | | | | Add support for tutorial links to makerst.pyrobojumper2018-06-1279-100/+146
| | |/ / / / | |/| | | | | | | | | | | | | | | | Also change the <tutorials> structure to make use of individual <link> tags
* | | | | | Merge pull request #19515 from YeldhamDev/log_creation_fixMax Hilbrunner2018-06-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed regression making the logger not respect the max files limit
| * | | | | | Fixed regression making the logger not respect the max files limit.Michael Alexsander Silva Dias2018-06-121-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19524 from jahd2602/masterRémi Verschelde2018-06-121-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Inner classes' functions now appear in the editor's functions panel
| * | | | | Inner classes' functions now appear in the editor's functions panelJairo Honorio2018-06-121-0/+7
|/ / / / / | | | | | | | | | | | | | | | Fixes #19386
* / / / / -Make sure that ProjectSettings are properly dumped when dumping docs.Juan Linietsky2018-06-1112-7/+813
|/ / / / | | | | | | | | | | | | | | | | | | | | -Documented all properties of project settings Update documentation for ProjectSettings
* | | | Merge pull request #19494 from clayjohn/doc_viewportRémi Verschelde2018-06-111-2/+6
|\ \ \ \ | | | | | | | | | | Updated Viewport docs
| * | | | updated Viewport docs to correct wrong information and fill out empty sectionsclayjohn2018-06-101-2/+6
| | |/ / | |/| |
* | | | Merge pull request #19492 from clayjohn/particle_propertiesRémi Verschelde2018-06-111-2/+2
|\ \ \ \ | | | | | | | | | | updated some ParticleMaterial properties
| * | | | updated some particlematerial propertiesclayjohn2018-06-101-2/+2
| |/ / /
* | | | Merge pull request #19489 from Nallebeorn/csg-reparentRémi Verschelde2018-06-111-0/+9
|\ \ \ \ | |/ / / |/| | | Fix CSG issues when reparenting shape nodes.
| * | | Fix CSG issues when reparenting shape nodes.Benjamin2018-06-101-0/+9
| | | |
* | | | Merge pull request #19461 from touilleMan/correct-test_get_namesRémi Verschelde2018-06-101-4/+9
|\ \ \ \ | | | | | | | | | | Correct test list returned by test_get_names
| * | | | Correct test list returned by test_get_namesEmmanuel Leblond2018-06-091-4/+9
| |/ / /
* | | | Merge pull request #19459 from clayjohn/primitive_mesh_rangesRémi Verschelde2018-06-101-21/+21
|\ \ \ \ | | | | | | | | | | Updated Ranges for Primitive Mesh Properties
| * | | | updated ranges for primitive meshesclayjohn2018-06-081-21/+21
| |/ / /