aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10085 from endragor/no-uninitialized-cbThomas Herzog2017-08-043-10/+17
|\ | | | | Dont call nativescript callbacks if lib is not initialized
| * Dont call nativescript callbacks if lib is not initializedRuslan Mustakov2017-08-043-10/+17
|/
* Merge pull request #9976 from ISylvox/update-gradle-android-masterRémi Verschelde2017-08-045-12/+24
|\ | | | | [3.0] Update Gradle-Android buildtool
| * update gradle-android buildtool for masterISylvox2017-07-305-12/+24
| |
* | Merge pull request #10072 from karroffel/gdnative-header-include-pathsThomas Herzog2017-08-041-1/+2
|\ \ | | | | | | [GDNative] fixed a bug with ambiguous include paths
| * | [GDNative] fixed a bug with ambiguous include pathsKarroffel2017-08-041-1/+2
| | | | | | | | | | | | | | | fixes #10071. The problem is that the json.h file includes the local variant.h instead of the "absolute" core/variant.h
* | | Full GLTF 2.0 Specification support! cheers!Juan Linietsky2017-08-032-11/+584
| | |
* | | TileMap: Fix infinite loop when trying to bucket-delete empty tiles.Andreas Haas2017-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | Right-clicking when the bucket tool is enabled means "erase all instances of this tile". So it doesn't make sense to try doing this for empty tiles :P Fixes #10065
* | | Merge pull request #10066 from marcelofg55/scons_fix3Rémi Verschelde2017-08-031-2/+3
|\ \ \ | | | | | | | | Fix scons failing when not building sources
| * | | Fix scons failing when not building sourcesMarcelo Fernandez2017-08-031-2/+3
|/ / /
* | | Merge pull request #10060 from endragor/nativescript-frameThomas Herzog2017-08-033-44/+32
|\ \ \ | | | | | | | | Forward frame call to GDNative libraries
| * | | Forward frame call to GDNative librariesRuslan Mustakov2017-08-033-44/+32
| | | |
* | | | Merge pull request #10046 from Hinsbart/script_open_resourceRémi Verschelde2017-08-032-1/+28
|\ \ \ \ | | | | | | | | | | ScriptEditor: ctrl+click can open scenes & resources.
| * | | | ScriptEditor: ctrl+click can open scenes/resources.Andreas Haas2017-08-022-1/+28
| | | | | | | | | | | | | | | | | | | | Closes #9654
* | | | | Merge pull request #10062 from BastiaanOlij/arvr_add_anchorRémi Verschelde2017-08-035-8/+184
|\ \ \ \ \ | | | | | | | | | | | | Added ARVRAnchor support and a few small enhancements
| * | | | | Added ARVRAnchor support and a few small enhancementsBastiaanOlij2017-08-035-8/+184
| | | | | |
* | | | | | Merge pull request #10040 from Hassan-A/getCells3.0Rémi Verschelde2017-08-032-0/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added get_used_cells_by_id method 3.0
| * | | | | Added get_used_cells_by_id method 3.0Hassan A2017-08-022-0/+16
| | | | | |
* | | | | | ItemList: Remove redundant Vector2 initializations.Andreas Haas2017-08-021-4/+4
| | | | | |
* | | | | | -Added GLTF scene support (still missing animations and .glb extension)Juan Linietsky2017-08-0210-38/+2040
| | | | | | | | | | | | | | | | | | | | | | | | -Fixed bugs regarding tangent generation in SurfaceTool
* | | | | | Merge pull request #10050 from ↵Juan Linietsky2017-08-024-104/+104
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | godotengine/revert-10014-tweak-command-line-arguments Revert "Tweak command-line arguments to make them more UNIX-like"
| * | | | | Revert "Tweak command-line arguments to make them more UNIX-like"Juan Linietsky2017-08-024-104/+104
|/ / / / /
* | | | | Merge pull request #10042 from karroffel/gdnative-header-include-pathsThomas Herzog2017-08-022-13/+6
|\ \ \ \ \ | | |_|/ / | |/| | | [GDNative/NativeScript] fix -rdynamic and removed _init call
| * | | | [GDNative/NativeScript] fix -rdynamic and removed _init callKarroffel2017-08-022-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The _init call was buggy anyway and in the end shouldn't be a thing that's called via ClassDB, it should be something that's language specific, so we leave this out for the bindings. In the commit 66a7763 the SCsub file for GDNative was changed to use a cloned environment, that bricked -rdynamic which needs to be passed down to the linker, which didn't happen with the new env.
* | | | | Merge pull request #10037 from Noshyaar/pr-classxmlRémi Verschelde2017-08-021-15/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix method/type renames, fill some blanks [ci skip]
| * | | | | Docs: fix method/type renames, fill some blanksPoommetee Ketson2017-08-021-15/+18
| | | | | |
* | | | | | Merge pull request #10014 from Calinou/tweak-command-line-argumentsRémi Verschelde2017-08-024-104/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tweak command-line arguments to make them more UNIX-like
| * | | | | | Tweak command-line arguments to make them more UNIX-likeHugo Locurcio2017-08-024-104/+104
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Also improves the command-line help text readability.
* | | | | | Merge pull request #10029 from ISylvox/disable-needless-printlineRémi Verschelde2017-08-021-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove meaningless print_line from editor Console
| * | | | | remove meaningless print line from editor consoleIndah Sylvia2017-08-021-1/+0
| | | | | |
* | | | | | Merge pull request #10032 from karroffel/gdnative-header-include-pathsThomas Herzog2017-08-0239-113/+137
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | [GDNative] better header include paths
| * | | | [GDNative] better header include pathsKarroffel2017-08-0239-113/+137
| | | | | | | | | | | | | | | | | | | | | | | | | The old include paths caused some problems on some compilers, for example including "string.h" was ambiguous.
* | | | | Merge pull request #10028 from marcelofg55/audioserver_finishRémi Verschelde2017-08-022-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix AudioServer::finish not getting called while quitting
| * | | | | Fix AudioServer::finish not getting called while quittingMarcelo Fernandez2017-08-012-1/+3
|/ / / / /
* | | | | Merge pull request #10027 from Noshyaar/pr-treeRémi Verschelde2017-08-011-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Tree: fix index error with expanded column
| * | | | | Tree: fix index error with expanded columnPoommetee Ketson2017-08-021-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #10021 from Noshyaar/pr-mbRémi Verschelde2017-08-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MenuButton: defer grab_click_focus until button_up
| * | | | | MenuButton: defer grab_click_focus until button_upPoommetee Ketson2017-08-021-1/+1
| | | | | |
* | | | | | Merge pull request #10019 from Paulb23/ctrl_backspace_issue_6546Rémi Verschelde2017-08-011-52/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | Made delete next and prev consistent to other editors, issue 6546
| * | | | | | made delete next and prev consistent to other editors,issue 6546Paulb232017-08-011-52/+52
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #10006 from djrm/pr_theme_fixesRémi Verschelde2017-08-017-51/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | Some theme and usability improvements
| * | | | | | Some theme and usability improvementsDaniel J. Ramirez2017-07-317-52/+78
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixed create script editor dialog not changing extension Options menu for inspector element is bigger
* | | | | | Merge pull request #9838 from RandomShaper/android-arm64Rémi Verschelde2017-08-014-14/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for ARMv8 (64-bit) on Android
| * | | | | | Add support for ARMv8 (64-bit) on AndroidPedro J. Estébanez2017-07-254-14/+43
| | | | | | |
* | | | | | | Merge pull request #9832 from RandomShaper/port-physics-fixesRémi Verschelde2017-08-019-21/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Port physics fixes
| * | | | | | | Improve cleanup of physics constraintsPedro J. Estébanez2017-08-016-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't abort the loop when one is already released Remove warning on already-released constraint Clean up area's contraints as well Clear the constraint data as well Do the cleanup as soon as the space changes
| * | | | | | | Add missing initializersPedro J. Estébanez2017-07-251-1/+2
| | | | | | | |
| * | | | | | | Extend check for same space to all 2D/3D bodies/shapesPedro J. Estébanez2017-07-252-2/+13
| | | | | | | |
| * | | | | | | Fix 2D broadphase remove-while-iterating logicPedro J. Estébanez2017-07-251-2/+4
| | | | | | | |
| * | | | | | | Fix early-accepting area-area match when masks don't matchPedro J. Estébanez2017-07-251-3/+3
| | | | | | | |