summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #39080 from m4gr3d/fix_emit_signalRémi Verschelde2020-05-271-2/+4
|\ | | | | Use compile-time constant for the size of the signal parameters
| * Use compile-time constant for the size of the signal parametersFredia Huya-Kouadio2020-05-271-2/+4
| |
* | Merge pull request #39062 from akien-mga/du-pain-et-des-jeuxRémi Verschelde2020-05-272-1/+2
|\ \ | | | | | | Add shortcut for Pan Mode (G)
| * | Add shortcut for Pan Mode (G)Rémi Verschelde2020-05-262-1/+2
| | | | | | | | | | | | | | | | | | And change TileMap Bucket Fill shortcut to (B). Fixes #8582.
* | | Merge pull request #39064 from bruvzg/gdn_packed_array_ptrRémi Verschelde2020-05-273-0/+243
|\ \ \ | | | | | | | | GDNative: Add bindings for the Packed*Array ptr() and ptrw() functions.
| * | | GDNative: Add bindings for the Packed*Array ptr() and ptrw() functions.bruvzg2020-05-263-0/+243
| |/ /
* | | Merge pull request #39066 from Xrayez/is-module-yesRémi Verschelde2020-05-271-1/+1
|\ \ \ | | | | | | | | Do not rely on the existence of `config.py` while detecting modules
| * | | Do not rely on the existence of `config.py` while detecting modulesAndrii Doroshenko (Xrayez)2020-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The existence of `SCsub` is checked instead. This file is required for all modules, and prevents the build system to leave modules without `config.py` undetected, leading to silently ignoring the module during compilation.
* | | | Merge pull request #39079 from mrushyendra/exposeGetCharSizeRémi Verschelde2020-05-273-13/+12
|\ \ \ \ | | | | | | | | | | Expose `get_char_size()` from Font instead of BitmapFont
| * | | | Expose `get_char_size()` from Font instead of BitmapFontMaganty Rushyendra2020-05-273-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `get_char_size()` is a public virtual function defined in the `Font` class. Implementations exist for both `BitmapFont` and `Dynamic Font`. However, it was only exposed to the GDScript API through the Bitmap Font, and not for Dynamic Font. This commit exposes the function through `Font` instead. Fixes #23967
* | | | | Merge pull request #39077 from m4gr3d/override_command_line_argsRémi Verschelde2020-05-271-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Provide the ability to override the command line arguments
| * | | | Provide the ability for clients of the Godot library to add their own ↵Fredia Huya-Kouadio2020-05-271-1/+2
|/ / / / | | | | | | | | | | | | command line arguments
* | | | Merge pull request #36409 from fire/skeleton-custom-inspectorRémi Verschelde2020-05-277-59/+798
|\ \ \ \ | | | | | | | | | | Custom Skeleton3DEditorPlugin
| * | | | Custom Skeleton3DEditorPluginK. S. Ernest (iFire) Lee2020-05-227-59/+798
| | | | | | | | | | | | | | | | | | | | Co-authored-by: Marios Staikopoulos <marios@staik.net>
* | | | | Merge pull request #39074 from vnen/gdscript-assert-messageRémi Verschelde2020-05-271-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix assert message when no custom message is set
| * | | | | GDScript: Fix assert message when no custom message is setGeorge Marques2020-05-261-2/+5
| | | | | |
* | | | | | Merge pull request #39070 from bruvzg/win7_ignore_empty_tab_driverRémi Verschelde2020-05-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ignore invalid tablet driver name, when non are available.
| * | | | | | Ignore invalid tablet driver name, when non are available.bruvzg2020-05-261-0/+3
|/ / / / / /
* | | | | | Merge pull request #39050 from timoschwarzer/google-play-billing-4.0Rémi Verschelde2020-05-2615-1916/+213
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | (4.0) Re-implement GodotPayment Android plugin using the Google Play Billing library
| * | | | | Re-implement GodotPayment Android plugin using the Google Play Billing libraryTimo Schwarzer2020-05-2515-1916/+213
| | | | | |
* | | | | | Merge pull request #28289 from aaronfranke/gridRémi Verschelde2020-05-264-63/+173
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dynamic infinite 3D grid
| * | | | | | Dynamic infinite 3D gridAaron Franke2020-05-224-63/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, infinite for all intents and purposes.
* | | | | | | Merge pull request #37088 from ThakeeNathees/color-picker-margin-bug-fixRémi Verschelde2020-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix: colorpicker margin bug fixed
| * | | | | | | colorpicker margin bug fixedThakee Nathees2020-05-261-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #39057 from mrushyendra/mono_csharp_warningRémi Verschelde2020-05-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update Mono C# warning to reflect latest list of platforms supported
| * | | | | | | Update Mono C# warning to reflect latest list of platforms supportedMaganty Rushyendra2020-05-261-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fix for #38627. iOS (#20268) and HTML5 (#20270) removed from list of exceptions for platforms supported in warning message.
* | | | | | | Merge pull request #38996 from mbrlabs/android-plugin-fixRémi Verschelde2020-05-252-0/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Perform a clean Gradle build if android plugins changed
| * | | | | | | Perform a clean Gradle build if android plugins changedMarcus Brummer2020-05-252-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #38986
* | | | | | | | Merge pull request #39047 from m4gr3d/fix_emit_signalRémi Verschelde2020-05-251-2/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Fix parameters passing when emitting signal
| * | | | | | | Fix parameters passing when emitting signalFredia Huya-Kouadio2020-05-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was caused because we were using variables local to the `for` loop block.
* | | | | | | | Merge pull request #39049 from m4gr3d/stop_ignoring_hidden_files_in_assetsRémi Verschelde2020-05-251-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Stop ignoring hidden files and directories in the `assets` directory
| * | | | | | | Stop ignoring hidden files and directories in the `assets` directoryFredia Huya-Kouadio2020-05-251-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #39045 from akien-mga/projectsettings-setup-docsRémi Verschelde2020-05-251-29/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Improve documentation of ProjectSettings::setup
| * | | | | | Improve documentation of ProjectSettings::setupRémi Verschelde2020-05-251-29/+38
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Subsequent PRs adding and fixing support for bundled PCKs did not update the documentation /o\
* | | | | | Merge pull request #39015 from ↵Rémi Verschelde2020-05-251-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ThakeeNathees/dict-key-autocomplete-regression-fix regression: dictionary key no autocomplete fix
| * | | | | | regression: dictionary key no autocomplete fixThakee Nathees2020-05-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: #38998
* | | | | | | Merge pull request #39037 from Faless/js/audio_latencyRémi Verschelde2020-05-251-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix JS audioContext parameters.
| * | | | | | | Fix JS audioContext parameters.Fabio Alessandrelli2020-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Were not passed along correctly. `latencyHint` is supposed to be in seconds, not milliseconds.
* | | | | | | | Merge pull request #36922 from Xrayez/modules-search-pathRémi Verschelde2020-05-256-67/+124
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add `custom_modules` build option to compile external, user-defined C++ modules
| * | | | | | | Add `custom_modules` build option to compile external user modulesAndrii Doroshenko (Xrayez)2020-05-256-67/+124
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds ability to include external, user-defined C++ modules to be compiled as part of Godot via `custom_modules` build option which can be passed to `scons`. ``` scons platform=x11 tools=yes custom_modules="../project/modules" ``` Features: - detects all available modules under `custom_modules` directory the same way as it does for built-in modules (not recursive); - works with both relative and absolute paths on the filesystem; - multiple search paths can be specified as a comma-separated list. Module custom documentation and editor icons collection and generation process is adapted to work with absolute paths needed by such modules. Also fixed doctool bug mixing absolute and relative paths respectively. Implementation details: - `env.module_list` is a dictionary now, which holds both module name as key and either a relative or absolute path to a module as a value. - `methods.detect_modules` is run twice: once for built-in modules, and second for external modules, all combined later. - `methods.detect_modules` was not doing what it says on the tin. It is split into `detect_modules` which collects a list of available modules and `write_modules` which generates `register_types` sources for each. - whether a module is built-in or external is distinguished by relative or absolute paths respectively. `custom_modules` scons converter ensures that the path is absolute even if relative path is supplied, including expanding user paths and symbolic links. - treats the parent directory as if it was Godot's base directory, so that there's no need to change include paths in cases where custom modules are included as dependencies in other modules.
* | | | | | | Fix build after merge of #37235Rémi Verschelde2020-05-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It used APIs that were changed after the PR was last rebased.
* | | | | | | Merge pull request #37235 from Calinou/improve-editor-feature-profilesRémi Verschelde2020-05-252-5/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the editor feature profiles UX
| * | | | | | | Improve the editor feature profiles UXHugo Locurcio2020-03-222-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an help message when no profile is selected. - This replaces the class/property trees which are now hidden when no profile is selected. - Display `(none)` as the current profile when no profile is currently active. - Make the newly created/imported profile the current if it's the first profile to be added to the list. - Make more strings localizable.
* | | | | | | | Merge pull request #38887 from AndreaCatania/oahash_impRémi Verschelde2020-05-252-9/+116
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | OAHashMap crash fix and copy feature.
| * | | | | | | | - Make sure it's impossible to initialize an OAHashMap with 0 capacity ↵Andrea Catania2020-05-252-9/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (would cause division by 0) - Added possibility to copy an OAHashMap - Added unit tests This code is generously donated by IMVU.
* | | | | | | | | Merge pull request #39023 from KoBeWi/reinventing_the_wheelRémi Verschelde2020-05-251-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Reverse mouse wheel in animation track editor
| * | | | | | | | | Reverse mouse wheel in animation track editorTomasz Chabora2020-05-251-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #38262 from Xrayez/resurrect-issuesRémi Verschelde2020-05-251-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bring back and improve comments clarifying the new bug report template
| * | | | | | | | | Bring back and improve comments clarifying the new bug report templateAndrii Doroshenko (Xrayez)2020-05-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comments clarifying the questions were accidentally removed in c8e92b802c16f8f9d120bf01bc5923c702a3c3ff while migrating to the bug/feature templates workflow. [ci skip]
* | | | | | | | | | Merge pull request #38978 from nekomatata/remote-inspector-res-previewFabio Alessandrelli2020-05-251-9/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | Fix resource preview in remote inspector