aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Two potential glitches in font oversamplingBernhard Liebl2018-01-081-1/+14
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15518 from volzhs/shader-compile-error-androidRémi Verschelde2018-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Fix shader compile error on Android
| * | | | | | | | | | | | | | | | | | | | | | Fix shader compile error on Androidvolzhs2018-01-091-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **ERROR**: EffectBlurShaderGLES3: Fragment Program Compilation Failed: 23:191: S0001: Type mismatch, cannot convert from 'int' to 'float' At: drivers/gles3/shader_gles3.cpp:168:_display_error_with_code() - EffectBlurShaderGLES3: Fragment Program Compilation Failed:
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #15507 from poke1024/fix15106Rémi Verschelde2018-01-081-16/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix whole word search missing occurences
| * | | | | | | | | | | | | | | | | | | | | | Fix whole word search missing occurencesBernhard Liebl2018-01-081-16/+29
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Add author mappins for the git logRémi Verschelde2018-01-081-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://git-scm.com/docs/git-shortlog#_mapping_authors Makes for a prettier commit overview: $ git shortlog -s -n --no-merges 1673 Juan Linietsky 696 Rémi Verschelde 239 volzhs 225 Andreas Haas 209 Ignacio Etcheverry 164 Daniel J. Ramirez 164 Pedro J. Estébanez 153 George Marques 150 Paul Batty 129 Poommetee Ketson 122 Franklin Sobrinho 120 marynate 115 Bojidar Marinov 107 Leon Krause 96 Thomas Herzog ...
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #15504 from Jerome67000/fix_inherits_open_file_typeRémi Verschelde2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Attach Node Script" inherits popup type
| * | | | | | | | | | | | | | | | | | | | | | Fix "Attach Node Script" inherits popup typeJerome670002018-01-081-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #15500 from Jerome67000/removed_depthprepass_disableRémi Verschelde2018-01-081-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | removed unused project setting rendering/quality/depth_prepass/disable
| * | | | | | | | | | | | | | | | | | | | | removed unused project setting rendering/quality/depth_prepass/disableJerome670002018-01-081-2/+0
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15490 from AndreaCatania/kinRémi Verschelde2018-01-087-70/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed #15417 kinematics char jumping
| * | | | | | | | | | | | | | | | | | | | | Removed useless error print on bullet shapesAndreaCatania2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixed Bullet collision shapes scaleAndreaCatania2018-01-087-69/+65
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15498 from poke1024/fix15478Rémi Verschelde2018-01-081-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete edit menu too early when closing script tabs
| * | | | | | | | | | | | | | | | | | | | | Don't delete edit menu too early when closing script tabsBernhard Liebl2018-01-081-1/+3
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15494 from brainsick/obsolete-undoredo-max-stepsRémi Verschelde2018-01-083-38/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete UndoRedo max_steps; no users identified
| * | | | | | | | | | | | | | | | | | | | | obsolete UndoRedo max_steps; no users identifiedTodd Ross2018-01-083-38/+0
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15060 from poke1024/camera2d-updateRémi Verschelde2018-01-081-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS
| * | | | | | | | | | | | | | | | | | | | Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESSBernhard Liebl2018-01-081-6/+6
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #15491 from volzhs/doc-kinematicbodyRémi Verschelde2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Fix KinematicBody documentation about move_and_slide
| * | | | | | | | | | | | | | | | | | | Fix KinematicBody documentation about move_and_slidevolzhs2018-01-091-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #14907 from scayze/rigid_vehicleJuan Linietsky2018-01-083-77/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added RigidBody functionality to VehicleBody
| * | | | | | | | | | | | | | | | | | | | Added RigidBody functionality to VehicleBodyScayze2018-01-073-77/+22
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15294 from poke1024/fix-debug-hangsRémi Verschelde2018-01-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fix Godot getting swamped by debug events
| * | | | | | | | | | | | | | | | | | | | Fix Godot getting swamped by debug eventsBernhard Liebl2018-01-031-0/+5
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #15337 from ↵Rémi Verschelde2018-01-081-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touilleMan/fix-classdb_get_method_list-without-instrospection Fix _ClassDB::get_method_list when instrospection is disabled
| * | | | | | | | | | | | | | | | | | | | | Fix _ClassDB::get_method_list to returns only what's available when ↵Emmanuel Leblond2018-01-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introspection is disabled
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #15344 from bruvzg/osx_dylib_exportRémi Verschelde2018-01-083-2/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [GDnative] macOS `dylib` export fixes
| * | | | | | | | | | | | | | | | | | | | | | Adds dylib export for "dmg" export mode and change dylib path to ↵bruvzg2018-01-043-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "/Contents/Frameworks"
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15377 from mrcdk/wav_correct_loopRémi Verschelde2018-01-081-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed loop mode values when importing a wav file.
| * | | | | | | | | | | | | | | | | | | | | | | Fixed loop mode values when importing a wav file.MrCdK2018-01-051-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Importing a wav file that was exported with a custom loop type was causing it being imported with loop mode ping-pong
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15455 from Jerome67000/color_names.in_docRémi Verschelde2018-01-082-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add standardised color names to doc
| * | | | | | | | | | | | | | | | | | | | | | | | Add standardised color names to docJerome670002018-01-082-3/+6
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15475 from sambler/freebsd_execvpRémi Verschelde2018-01-081-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix use of execvp for freebsd
| * | | | | | | | | | | | | | | | | | | | | | | | Fix use of execvp, earlier fix was short sighted and only workedsambler2018-01-081-11/+13
| |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when godot could be found in PATH. The correct fix is to use sysctl to get the path to the current executable this also fixes the ability to call external commands.
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15480 from StateOff/fixes_deleted_nodes_in_historyRémi Verschelde2018-01-084-8/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #15416 - "The deleted nodes are hanging in the inspector."
| * | | | | | | | | | | | | | | | | | | | | | | Fixes #15416 - "The deleted nodes are hanging in the inspector."Blazej Floch2018-01-084-8/+19
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15483 from Noshyaar/pbmRémi Verschelde2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix imported BitMap dimension flip
| * | | | | | | | | | | | | | | | | | | | | | | Fix imported BitMap dimension flipPoommetee Ketson2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15458 from volzhs/fix-editor-settings-1Rémi Verschelde2018-01-083-34/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix editor setting value is back to default
| * | | | | | | | | | | | | | | | | | | | | | | | Fix editor setting value is back to defaultvolzhs2018-01-083-34/+67
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #15449
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15426 from poke1024/fix15409Rémi Verschelde2018-01-081-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes RegEx::sub injecting null character (issue 15409)
| * | | | | | | | | | | | | | | | | | | | | | | | Fixes RegEx::sub injecting null character (issue 15409)Bernhard Liebl2018-01-071-11/+16
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15461 from endragor/better-loading-screen-msgRémi Verschelde2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve missing iOS loading screen error message
| * | | | | | | | | | | | | | | | | | | | | | | | Improve missing iOS loading screen error messageRuslan Mustakov2018-01-071-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15457 from volzhs/custom-font-source-codeRémi Verschelde2018-01-083-56/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set source code font with ttf, otf
| * | | | | | | | | | | | | | | | | | | | | | | | Set source code font with ttf, otfvolzhs2018-01-083-56/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed interface/editor/custom_font to interface/editor/main_font moved text_editor/theme/font to interface/editor/code_font renamed interface/editor/font_size to interface/editor/main_font_size renamed interface/editor/source_code_size to interface/editor/code_font_size
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15440 from volzhs/fix-android-touchRémi Verschelde2018-01-083-20/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix Android multi touch
| * | | | | | | | | | | | | | | | | | | | | | | | Fix Android multi touchvolzhs2018-01-073-20/+19
| |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #11798
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #15433 from poke1024/fix13957George Marques2018-01-071-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash due to stale refs to node selection lists