aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #10861 from Noshyaar/pr-headerRémi Verschelde2017-09-0142-43/+42
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix files headerPoommetee Ketson2017-09-0142-43/+42
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10318 from endragor/ordered-hash-mapRémi Verschelde2017-09-016-38/+592
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Implement OrderedHashMapRuslan Mustakov2017-08-136-38/+592
* | | | | | | | | Merge pull request #10853 from leezh/pcre_html5_fixRémi Verschelde2017-09-011-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disabled PCRE-JIT in HTML5. Fixes #10834Zher Huei Lee2017-09-011-2/+5
* | | | | | | | | | Merge pull request #10848 from hpvb/fix-has-method-on-scriptRémi Verschelde2017-09-011-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Has_method is already provided by ObjectHein-Pieter van Braam2017-09-011-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10832 from Paulb23/auto_indent_settingRémi Verschelde2017-09-013-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added setting to toggle auto indentPaulb232017-08-313-0/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #10821 from rtroncoso/fix-import-defaultsRémi Verschelde2017-09-011-7/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix import dock defaults: Set as default actionsRodrigo Troncoso2017-08-311-7/+5
* | | | | | | | | | Merge pull request #10841 from djrm/pr_update_builtin_typesRémi Verschelde2017-09-011-5/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated Editor Built-In types.Daniel J. Ramirez2017-08-311-5/+17
* | | | | | | | | | | Merge pull request #10840 from rtroncoso/fix-reimporter-defaults-loadRémi Verschelde2017-09-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix importer not applying saved default settings on loadRodrigo Troncoso2017-08-311-1/+1
* | | | | | | | | | | | Fix special case where KinematicBody fails one way collisions by adding exclu...Juan Linietsky2017-08-313-7/+57
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix issues regarding reload of resources in imported scenes. Closes #10017Juan Linietsky2017-08-3111-63/+116
* | | | | | | | | | | Merge pull request #10837 from touilleMan/fix-godot_string_find_last-nameThomas Herzog2017-08-312-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct GDnative's godot_string_find_last method nameEmmanuel Leblond2017-08-312-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #10831 from Noshyaar/pr-inertiaRémi Verschelde2017-08-312-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix typo 'inetria' to 'inertia'Poommetee Ketson2017-09-012-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10791 from tuga3d/indent-glitch-attempt-2Rémi Verschelde2017-08-311-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | second attempt on fixing the indent glitch.Paulo Gomes2017-08-301-3/+3
* | | | | | | | | | Merge pull request #10816 from toger5/style_box_texture_set_fillRémi Verschelde2017-08-316-41/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unified draw_center naming for (9patch,StyleBoxes)toger52017-08-316-41/+41
* | | | | | | | | | | Merge pull request #10825 from toger5/fix_import_svg_scaleRémi Verschelde2017-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | updated import settings loader to 'svg/scale' fixes: #10815toger52017-08-311-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #10823 from toger5/fix_VSlider_focus_non_existentRémi Verschelde2017-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | changed-"HSlider" -> "VSlider" for focus style fixes #728toger52017-08-311-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #10820 from toger5/imoporter_dock_update_labelRémi Verschelde2017-08-312-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fixed update import label in importer docktoger52017-08-312-0/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #10818 from Jellonator/masterRémi Verschelde2017-08-311-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fixed return of KinematicBody::_moveJames Beedie2017-08-311-1/+2
* | | | | | | | | | Exposed new ClearMode function to Viewport clases, closes #9995Juan Linietsky2017-08-312-20/+21
* | | | | | | | | | Merge pull request #10814 from volzhs/editor-fonts-masterRémi Verschelde2017-08-3112-40/+151
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Replace editor font to NotoSans for Latin, Arabic, Hebrew, Thaivolzhs2017-08-3111-40/+145
| * | | | | | | | | Update source code pro font to 2.030volzhs2017-08-312-0/+6
* | | | | | | | | | Contributors missing in project manager titleJuan Linietsky2017-08-311-1/+1
* | | | | | | | | | Fixed problem with non triplanar UV2 mode as described in issue. Closes #9979Juan Linietsky2017-08-312-2/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #10811 from godotengine/revert-10590-fix-10589Rémi Verschelde2017-08-311-6/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Revert "Fix shader function calls being assignable"Rémi Verschelde2017-08-311-6/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #10096 from toger5/label_styleboxRémi Verschelde2017-08-314-13/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed Import LineEdit to label + label styleboxtoger52017-08-174-13/+19
* | | | | | | | | Do not error flood if removing default environment. Closes #9945Juan Linietsky2017-08-311-0/+4
* | | | | | | | | Merge pull request #10422 from endragor/gdnative-androidRémi Verschelde2017-08-3122-321/+447
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make GDNative work on AndroidRuslan Mustakov2017-08-3022-321/+447
* | | | | | | | | | Merge pull request #10305 from H4kor/gles3Juan Linietsky2017-08-311-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed multimesh_instance_get_colorNiko Abeler2017-08-121-1/+3
* | | | | | | | | | | Merge pull request #10401 from maxim-sheronov/fix_particles_spritesheetRémi Verschelde2017-08-312-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |