aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* OS additions and fixes for WebAssembly/asm.jseska2016-11-304-57/+49
* Merge pull request #7109 from volzhs/emit-signal-from-setGeorge Marques2016-11-143-1/+3
|\
| * Emit "*_changed" signal in set_*volzhs2016-11-143-1/+3
* | Merge pull request #7111 from volzhs/crash-import-sceneRémi Verschelde2016-11-142-2/+2
|\ \
| * | Fix crash when select target path on import 3d scene windowvolzhs2016-11-142-2/+2
| |/
* | Merge pull request #7110 from RandomShaper/patch-2Rémi Verschelde2016-11-141-7/+7
|\ \
| * | Update/fix Android buildPedro J. Estébanez2016-11-131-7/+7
| |/
* | Merge pull request #7107 from eska014/wasmRémi Verschelde2016-11-142-2/+8
|\ \
| * | Remove explicit BINARYEN_METHOD for WebAssembly buildeska2016-11-131-1/+0
| * | Enable memory growth in WebAssembly buildseska2016-11-131-0/+7
| * | Clarify a NULL comparisoneska2016-11-131-1/+1
* | | Merge pull request #7101 from volzhs/fix-box-selectionRémi Verschelde2016-11-141-7/+14
|\ \ \ | |_|/ |/| |
| * | Prevent to select children if selection lock or instanced scenevolzhs2016-11-121-7/+14
* | | Merge pull request #6968 from neikeq/pr-register-trnglmeshIgnacio Etcheverry2016-11-121-0/+2
|\ \ \
| * | | Core: Register TriangleMesh typeIgnacio Etcheverry2016-10-301-0/+2
* | | | Merge pull request #7100 from vnen/visualscript-positiveRémi Verschelde2016-11-121-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Add "Positive" operator to VisualScriptGeorge Marques2016-11-111-1/+6
|/ / /
* | | Merge pull request #6998 from volzhs/fix-editor-settingsRémi Verschelde2016-11-111-1/+0
|\ \ \
| * | | Fix resetting to default value in EditorSettingsvolzhs2016-11-011-1/+0
* | | | Merge pull request #6802 from henriquelalves/masterRémi Verschelde2016-11-114-4/+59
|\ \ \ \
| * | | | Added small modification on parser for '+'Henrique L. Alves2016-10-224-4/+59
* | | | | Merge pull request #7082 from volzhs/attach-scriptRémi Verschelde2016-11-114-106/+100
|\ \ \ \ \
| * | | | | Can create or load script on Attach script dialogvolzhs2016-11-114-106/+100
* | | | | | Merge pull request #7079 from RandomShaper/quicker-android-exportRémi Verschelde2016-11-111-19/+19
|\ \ \ \ \ \
| * | | | | | Make Android export quicker (especially on Windows)Pedro J. Estébanez2016-11-081-19/+19
* | | | | | | Merge pull request #7078 from pkowal1982/export_buttonRémi Verschelde2016-11-111-6/+17
|\ \ \ \ \ \ \
| * | | | | | | Export immediately if only one device presentPawel Kowal2016-11-081-6/+17
| |/ / / / / /
* | | | | | | Merge pull request #6862 from Faless/fix_6388Rémi Verschelde2016-11-114-12/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix Keyboard Input Hangs when using modifiersFabio Alessandrelli2016-10-194-12/+12
* | | | | | | | Merge pull request #6833 from Elinvention/masterRémi Verschelde2016-11-111-4/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Make the step property useful for sliders as described in #5773Elia Argentieri2016-10-151-4/+13
* | | | | | | | Merge pull request #7052 from Paulb23/text_edit_color_uniformationRémi Verschelde2016-11-095-36/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Made background and symbol color follow the color APIPaulb232016-11-065-36/+13
* | | | | | | | | Merge pull request #7039 from RandomShaper/fix-triangulationRémi Verschelde2016-11-092-13/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Clean/fix triangulation internalsPedro J. Estébanez2016-11-052-13/+5
* | | | | | | | | Merge pull request #7030 from volzhs/fix-dir-access-androidRémi Verschelde2016-11-092-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Directory.dir_exist/get_current_dir for 'res://' on Androidvolzhs2016-11-092-2/+7
* | | | | | | | | | Merge pull request #7027 from Keetz/masterRémi Verschelde2016-11-091-31/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix scene tree drag & drop places node as child (#6912)Keetz2016-11-031-31/+4
* | | | | | | | | | | Merge pull request #7070 from ISylvox/vsnc-to-vsyncRémi Verschelde2016-11-099-11/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | vsnc --> vsyncISylvox2016-11-089-11/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #7068 from volzhs/fix-project-nameRémi Verschelde2016-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set project name as directory name instead of '.'volzhs2016-11-081-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #7063 from volzhs/pm-auto-selectRémi Verschelde2016-11-092-2/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Select newly created or imported project automaticallyvolzhs2016-11-082-2/+45
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #7060 from volzhs/label-valignRémi Verschelde2016-11-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix Label valign positionvolzhs2016-11-071-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #7058 from SPTelur/Add-Missing-LicenseRémi Verschelde2016-11-092-0/+59
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Some missing License notice has been addedSPTelur2016-11-072-0/+59
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #7053 from Paulb23/caret_blink_redraw_issue_6167George Marques2016-11-062-2/+2
|\ \ \ \ \ \ \ \ \ \