aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12364 from neikeq/oIgnacio Etcheverry2017-10-243-19/+28
|\ | | | | Mono: Fix and cleanup build start errors
| * Mono: Fix and cleanup build start errorsIgnacio Etcheverry2017-10-243-19/+28
| |
* | Merge pull request #12183 from marcelofg55/err_indexRémi Verschelde2017-10-233-22/+30
|\ \ | | | | | | Improved *_FAIL_INDEX error macros to print the index/size
| * | Improved *_FAIL_INDEX error macros to print the index/sizeMarcelo Fernandez2017-10-223-22/+30
| | |
* | | Merge pull request #12310 from Paulb23/toggle_highlight_current_lineRémi Verschelde2017-10-235-2/+23
|\ \ \ | | | | | | | | Added setting to toggle current line highlighting
| * | | Added setting to toggle current line highlightingPaulb232017-10-225-2/+23
| | | |
* | | | Merge pull request #12360 from volzhs/ttr-formatRémi Verschelde2017-10-231-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix warning message format for addon plugin [ci skip]
| * | | | Fix warning message format for addon pluginvolzhs2017-10-241-5/+5
| | | | |
* | | | | Merge pull request #12316 from mrezai/fix-disable-3dRémi Verschelde2017-10-232-3/+9
|\ \ \ \ \ | | | | | | | | | | | | Fix disable_3d=yes compile errors
| * | | | | Fix disable_3d=yes compile errorsmrezai2017-10-222-3/+9
| | | | | |
* | | | | | Merge pull request #12320 from mhilbrunner/issue-11994Rémi Verschelde2017-10-232-2/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add _process(delta) to new script templates. Closes #11994.
| * | | | | | Add _process(delta) to new script templates. Closes #11994.mhilbrunner2017-10-222-2/+13
| |/ / / / /
* | | | | | Merge pull request #12334 from Zylann/tilemap_bresenham_paintRémi Verschelde2017-10-231-14/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use bresenham line in freehand tilemap painting to fill discontinuities
| * | | | | | Use bresenham line in freehand tilemap painting to fill discontinuitiesMarc Gilleron2017-10-231-14/+31
| |/ / / / /
* | | | | | Merge pull request #12330 from Jerome67000/docs_basebuttonRémi Verschelde2017-10-231-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] BaseButton [ci skip]
| * | | | | | [DOCS] BaseButtonJerome670002017-10-231-2/+9
| | | | | | |
* | | | | | | Merge pull request #12341 from jagt/move-button-joy-enumsRémi Verschelde2017-10-232-68/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move BUTTON and JOY constants to enums
| * | | | | | | move button/joy constants to enumsjagt2017-10-232-68/+70
| | | | | | | |
* | | | | | | | Merge pull request #12345 from Noshyaar/perfRémi Verschelde2017-10-232-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor: add checkbox to monitor list [ci skip]
| * | | | | | | | Monitor: add checkbox to monitor listPoommetee Ketson2017-10-242-8/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | so that users don't have to hold CTRL to select multiple entries.
* | | | | | | | Merge pull request #12343 from djrm/pr_improve_monitorsRémi Verschelde2017-10-233-7/+86
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improved monitors units and colors.
| * | | | | | | | Improved monitors units and colors.Daniel J. Ramirez2017-10-233-7/+86
| | | | | | | | |
* | | | | | | | | Merge pull request #12355 from marcelofg55/osx_vsync3Rémi Verschelde2017-10-232-0/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Implemented vsync OS functions for OS X [ci skip]
| * | | | | | | | Implemented vsync OS functions for OS XMarcelo Fernandez2017-10-232-0/+20
|/ / / / / / / /
* | | | | | | | Merge pull request #12350 from kubecz3k/ray-mask-bitRémi Verschelde2017-10-234-0/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing set/get_collision_mask_bit() for RayCast [ci skip]
| * | | | | | | | missing set/get_collision_mask_bit() for RayCastJakub Grzesik2017-10-234-0/+42
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | in the same fastion how it's implemented in Area or Bodies
* | | | | | | | Merge pull request #12349 from BastiaanOlij/add_SSAOBlur_bindsRémi Verschelde2017-10-231-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Missing binds for SSAOBlur [ci skip]
| * | | | | | | Missing binds for SSAOBlur enum caused issues compiling GDNative cpp_bindingsBastiaan Olij2017-10-231-0/+5
|/ / / / / / /
* | | | | | | Update AUTHORS and DONORS with current dataRémi Verschelde2017-10-232-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #12342 from godotengine/revert-12296-ggx_renameRémi Verschelde2017-10-236-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Rename Schlick GGX to GGX." [ci skip]
| * | | | | | | Revert "Rename Schlick GGX to GGX."Rémi Verschelde2017-10-236-11/+11
|/ / / / / / /
* | | | | | | Merge pull request #12333 from neikeq/ñRémi Verschelde2017-10-233-7/+54
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Mono: Prevent raising exceptions in native code
| * | | | | | Mono: Prevent raising exceptions in native codeIgnacio Etcheverry2017-10-233-7/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For now we will just print the exceptions we catch. Later, we should use something similar to 'mono_set_pending_exception(ex)'.
* | | | | | | Merge pull request #12332 from robertdhernandez/AStar-Memory-Leak-FixRémi Verschelde2017-10-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed memory leak with AStar class
| * | | | | | | Fixed memory leak with AStar classRobert Hernandez2017-10-221-0/+1
| | | | | | | |
* | | | | | | | Add UWP to Regex JIT blacklistGeorge Marques2017-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCRE2 JIT uses functions not available in UWP, which makes it fail to link.
* | | | | | | | Merge pull request #12336 from mhilbrunner/docs-globalscopeChris Bradfield2017-10-221-4/+150
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [DOCS] @GlobalScope
| * | | | | | | | [DOCS] @GlobalScopemhilbrunner2017-10-231-4/+150
| | | | | | | | |
* | | | | | | | | Merge pull request #12318 from mhilbrunner/docs-remotetransformChris Bradfield2017-10-222-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] RemoteTransform & RemoteTransform2D
| * | | | | | | | | [DOCS] RemoteTransform & RemoteTransform2Dmhilbrunner2017-10-232-0/+16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12331 from mhilbrunner/docs-editorscriptChris Bradfield2017-10-221-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] EditorScript: Small formatting fixes
| * | | | | | | | | [DOCS] EditorScript: Small formatting fixesmhilbrunner2017-10-231-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12306 from Grosskopf/various-docsChris Bradfield2017-10-227-64/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [DOCS] added several small docs
| * | | | | | | | | Added various docs, mostly mathematical basicsGrosskopf2017-10-237-64/+85
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12305 from Grosskopf/arvr-docsChris Bradfield2017-10-225-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | [DOCS] added some arvr docs
| * | | | | | | | | added some arvr docsGrosskopf2017-10-235-0/+10
| | | | | | | | | |
* | | | | | | | | | Merge pull request #12328 from mhilbrunner/docs-stringChris Bradfield2017-10-221-59/+84
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [DOCS] String
| * | | | | | | | | | [DOCS] Stringmhilbrunner2017-10-231-59/+84
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12315 from Jerome67000/docs_parallaxChris Bradfield2017-10-222-2/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | [DOCS] ParallaxBackground and ParallaxLayer
| * | | | | | | | [DOCS] ParallaxBackground and ParallaxLayerJerome670002017-10-222-2/+12
| | | | | | | | |