summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Style: Fix unnecessary semicolons that confused clang-formatRémi Verschelde2020-05-1925-159/+64
|
* Merge pull request #33447 from bruvzg/macos_zip_signRémi Verschelde2020-05-191-181/+148
|\ | | | | macOS add signing of DMG and ZIPed export
| * macOS signing improvements: allow signed app exporting as ZIP, sign DMG ↵bruvzg2020-05-151-181/+148
| | | | | | | | after exporting.
* | Merge pull request #38567 from AndreaCatania/AndreaCatania-patch-3Rémi Verschelde2020-05-191-1/+1
|\ \ | | | | | | Removed const from OAHashMap iterator value
| * | Removed const from OAHashMap iterator value Andrea Catania2020-05-081-1/+1
| | | | | | | | | to allows to mutate the value while iterating over it.
* | | Merge pull request #38843 from m4gr3d/update_oculus_hand_tracking_permissionRémi Verschelde2020-05-191-2/+2
|\ \ \ | | | | | | | | Update the permission string for Oculus hand tracking
| * | | Update the permission string for the Oculus hand tracking to match the ↵Fredia Huya-Kouadio2020-05-181-2/+2
|/ / / | | | | | | | | | latest api update
* | | Merge pull request #38826 from bruvzg/gdnative_core_typesRémi Verschelde2020-05-1819-244/+2778
|\ \ \ | | | | | | | | Add new (and rename changed) core types to GDNative API.
| * | | GDNative add new core types.bruvzg2020-05-1819-244/+2778
| | | |
* | | | Merge pull request #38711 from clayjohn/force-floatRémi Verschelde2020-05-181-2/+2
|\ \ \ \ | | | | | | | | | | Force using floats in cubemap coefficient
| * | | | Force using floats in cubemap coefficientclayjohn2020-05-121-2/+2
| | | | |
* | | | | Merge pull request #38723 from neikeq/initial-classdb-testRémi Verschelde2020-05-185-218/+1344
|\ \ \ \ \ | | | | | | | | | | | | Added tests for ClassDB
| * | | | | Added tests for ClassDBIgnacio Etcheverry2020-05-165-218/+1344
| | | | | |
* | | | | | Merge pull request #38791 from clayjohn/physical-sky-updateRémi Verschelde2020-05-183-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add night sky to PhysicalSkyMaterial
| * | | | | | Add night sky to PhysicalSkyMaterialclayjohn2020-05-163-1/+23
| | | | | | |
* | | | | | | Merge pull request #38820 from ericrybick/masterRémi Verschelde2020-05-183-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix certain characters being recognized as special keys on Windows when using the us international layout
| * | | | | | | Fix certain characters being recognized as special keys in Windows when ↵Eric Rybicki2020-05-183-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using the us international layout
* | | | | | | | Merge pull request #38831 from RandomShaper/remove_jpgd_patchRémi Verschelde2020-05-183-78/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove no longer needed patch to jpgd.cpp
| * | | | | | | | Remove no longer needed patches to jpgd.cppPedro J. Estébanez2020-05-183-78/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #38830 from akien-mga/scons-compilationdb-checkRémi Verschelde2020-05-182-7/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SCons: Improve registration of compilation_db tool, check version
| * | | | | | | | SCons: Improve registration of compilation_db tool, check versionRémi Verschelde2020-05-182-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a builtin `toolpath` option we can use for that, so no need to hack around a custom `scons_site` path. The script requires SCons 3.1.1 or later, so we enable it conditionally. Follow-up to #32848.
* | | | | | | | | Merge pull request #38827 from RandomShaper/fix_oa_hash_mapRémi Verschelde2020-05-182-16/+87
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix leaks and crashes in OAHashMap
| * | | | | | | | Fix leaks and crashes in OAHashMapPedro J. Estébanez2020-05-182-16/+87
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the way the lifespan of items is managed to be consistent. Bonus: Simplify cases of destroy-then-emplace.
* | | | | | | | Merge pull request #38816 from Faless/js/fix_audio_driver_4.0Rémi Verschelde2020-05-1812-34/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | AudioDriverJavaScript buffer size calculation.
| * | | | | | | | Move mix_rate, ouput_latency to AudioDriverManagerFabio Alessandrelli2020-05-1811-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each driver used to define the (same) project settings values `audio/mix_rate` and `audio/output_latency`, but the setting names are not driver specific. Overriding is still possible via platform tags.
| * | | | | | | | AudioDriverJavaScript now compute buffer size.Fabio Alessandrelli2020-05-182-15/+35
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Based on mix rate and expected latency.
* | | | | | | | Merge pull request #38825 from akien-mga/glsl-clang-format-fixesRémi Verschelde2020-05-1834-279/+102
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | GLSL: Change shader type specifier from [vertex] to #[vertex]
| * | | | | | | GLSL: Change shader type specifier from [vertex] to #[vertex]Rémi Verschelde2020-05-1834-279/+102
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The added `#` prevents clang-format from misinterpreting the meaning of this statement and thus messing up the formatting of the next lines up until the first `layout` statement. Similarly, a semicolon is now enforced on `versions` defines to prevent clang-format from messing up formatting and putting them all on a single line. Note: In its current state the code will ignore chained statements on a single line separated by a semicolon. Also removed some extraneous lines missed in previous style changes or added by mistake with said changes (e.g. after uniform definitions that clang-format messes up somewhat too, but we live with it).
* | | | | | | Merge pull request #38800 from YeldhamDev/icons_completeRémi Verschelde2020-05-182-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add more missing node icons
| * | | | | | | Add more missing node iconsMichael Alexsander2020-05-172-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #38821 from Xrayez/custom-gitignoreRémi Verschelde2020-05-181-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `custom.py` to .gitignore
| * | | | | | | | Add `custom.py` to .gitignoreAndrii Doroshenko (Xrayez)2020-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default `custom.py` can be created at the root of the Godot repository to initialize any SCons build options via file which are specific to user.
* | | | | | | | | Merge pull request #38811 from Calinou/popupmenu-default-allow-searchRémi Verschelde2020-05-182-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow searching with keyboard input by default in PopupMenu
| * | | | | | | | | Allow searching with keyboard input by default in PopupMenuHugo Locurcio2020-05-172-4/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | See discussion in https://github.com/godotengine/godot-proposals/issues/43.
* / | | | | | | | Update description of Object.free() methodRemi Rampin2020-05-181-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that variables pointing to an object don't become `null` when that object is freed, it just makes them invalid. (cherry picked from commit ccf5703568ab7c33723f322088c83a7d9ebcf5a8)
* | | | | | | | Merge pull request #38804 from m4gr3d/android_plugin_config_masterRémi Verschelde2020-05-1711-52/+532
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Implementation of the Godot Android Plugin configuration file
| * | | | | | | | Implementation of the Godot Android Plugin configuration fileFredia Huya-Kouadio2020-05-1711-52/+532
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #38795 from Calinou/doc-array-dictionary-referenceMax Hilbrunner2020-05-172-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Document that Dictionary is always passed as reference
| * | | | | | | Document that Dictionary is always passed as referenceHugo Locurcio2020-05-162-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | See #38792.
* | | | | | | Merge pull request #38695 from dreamsComeTrue/node-swap-order-argumentsRémi Verschelde2020-05-174-20/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace 'add_child_below_node' with 'add_sibling' in Node
| * | | | | | | Replace 'add_child_below_node' with 'add_sibling' in NodeDominik 'dreamsComeTrue' Jasiński2020-05-154-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19642
* | | | | | | | Merge pull request #38793 from Anutrix/window-popup-centered-rect2-fixRémi Verschelde2020-05-171-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix popup window size calculation in popup_centered_ratio by using Rect2
| * | | | | | | Fix popup window size calculation in popup_centered_ratio by using Rect2unknown2020-05-171-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #38782 from mbrlabs/text-editor-fixRémi Verschelde2020-05-161-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed text editor drawing if smooth scrolling is disabled.
| * | | | | | | Fixed text editor drawing if smooth scrolling is disabled.Marcus Brummer2020-05-161-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #38778
* | | | | | | | Merge pull request #37519 from HaSa1002/fix-duplicate-inputs-winRémi Verschelde2020-05-162-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix input event being dispatched multiple times on Windows
| * | | | | | | | Fix input event being dispatched multiple times on WindowsHaSa10022020-05-162-0/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #38779 from bruvzg/gdnative_sizes_fixRémi Verschelde2020-05-1621-9/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix GDNative wrapper type sizes (RID, Variant, Packed*Array), add size checks.
| * | | | | | | | Fix GDNative wrapper type sizes (RID, Variant, Packed*Array), add size ↵bruvzg2020-05-1621-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking static asserts.
* | | | | | | | | Merge pull request #29587 from Calinou/remove-hq2xRémi Verschelde2020-05-168-2742/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Remove HQ2X and the `Image.expand_2x_hq2x()` method