aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12517 from marcelofg55/x11_kbd_variantRémi Verschelde2017-10-302-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented OS get_latin_keyboard_variant on x11
| * | | | | | | | | | | | | | | | | | | | | | Implemented OS get_latin_keyboard_variant on x11Marcelo Fernandez2017-10-302-0/+34
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12522 from neikeq/where.exe-is-a-liarRémi Verschelde2017-10-301-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'which' returning file without extension on Windows
| * | | | | | | | | | | | | | | | | | | | | | Fix 'which' returning file without extension on WindowsIgnacio Etcheverry2017-10-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Clean up GI Probe baking, proper button and progress bar.Juan Linietsky2017-10-304-1/+59
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12484 from pigdevstudio/docs-occluder-polygon-2dRémi Verschelde2017-10-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Added documentation for OccluderPolygon2D [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | [DOCS] Added documentation for OccluderPolygon2DHenrique Campos2017-10-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12511 from sanikoyes/pr-fix-tabs-crashRémi Verschelde2017-10-301-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Fix crash when click an empty tabs container
| * | | | | | | | | | | | | | | | | | | | | | Fix crash when click an empty tabs containersanikoyes2017-10-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12508 from sanikoyes/pr-missing-StyleBoxLineRémi Verschelde2017-10-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing StyleBoxLine binding [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | Add missing StyleBoxLine bindingsanikoyes2017-10-301-0/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12467 from marcelofg55/emscripten_detectRémi Verschelde2017-10-301-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect javascript platform using EMSCRIPTEN env as well [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | Detect javascript platform using EMSCRIPTEN env as wellMarcelo Fernandez2017-10-281-2/+5
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12489 from groud/fix_moving_control_with_direction_keyRémi Verschelde2017-10-301-26/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes keybord directionnal keys not moving nodes in the 2D editor
| * | | | | | | | | | | | | | | | | | | | | | Fixes keybord directionnal keys not moving nodes in the 2D editorGilles Roudiere2017-10-291-26/+26
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12495 from Paulb23/line_edit_multi_level_undoRémi Verschelde2017-10-302-31/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added multi level undo redo to line edit
| * | | | | | | | | | | | | | | | | | | | | | Added multi level undo redo to line editPaulb232017-10-292-31/+88
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12492 from akien-mga/locale-noRémi Verschelde2017-10-303-65/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | Add support for non-ISO "no" locale on Windows
| * | | | | | | | | | | | | | | | | | | | | | Add support for non-ISO locale identifiers via renames mapRémi Verschelde2017-10-303-65/+75
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows apparently uses "no" for Norwegian Bokmål, even though its ISO 639-1 language code is "nb"... Closes #12479. Also did some non-intrusive cleanup while at it.
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12491 from neikeq/waitasecond···Ignacio Etcheverry2017-10-293-24/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix FrameworkPathOverride and assemblies path loop
| * | | | | | | | | | | | | | | | | | | | | | Fix FrameworkPathOverride and assemblies path loopIgnacio Etcheverry2017-10-293-24/+35
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #12490 from nbcks/masterRémi Verschelde2017-10-291-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | added support for paths with spaces for VSBUILDS
| * | | | | | | | | | | | | | | | | | | | | | added support for paths with spaces for VSBUILDSnicholasbuckner2017-10-291-3/+7
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a problem with MSBuild in that windows file paths end with a backslash, which was escaping the last of the double quotes which surround the $(ProjectDir) directive. This was fixed by removing the last backslash through changing it to $(ProjectDir.TrimEnd('\')).
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12485 from hoelzl/pr-python3-buildRémi Verschelde2017-10-292-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build with Python 3 on Windows
| * | | | | | | | | | | | | | | | | | | | | | Fix build with Python 3 on WindowsMatthias Hoelzl2017-10-292-5/+11
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Fix typo in project managerRémi Verschelde2017-10-2937-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | | | Mono: Fix Windows buildRémi Verschelde2017-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | libpng: Cosmetic update to upstream 1.6.34Rémi Verschelde2017-10-296-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No code change in the part we are using, it only affected contrib code. [ci skip]
* | | | | | | | | | | | | | | | | | | | | | Disable logging until the logs location is sorted outRémi Verschelde2017-10-296-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround for #12277.
* | | | | | | | | | | | | | | | | | | | | | i18n: Sync translation templates with current sourceRémi Verschelde2017-10-2936-551/+2499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | | | i18n: Sync translations with WeblateRémi Verschelde2017-10-2935-1939/+8771
| |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12437 from mhilbrunner/astar-setpointweightscaleRémi Verschelde2017-10-293-17/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AStar: Add setters for point position and scale weight, cleanup
| * | | | | | | | | | | | | | | | | | | | | AStar: Add setters for point position and scale weight, cleanupUnknown2017-10-273-17/+69
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | classref: Apply doctool to fix formattingRémi Verschelde2017-10-293-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression from #12396 which caused #12466. [ci skip]
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12475 from neikeq/ohuiiiRémi Verschelde2017-10-293-66/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Fix regression from #12473 and #12388
| * | | | | | | | | | | | | | | | | | | | | Fix regression from #12473 and #12388Ignacio Etcheverry2017-10-293-66/+54
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12474 from neikeq/sRémi Verschelde2017-10-298-17/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | Mono: Add build project button and reload interval
| * | | | | | | | | | | | | | | | | | | | | Mono: Add build project button and reload intervalIgnacio Etcheverry2017-10-298-17/+96
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12473 from neikeq/Alpha2?-Let'sDoThisIgnacio Etcheverry2017-10-292-535/+572
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BindingsGenerator cleanup and improved error messages
| * | | | | | | | | | | | | | | | | | | | | BindingsGenerator cleanup and improved error messagesIgnacio Etcheverry2017-10-292-535/+572
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is an error generating a property or a method, the error message will include the member and class names.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12388 from neikeq/rIgnacio Etcheverry2017-10-296-112/+338
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buildsystem improvements for the Mono module
| * | | | | | | | | | | | | | | | | | | | | Buildsystem improvements for the Mono moduleIgnacio Etcheverry2017-10-296-112/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure to search the mono installation directory for the right architecture in the windows registry. - Do not build GodotSharpTools directly to #bin dir. Instead build to the default output path and copy it. This way we avoid MSBuild adding files we don't want to #bin. - Add hint path for MSBuild in OSX. - Copy shared library on Unix if not statically linking. - Use vswhere to search MSBuild and search for 14.0 tools version in the registry instead of 4.0. - SCons will only fallback xbuild when msbuild is not found if 'xbuild_fallback=yes' is passed to the command. - Use mono's assembly path as FrameworkPathOverride if using with system's MSBuild (not mono's fork). - Cleanup.
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12445 from MattUV/docs-editingPoommetee Ketson2017-10-291-23/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS]Completed LineEdit.xml [ci skip]
| * | | | | | | | | | | | | | | | | | | | | [DOCS]Completed LineEdit.xmlMattUV2017-10-281-23/+35
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12396 from AntiSC2/masterChris Bradfield2017-10-281-16/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DOCS] Add and polish up documentation for Image methods
| * | | | | | | | | | | | | | | | | | | | | Add and polish up documentation for Image methodsJakob Sinclair2017-10-261-16/+55
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Written new documentation for undocumented methods. The already documented methods seemed to follow a very old style and changed them to fit the new guidelines for documentation. Signed-off-by: Jakob Sinclair <sinclair.jakob@mailbox.org>
* | | | | | | | | | | | | | | | | | | | | Merge pull request #12389 from Chaosus/continuehotkeyRémi Verschelde2017-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hotkey for Continue action in Script editor [ci skip]
| * | | | | | | | | | | | | | | | | | | | | Added hotkey for Continue actionChaosus2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #12448 from larsonjj/fix/property_editor_hidpiRémi Verschelde2017-10-281-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed scaling issues with editor action button and value editor popovers
| * | | | | | | | | | | | | | | | | | | | | | Fixed interface scaling issues with editor action button and value editor ↵Jake Larson2017-10-271-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popovers