aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16687 from karroffel/gles2-2d-prRémi Verschelde2018-03-0141-718/+12285
|\ | | | | add GLES 2 renderer for 2D
| * add GLES 2 renderer for 2Dkarroffel2018-03-0141-718/+12285
|/ | | | | | | | This commit adds a new rendering backend, GLES2, and adds a project setting to enable it. Currently this backend can only be used on the X11 platform, but integrating into other platforms is planned.
* Merge pull request #17058 from marcelofg55/minmax_windowsRémi Verschelde2018-03-011-1/+10
|\ | | | | Fixed Windows ignoring minimized/maximized status set by user
| * Fixed Windows ignoring minimized/maximized status set by userMarcelo Fernandez2018-02-261-1/+10
| |
* | Merge pull request #17137 from endragor/fix-audio-init-crashRémi Verschelde2018-03-011-0/+1
|\ \ | | | | | | Fix intermittent audio driver crash during startup on Android
| * | Fix intermittent audio driver crash during startup on AndroidRuslan Mustakov2018-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | | set_pause can be called before the driver is initialized, and there already is a check for that. The problem is that the 'active' field was not initialied in the constructor, which lead to it having an undefined value.
* | | Merge pull request #17135 from Faless/server_bsd_fixRémi Verschelde2018-03-013-2/+15
|\ \ \ | |/ / |/| | Fix server build on FreeBSD
| * | Fix server build on FreeBSDFabio Alessandrelli2018-03-013-2/+15
|/ /
* | Merge pull request #17111 from poke1024/fix16524Rémi Verschelde2018-02-282-3/+14
|\ \ | | | | | | Fix grid mesh tile touch pad bug (issue 16524)
| * | Fix grid mesh tile panning bug (issue 16524)poke10242018-02-282-3/+14
| | | | | | | | | | | | Fix basic function and interference of touch pad pan with mesh tile delete (shift + right click on touch pad) in grid map editor (fix 16524)
* | | Merge pull request #17117 from hpvb/fix-use-uninitialized-reduxRémi Verschelde2018-02-288-7/+20
|\ \ \ | | | | | | | | Fix various valgrind reported uninitialized variable uses
| * | | Fix various valgrind reported uninitialized variable usesHein-Pieter van Braam2018-02-288-7/+20
|/ / /
* | | Merge pull request #17115 from Faless/lws_bsd_mallocRémi Verschelde2018-02-284-5/+5
|\ \ \ | |/ / |/| | Fix mbedTLS and Websocket on FreeBSD
| * | Use Prepend instead of Append for mbedTLS includeFabio Alessandrelli2018-02-282-3/+3
| | | | | | | | | | | | Fixes build on FreeBSD when system-wide mbedTLS and/or openSSL are installed
| * | Fix lws compilation on FreeBSD, same as OSXFabio Alessandrelli2018-02-282-2/+2
|/ / | | | | | | This error is actually fixed upstream, waiting for a new release
* | Merge pull request #17087 from hpvb/fix-finding-mscorlibIgnacio Etcheverry2018-02-271-2/+5
|\ \ | | | | | | More reliably find mscorlib.dll on Linux
| * | More reliably find mscorlib.dll on LinuxHein-Pieter van Braam2018-02-271-2/+5
|/ /
* | doc: Sync classref with current sourceRémi Verschelde2018-02-272-1/+3
| |
* | doc: Remove status from hardcoded version stringRémi Verschelde2018-02-27492-492/+492
| | | | | | | | It has no practical use case and just generates noise for each alpha, beta, etc.
* | Android: Mark GLES3 as required in the manifestRémi Verschelde2018-02-271-1/+1
| | | | | | | | Fixes #17076.
* | Merge pull request #17021 from AndreaCatania/kinfixRémi Verschelde2018-02-273-26/+15
|\ \ | | | | | | Fixed bullet kinematic char sliding
| * | Fixed kinematic char slidingAndrea Catania2018-02-253-26/+15
| | |
* | | Merge pull request #16656 from JFonS/fix_gradient_crashRémi Verschelde2018-02-271-0/+7
|\ \ \ | | | | | | | | Fix weird editor crash when switching from editing one gradient to another keeps 'grabbing' variable to true
| * | | Fix weird editor crash when switching from editing one gradient to another ↵JFonS2018-02-141-0/+7
| | | | | | | | | | | | | | | | keeps 'grabbing' variable to true
* | | | Merge pull request #17075 from paulloz/fix-build-mono-debug-notoolsRémi Verschelde2018-02-271-1/+1
|\ \ \ \ | | | | | | | | | | [mono] fix build error when compiling with mono, tools=no, target=debug
| * | | | fix build error when compiling with mono, tools=no, target=releasePaul Joannon2018-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | change TTR to RTR in `print_unhandled_exception`
* | | | | Merge pull request #17074 from AndreaCatania/fix1Rémi Verschelde2018-02-274-10/+27
|\ \ \ \ \ | | | | | | | | | | | | Some fixes on physics
| * | | | | Fixed physics server typoAndrea Catania2018-02-271-1/+1
| | | | | |
| * | | | | Implemented Bullet method omit forcesAndrea Catania2018-02-273-9/+26
| |/ / / /
* | | | | Merge pull request #17072 from Noshyaar/leakRémi Verschelde2018-02-272-1/+7
|\ \ \ \ \ | | | | | | | | | | | | TileSetEditorPlgn: Fix a leak
| * | | | | TileSetEditorPlgn: Fix a leakPoommetee Ketson2018-02-272-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #15641 from ↵Rémi Verschelde2018-02-273-12/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neikeq/mono-is-picky-regarding-corlib-so-we-must-make-sure-to-ship-the-right-version-otherwise-something-bad-may-happen Mono: Buildsystem improvements
| * | | | | Mono: Buildsystem improvementsIgnacio Etcheverry2018-01-123-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bundle with mscorlib.dll to avoid compatibilities issues - Add build option 'mono_assemblies_output_dir' to specify the output directory where the assemblies will be copied to. '#bin' by default.
* | | | | | Merge pull request #17027 from IndicaInkwell/doc-contribRémi Verschelde2018-02-271-0/+55
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [DOCS] added docs on Control's drag and drop api
| * | | | | added docs on Control's drag and drop apiindicainkwell2018-02-261-0/+55
|/ / / / /
* | | | | Merge pull request #17046 from NathanWarden/fixed_mono_marshallingRémi Verschelde2018-02-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | [Mono] The marshalling *in* of Transform was also incorrect.
| * | | | The marshalling in was also incorrect.Nathan Warden2018-02-261-1/+1
| | | | |
* | | | | Merge pull request #17048 from hpvb/fix-17028Rémi Verschelde2018-02-261-15/+16
|\ \ \ \ \ | | | | | | | | | | | | Allow running with a custom resource without a main scene
| * | | | | Allow running with a custom resource without a main sceneHein-Pieter van Braam2018-02-261-15/+16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 3f8a4cc7193e964f716fde2cd28a946669e2d8d6 trying to run an individual scene on a project without a main scene fails. We move the check until after we've determined whether or not we're trying to run an individual scene. We also stop trying to show the project manager if any game pack is found at all, unless the user explicitly asks for the project manager to be shown.
* | | | | Merge pull request #17020 from neikeq/cs-api-asm-checksRémi Verschelde2018-02-2515-87/+428
|\ \ \ \ \ | |_|_|_|/ |/| | | | Mono: Better versioning and gracefully unloading of Godot API assemblies
| * | | | Mono: Better versioning and gracefully unloading of Godot API assembliesIgnacio Etcheverry2018-02-2515-87/+428
|/ / / /
* | | | Add a split editor to polygon 2D UV editor, moving an inch closer to adding ↵Juan Linietsky2018-02-256-18/+446
| | | | | | | | | | | | | | | | support for in the future
* | | | Fix version.txt validation logic for export templates .tpzRémi Verschelde2018-02-251-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It assumed that the version would always be `x.y-status`, with no dot possible in `status`, so: - It would not work for 3.0.1-stable (nor 3.0.1.stable with new version logic) - It would not support Mono templates when we provide them The validation it did was not really useful anyway, so we just use the raw string.
* | | | Merge pull request #16804 from Valentactive/fix_mono_template_compilingRémi Verschelde2018-02-252-8/+3
|\ \ \ \ | | | | | | | | | | fix template builds with mono
| * | | | fix release builds with monoMichele Valente2018-02-222-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "_signals" and "signals_invalidated" were moved out of the "TOOLS_ENABLED" directive. Updated also the two "update_signals" and "_update_signals" methods so it makes sense.
* | | | | Merge pull request #17003 from Noshyaar/docsRémi Verschelde2018-02-2518-25/+161
|\ \ \ \ \ | | | | | | | | | | | | [DOCS] Sync classref with current source
| * | | | | [DOCS] Sync classref with current sourcePoommetee Ketson2018-02-2518-25/+161
| | |/ / / | |/| | |
* | | | | Merge pull request #16996 from Zylann/line2d_tile_fixRémi Verschelde2018-02-253-7/+15
|\ \ \ \ \ | | | | | | | | | | | | Fix Line2D tile mode for non-square textures
| * | | | | Fix Line2D tile mode for non-square texturesMarc Gilleron2018-02-253-7/+15
| | | | | |
* | | | | | Merge pull request #16993 from bruvzg/fix-missing-returnsRémi Verschelde2018-02-253-14/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add missing return statements (iOS and server).