aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7771 from Limb/winaudiodriverRémi Verschelde2017-02-121-0/+5
|\ | | | | Close out audio drivers when exiting on Windows.
| * Close out audio drivers when exiting.Kenneth Lorthioir2017-02-091-0/+5
| | | | | | | | Prevents a crash when closing the project manager.
* | Merge pull request #7770 from Limb/removedx9Rémi Verschelde2017-02-122-8/+0
|\ \ | | | | | | Removed DX9 Rasterizer in windows
| * | Removed DX9 Rasterizer in windows.Kenneth Lorthioir2017-02-092-8/+0
| |/ | | | | | | | | | | This doesn't seem to be needed anymore and the code to free the unused rasterizer was throwing a memory violation since it was getting set to a value somehow.
* | Merge pull request #7769 from GodotExplorer/pr-resizeable-texturebutton_3Rémi Verschelde2017-02-124-44/+133
|\ \ | | | | | | Enhance TextureButton and TextureRect with resize
| * | Add STRETCH_KEEP_ASPECT_COVERED to TextureRect StretchModegeequlim2017-02-094-44/+133
| | | | | | | | | | | | Make TextureButton to the same resize behavior with TextureRect
* | | Merge pull request #7768 from bojidar-bg/sc-multiple-namesRémi Verschelde2017-02-121-1/+8
|\ \ \ | | | | | | | | Make _sc_ files work like ._sc_
| * | | Make _sc_ files work like ._sc_, fixes #7762Bojidar Marinov2017-02-091-1/+8
| | |/ | |/|
* | | Merge pull request #7763 from Limb/fixwindowscompileRémi Verschelde2017-02-123-1/+8
|\ \ \ | | | | | | | | Fixed compilation issues with Visual Studio
| * | | Fixed compilation issues with Visual StudioKenneth Lorthioir2017-02-083-1/+8
| |/ /
* | | Merge pull request #7746 from sanikoyes/Pr-fix-msvc-compileRémi Verschelde2017-02-122-2/+2
|\ \ \ | | | | | | | | Fix msvc compile error
| * | | Fix msvc compile errorsanikoyes2017-02-072-2/+2
| | | |
* | | | Merge pull request #7757 from volzhs/save-debug-optionsRémi Verschelde2017-02-125-14/+38
|\ \ \ \ | | | | | | | | | | Save and restore debug options for each project
| * | | | Save and restore debug optionsvolzhs2017-02-085-14/+38
| |/ / /
* | | | Merge pull request #7749 from Faless/fix_7697Rémi Verschelde2017-02-121-2/+4
|\ \ \ \ | | | | | | | | | | HTTPClient properly handle partial data in non-blocking mode
| * | | | HTTPClient properly handle partial data in non-blocking modeFabio Alessandrelli2017-02-071-2/+4
| |/ / / | | | | | | | | | | | | | | | | Use block to send DVector::Write out of scope in HTTPClient::read_response_body_chunk()
* | | | Merge pull request #7747 from sanikoyes/Pr-fix-tween-transform2dRémi Verschelde2017-02-121-3/+3
|\ \ \ \ | | | | | | | | | | Fix tween Transform2D typo
| * | | | Fix tween Transform2D typosanikoyes2017-02-071-3/+3
| |/ / /
* | | | Merge pull request #7743 from karroffel/json_parsing-3.0Rémi Verschelde2017-02-121-2/+2
|\ \ \ \ | | | | | | | | | | JSON::parse reports errors on open-ended objects (master)
| * | | | JSON::parse reports errors on open-ended objectsKarroffel2017-02-061-2/+2
| | | | |
* | | | | Merge pull request #7740 from magyar123/masterRémi Verschelde2017-02-122-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Add editor option for closing the output when stopping the game.
| * | | | | Add editor option for automatically closing the output when stopping the game.mbalint122017-02-062-0/+9
| | | | | |
* | | | | | Merge pull request #7723 from lonesurvivor/gdscript-range-fixRémi Verschelde2017-02-121-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix parsing bug which causes range(variable) to crash the engine
| * | | | | | Fix parsing bug which causes range(variable) to crash the enginelonesurvivor2017-02-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problem was a segmentation fault caused by trying to access Vector constants[0] which isn't there if op->arguments.size() is not bigger than one. - the changed OR condition didn't make sense (always true), should be AND - changes the "constant" variable to be false per default and gets set to true when there is actually something pushed to "constants"
* | | | | | | Merge pull request #7722 from RandomShaper/improve-touch-buttonRémi Verschelde2017-02-122-85/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix touch button issues
| * | | | | | | Solve TouchScreenButtons issuesPedro J. Estébanez2017-02-102-85/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix touch button needing double tap after pause (applies to those not set to pass-by) Fix error when a pressed TouchScreenButton with no associated action exits the tree (with some refactoring of duplicate code)
* | | | | | | | Merge pull request #7712 from kbake/deselect-selection-on-ctrl-home/endRémi Verschelde2017-02-121-14/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Selected text is now deselected on ctrl+home/end
| * | | | | | | | Selected text is now deselected on ctrl+home/endkbake2017-02-031-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Issue #7694 and also the error mentioned in the comments of that issue.
* | | | | | | | | Merge pull request #7706 from RandomShaper/touch-button-shape-masterRémi Verschelde2017-02-122-3/+78
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Add shape property to TouchScreenButton
| * | | | | | | | Add shape property to TouchScreenButtonPedro J. Estébanez2017-02-022-3/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapted from 67a0da34a2d5a95761c54b3012d0a8f1a79e10a6
* | | | | | | | | Reorder the folders in tools to prepare moving tools/editorRémi Verschelde2017-02-09130-158/+152
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `certs` and `editor_fonts` go to `thirdparty` - `dist` and `scripts` go to a new `misc` folder - `collada` and `doc` go to `tools/editor` The next step will be to rename `tools/editor` to `editor` directly, but this will be done at the right time to avoid breaking too many PRs.
* | | | | | | | Merge pull request #7759 from nunodonato/translationfixRémi Verschelde2017-02-081-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added "Scots" locale name, fixing #7630
| * | | | | | | | Added "Scots" locale name, fixing #7630Nuno Donato2017-02-081-0/+1
|/ / / / / / / /
* | | | | | | | basic contact shadows implementation, will most likely need some polishingJuan Linietsky2017-02-087-33/+155
| | | | | | | |
* | | | | | | | Merge pull request #7715 from m4nu3lf/bugfix/g6dof_joint_setterRémi Verschelde2017-02-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed property setter in G6DOF joint
| * | | | | | | | Fixed property setter in G6DOF jointm4nu3lf2017-02-031-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #7709 from bojidar-bg/sort-scripts-by-pathRémi Verschelde2017-02-072-4/+50
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Sort settings for scripts in the editor
| * | | | | | | | Sort settings for scripts in the editorBojidar Marinov2017-02-022-4/+50
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | shadows were not working in-editor for nvidia, fixed nowJuan Linietsky2017-02-067-11/+24
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | ability to adjust propagation in gi probeJuan Linietsky2017-02-069-15/+101
| | | | | | |
* | | | | | | Several bugfixes, improving the import workflowJuan Linietsky2017-02-0631-148/+476
| |_|_|_|_|/ |/| | | | |
* | | | | | Ensure proper config version when reading the new configuration file.Juan Linietsky2017-02-042-2/+15
| | | | | |
* | | | | | Renamed engine.cfg to godot.cfg, to forcefully break compatibility with 2.xJuan Linietsky2017-02-0441-271/+271
| | | | | |
* | | | | | completed scene importing (I hope?)Juan Linietsky2017-02-045-10/+227
| |_|_|_|/ |/| | | |
* | | | | fix continous reimport bug (i hope)Juan Linietsky2017-02-041-2/+27
| | | | |
* | | | | Scene import more or less working, needs some missing features.Juan Linietsky2017-02-045-6/+1297
| |/ / / |/| | |
* | | | Changed OGG Vorbis type to be imported, so it's possible to specify loopJuan Linietsky2017-02-035-76/+184
| |_|/ |/| |
* | | OBJ file importing!Juan Linietsky2017-02-037-4/+269
| | |
* | | wav file importing!Juan Linietsky2017-02-026-0/+1341
| | |
* | | Merge pull request #7708 from volzhs/match-errRémi Verschelde2017-02-022-2/+2
|\ \ \ | |/ / |/| | | | | | | | Match ERROR_QUERY_FAILED enum with others [ci skip]