aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Docs] fix typosPoommetee Ketson2018-03-292-8/+8
|
* Merge pull request #17686 from marcelofg55/in_class_fixRémi Verschelde2018-03-227-9/+18
|\ | | | | Fix several in-class initialization clang warning
| * Fix several in-class initialization clang warningMarcelo Fernandez2018-03-227-9/+18
| |
* | Merge pull request #17685 from marcelofg55/get_area_constBojidar Marinov2018-03-221-1/+1
|\ \ | |/ |/| Fix missing const in CapsuleShapeSW::get_area
| * Fix missing const in CapsuleShapeSW::get_areaMarcelo Fernandez2018-03-211-1/+1
|/
* Merge pull request #17675 from Noshyaar/rPoommetee Ketson2018-03-211-1/+1
|\ | | | | | | | | [DOCS] minor ParticlesMaterial docs fix Linear -> Radial [ci skip]
| * [DOCS] minor ParticlesMaterial docs fix Linear -> RadialPoommetee Ketson2018-03-211-1/+1
| |
* | Merge pull request #17666 from akien-mga/editor-fps-verboseRémi Verschelde2018-03-212-4/+15
|\ \ | | | | | | Add --print-fps option to output FPS to stdout
| * | Add --print-fps option to output FPS to stdoutRémi Verschelde2018-03-212-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
* | | Merge pull request #17658 from bkeys/update_theklaRémi Verschelde2018-03-212-4/+9
|\ \ \ | | | | | | | | Updated thekla_atlas to support arm64
| * | | Updated thekla_atlas to support arm64Brigham Henry Keys2018-03-202-4/+9
| |/ /
* | | Merge pull request #17653 from eska014/rwlock-dummyRémi Verschelde2018-03-217-25/+30
|\ \ \ | | | | | | | | Add RWLockDummy for NO_THREADS builds
| * | | Add RWLockDummy for NO_THREADS buildsLeon Krause2018-03-207-25/+30
| | | |
* | | | Merge pull request #17670 from xsellier/bugfix/17654-split-screen-masterRémi Verschelde2018-03-211-1/+2
|\ \ \ \ | |_|_|/ |/| | | Prevent android to split-screen
| * | | Prevent android to split-screenXavier Sellier2018-03-211-1/+2
|/ / /
* | | Merge pull request #17668 from Noshyaar/2018Rémi Verschelde2018-03-2137-73/+73
|\ \ \ | |_|/ |/| | s/2017/2018/g for gles2, websocket, linux appdata
| * | s/2017/2018/g for gles2, websocket, linux appdataPoommetee Ketson2018-03-2137-73/+73
| |/
* | Merge pull request #17607 from RandomShaper/fix-bogus-file-in-packRémi Verschelde2018-03-201-1/+5
|\ \ | | | | | | Fix listing files inside directory in pack file
| * | Fix listing files inside directory in pack filePedro J. Estébanez2018-03-181-1/+5
| | | | | | | | | | | | | | | | | | | | | When adding a directory path to the inventory of the pack, an empty file name was being added to the file list. That made `Directory.get_ntext()` signal end-of-list too early so that files in a subdirectory were missed. Fixes #15801. Helps with #16798.
* | | Merge pull request #17645 from volzhs/android-device-infoRémi Verschelde2018-03-201-2/+8
|\ \ \ | | | | | | | | Fix getting Android device information
| * | | Fix getting Android device informationvolzhs2018-03-201-2/+8
| | |/ | |/| | | | | | | Fix #17644
* | | Merge pull request #17637 from robfram/fix-draw_polyline_colors-crashRémi Verschelde2018-03-201-4/+8
|\ \ \ | | | | | | | | Fix crash in `canvas_item_add_polyline` when passing more points than colors
| * | | Fix crash in `canvas_item_add_polyline` when passing more points than colorsrobfram2018-03-191-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `p_points.size() > p_colors.size()`, it crashed with invalid array access to `p_colors`. Also, when `p_colors` was an empty `Vector` it crashed due a missing `else` checking the `size` condition, as the code handling that special case exists. This PR fixes the missing `else` for `p_colors.size == 0` and, following the `canvas_item_add_multiline` spirit, it only uses the first color for the whole polyline if points and colors differ in size. Fix #17621.
* | | | Merge pull request #17589 from robfram/fix-always-save-at-runRémi Verschelde2018-03-201-1/+7
|\ \ \ \ | | | | | | | | | | Fix saving unmodified scenes and resources
| * | | | Fix saving unmodified scenes and resourcesrobfram2018-03-181-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `_save_all_scenes` or `save_resource_in_path` was called, they always saved all the scenes and the resource no matter if they were modified or not. For example, when `saving before run` option was checked, it always overwrote the current scene and the default environment simply by opening and runing the project. This PR adds checks for unsaved scenes (using the same `unsave` check others method used) and modified resources (comparing last modified time and last import time). Fix #6025.
* | | | Merge pull request #17632 from endragor/fix-resize-font-updateRémi Verschelde2018-03-201-3/+3
|\ \ \ \ | | | | | | | | | | Fix oversampled font artifacts after resize
| * | | | Fix oversampled font artifacts after resizeRuslan Mustakov2018-03-191-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Font update after resize relies on the viewport size which was updated after the font was already refreshed, which resulted in artifacts when it was rendered into the actual/new viewport size. Fixes #15173.
* | | | Merge pull request #17599 from marcelofg55/channels_crashfixRémi Verschelde2018-03-202-11/+33
|\ \ \ \ | | | | | | | | | | Fix possible crash when audio channels change
| * | | | Fix possible crash when audio channels changeMarcelo Fernandez2018-03-192-11/+33
| | | | |
* | | | | Merge pull request #17629 from bruvzg/macos_nstaskRémi Verschelde2018-03-202-0/+50
|\ \ \ \ \ | |_|_|_|/ |/| | | | [macOS] Implement OS_OSX::execute (using NSTask)
| * | | | Implement OS_OSX::executebruvzg2018-03-192-0/+50
| | |/ / | |/| |
* | | | Merge pull request #17634 from PJB3005/18-03-19-mono-build-blunderRémi Verschelde2018-03-191-1/+1
|\ \ \ \ | |/ / / |/| | | Fix mono build properly!
| * | | Fix mono build properly!PJB30052018-03-191-1/+1
|/ / / | | | | | | | | | Fixes the mistake I made in #17603 to make it require Python > 3.6.
* | | Merge pull request #17622 from RandomShaper/gltf-fixesRémi Verschelde2018-03-191-7/+14
|\ \ \ | | | | | | | | A couple of fixes for glTF importing
| * | | Fix animation length from glTF not correctly setPedro J. Estébanez2018-03-191-4/+3
| | | |
| * | | Fix glTF not accepting VEC3 colorsPedro J. Estébanez2018-03-191-3/+11
| | |/ | |/| | | | | | | Aside from the colors themselves, the rejection was adding somes issues later in the mesh import process.
* | | Merge pull request #17548 from groud/fix_scrollbarsRémi Verschelde2018-03-192-67/+80
|\ \ \ | | | | | | | | Fixes scrollbars in Canvas Item Editor
| * | | Fixes scrollbars in Canvas Item EditorGilles Roudiere2018-03-172-67/+80
| | | |
* | | | Merge pull request #17618 from groud/fix_gridcontainerRémi Verschelde2018-03-191-2/+2
|\ \ \ \ | | | | | | | | | | Fixes wrong calculation of gridcontainer's children size
| * | | | Fixes wrong calculation of gridcontainer's children sizeGilles Roudiere2018-03-181-2/+2
| |/ / /
* | | | Merge pull request #17603 from PJB3005/18-03-18-fix-mono-build-python3Rémi Verschelde2018-03-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix Mono builds with Python 3.
| * | | | Fix Mono builds with Python 3.Pieter-Jan Briers2018-03-181-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | A subprocess call wasn't specifying an encoding, so this gave a TypeError in Python 3.
* | | | Merge pull request #17617 from eska014/emsc-assertionsRémi Verschelde2018-03-191-1/+2
|\ \ \ \ | | | | | | | | | | Disable Emscripten assertions in release_debug builds
| * | | | Disable Emscripten assertions in release_debug buildsLeon Krause2018-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | The messages generated by some assertions can be confusing to users.
* | | | | Merge pull request #17606 from PJB3005/18-03-18-just-pressed-action-docs-updatePoommetee Ketson2018-03-191-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve Input.is_action_just_* docs. [ci skip]
| * | | | | Improve Input.is_action_just_* docs.Pieter-Jan Briers2018-03-181-2/+3
| | |/ / / | |/| | | | | | | | | | | | | More clarification.
* | | | | Merge pull request #17619 from neikeq/mono-runtime-main-argsIgnacio Etcheverry2018-03-182-15/+42
|\ \ \ \ \ | |/ / / / |/| | | | Mono: Runtime main args and assembly search fixes
| * | | | Mono: Runtime main args and assembly search fixesIgnacio Etcheverry2018-03-182-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | - Setup runtime main args during initialization. This must be done manually by embedders who do not call mono_runtime_run_main. Fixes NullReferenceException in System.Environment. - Continue to search the assembly in the rest of the search locations if loading it from one of them failed.
* | | | | Merge pull request #17590 from YeldhamDev/iph_typo_fixPoommetee Ketson2018-03-181-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fixed small typo in the "InstancePlaceholder" doc [ci skip]
| * | | | Fixed small typo in the "InstancePlaceholder" doc.Michael Alexsander Silva Dias2018-03-171-1/+1
|/ / / /