aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4843 from ↵Rémi Verschelde2016-05-292-0/+61
|\ | | | | | | | | Paulb23/breakpoints_next_prev_and_remove_issue_1690 Added, goto next and previous breakpoint and remove all, issue 1690
| * Added, goto next and previous breakpoint and remove all, issue 1690Paulb232016-05-272-0/+61
| |
* | Merge pull request #4823 from Paulb23/fix_backspace_selection_redo_crashRémi Verschelde2016-05-291-1/+3
|\ \ | | | | | | Fix crash when redoing backspace to clear selection
| * | Fix crash when redoing backspace to clear selectionPaulb232016-05-261-1/+3
| |/
* | Merge pull request #4822 from Paulb23/breakpoint_marker_issue_4750Rémi Verschelde2016-05-294-6/+67
|\ \ | | | | | | Added breakpoint markers, issue 4750
| * | Added breakpoint markers, issue 4750Paulb232016-05-264-6/+67
| |/
* | Merge pull request #4814 from neikeq/pr-issue-4805Rémi Verschelde2016-05-291-1/+1
|\ \ | | | | | | Debugger: show error message if description is not available
| * | Debugger: show error message if description is not availableIgnacio Etcheverry2016-05-251-1/+1
| |/
* | Merge pull request #4812 from neikeq/pr-search-barRémi Verschelde2016-05-299-55/+640
|\ \ | | | | | | ScriptEditor/ShaderEditor: Replace find/replace dialog with a bar
| * | ScriptEditor/ShaderEditor: Replace find/replace dialog with a barIgnacio Etcheverry2016-05-299-47/+621
| | |
| * | TextEdit: Improve search method to avoid overlapping resultsIgnacio Etcheverry2016-05-281-7/+17
| | |
| * | TextEdit: Avoid capturing KEY_ESCAPE when there is no completion hintIgnacio Etcheverry2016-05-281-1/+2
| |/
* | Merge pull request #4810 from marcelofg55/masterRémi Verschelde2016-05-291-1/+8
|\ \ | | | | | | Added application/fat_bits property for EditorExportPlatformOSX::Edit…
| * | Added application/fat_bits property for ↵marcelofg552016-05-251-1/+8
| |/ | | | | | | EditorExportPlatformOSX::EditorExportPlatformOSX
* | Merge pull request #4871 from Geequlim/translation-zh_cnRémi Verschelde2016-05-291-0/+5781
|\ \ | | | | | | Add Simplified Chinese translation
| * | Simplified Chinese Translation:Geequlim2016-05-301-134/+131
| | | | | | | | | | | | | | | Fix issuse in last commit Add more translation
| * | Add Simplified Chinese translationGeequlim2016-05-301-0/+5784
|/ /
* | FreeType: Add mandatory license textRémi Verschelde2016-05-292-0/+208
| | | | | | | | Part of #4859.
* | fix freetype paths on osx and mingwJuan Linietsky2016-05-292-4/+5
| |
* | Finalized DynamicFont implementationJuan Linietsky2016-05-29511-207/+3795
| | | | | | | | | | | | -DynamicFont uses Freetype by default -Editor fonts are now scalable thanks to this -Cleaned up documentation browser and added fonts for this
* | Merge pull request #4868 from Geequlim/more-tranlatableRémi Verschelde2016-05-2912-27/+20
|\ \ | | | | | | Set more visible string to translatable
| * | Set more visible string to translatableGeequlim2016-05-2912-27/+20
|/ /
* | Merge pull request #4860 from Griefchief/msvc_build_fixGeorge Marques2016-05-282-7/+20
|\ \ | | | | | | Fix MS Visual Studio build settings
| * | Fix MS Visual Studio build settingsAleksandar Danilovic2016-05-282-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NMake was not setup by the vsproj=yes compilation parameter. After attempting other possible options, this is the best fix for our current requirements. Compiling via NMake is implementing an alternative to SCons, so this fix escapes out of NMake environment while also supporting different target builds and IDE error list integration. Also sets -j setting to 2 so that it's easy for people to change it to a propper value and speed it up a bit for those that do not. Adds two missing .gitignore Visual Studio temp files present in Visual Studio's .gitignore.
* | | Merge pull request #4864 from StraToN/classes-ref-writingRémi Verschelde2016-05-291-0/+57
|\ \ \ | |/ / |/| | Documentation : BackBufferCopy, Light2D, LightOccluder2D
| * | Documented Light2D and LightOccluder2DJulian Murgia - StraToN2016-05-291-0/+48
| | |
| * | Documented BackBufferCopy. Need validation for the different copy modes ↵Julian Murgia - StraToN2016-05-281-0/+9
|/ / | | | | | | (constants)
* | Merge pull request #4857 from akien-mga/pr-fix-pm-base-dirRémi Verschelde2016-05-281-2/+2
|\ \ | | | | | | Editor: Fix base dir when going back to project manager
| * | Editor: Fix base dir when going back to project managerRémi Verschelde2016-05-281-2/+2
|/ / | | | | | | | | This caused the PM to load with the parameters of the previously loaded project. Was a regression from ea751724a21e3513ff2291aa24491e9d91c8c0f0. Closes #4045.
* | i18n: Sync translations with templateRémi Verschelde2016-05-281-154/+278
| |
* | i18n: Add makefile to handle translation updatesRémi Verschelde2016-05-282-2/+22
| |
* | i18n: Fix typo and sync templateRémi Verschelde2016-05-282-136/+219
| |
* | Merge pull request #4852 from MarianoGnu/masterMariano Javier Suligoy2016-05-281-0/+1
|\ \ | | | | | | Remove focus from Sprite Region Editor dialog. Fixes #4751
| * | Remove focus from Sprite Region Editor dialog. Fixes #4751MarianoGNU2016-05-271-0/+1
| | |
* | | Added translation support to GodotJuan Linietsky2016-05-2710-13/+5847
| | | | | | | | | | | | included is a French translation!
* | | Changed import workflowJuan Linietsky2016-05-2754-636/+1258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
* | | Merge pull request #4839 from Geequlim/fix-memory-compiler-warnningsRémi Verschelde2016-05-271-5/+4
|\ \ \ | |/ / |/| | Add spaces to macros in memory.h to make C++11 compilers happy
| * | Add spaces to macros in memory.h to make C++11 compilers happyGeequlim2016-05-271-5/+4
|/ /
* / README.md: Add codetriage badgeRémi Verschelde2016-05-271-0/+1
|/
* Merge pull request #4808 from Paulb23/mark_and_breakpoint_colorsRémi Verschelde2016-05-253-0/+8
|\ | | | | Added settings to change marked and breakpoint color
| * Added settings to change marked and breakpoint colorPaulb232016-05-253-0/+8
|/
* Merge pull request #4806 from Hinsbart/sregion_tooltipRémi Verschelde2016-05-251-0/+1
|\ | | | | Set tooltip for SpriteRegionEditor
| * Set tooltip for SpriteRegionEditorAndreas Haas2016-05-251-0/+1
| |
* | Merge pull request #4788 from volzhs/dir-error-windowsRémi Verschelde2016-05-251-3/+3
|\ \ | | | | | | fix unexpected char: '\' error on windows for android module
| * | fix unexpected char: '\' error on windowsvolzhs2016-05-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error occurred when register additional directory for android module on windows. ### config.py ### ``` def can_build(plat): return plat=="android" def configure(env): if (env['platform'] == 'android'): env.android_add_res_dir("android/res") ```
* | | Merge pull request #4800 from Hinsbart/tilemap_zoomRémi Verschelde2016-05-244-3/+50
|\ \ \ | | |/ | |/| Add a slider for zooming TileMap preview icons.
| * | Add a slider for zooming TileMap preview icons.Andreas Haas2016-05-242-0/+23
| | | | | | | | | | | | Fixes #2413
| * | Allow ItemList icons to stretch to max size.Andreas Haas2016-05-242-3/+27
| | |
* | | Merge pull request #4784 from neikeq/pr-missing-4296Rémi Verschelde2016-05-241-0/+1
|\ \ \ | |/ / |/| | Save line number color with text editor theme
| * | Save line number color with text editor themeIgnacio Etcheverry2016-05-231-0/+1
| |/