aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
* | | | | | | Merge pull request #9828 from RandomShaper/improve-mem-statsJuan Linietsky2017-08-013-27/+29
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Improve reliability of memory stats
| * | | | | | Use atomics for memory use trackingPedro J. Estébanez2017-08-012-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus: - An allocation is counted only after checking its success. - Max usage is updated after growing reallocs as well. - Drop unused header. - Changed the 0xFFF.. at get_mem_available() to -1 with a comment telling it's the same, but more universal.
| * | | | | | Make memory monitors query the right countersPedro J. Estébanez2017-08-011-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #10009 from marcelofg55/masterRémi Verschelde2017-08-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix possible division by zero crashes on the wav importer
| * | | | | | Fix possible division by zero crashes on the wav importerMarcelo Fernandez2017-07-311-2/+2
| |/ / / / /
* | | | | | Merge pull request #10008 from RandomShaper/fix-misplaced-operatorGeorge Marques2017-08-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix equality when assignment intended
| * | | | | Fix equality when assignment intendedPedro J. Estébanez2017-08-011-1/+1
|/ / / / /
* | | | | Merge pull request #8209 from robertdhernandez/Texture-Region-Editor-SyncRémi Verschelde2017-08-017-31/+37
|\ \ \ \ \ | | | | | | | | | | | | Texture region now updates when changing an Atlas region rect
| * | | | | Texture region now updates when changing an AtlasRobert Hernandez2017-06-297-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed atlas_changed signal for AtlasTexture - Changes are now handled by _notify_change - Removed unneccesary signal connections - Texture preview now updates in real-time Fixed TextureRegionEditor constantly regenerating
* | | | | | Merge pull request #9826 from RandomShaper/improve-atomicsRémi Verschelde2017-07-312-8/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve/add atomics
| * | | | | | Improve/add atomicsPedro J. Estébanez2017-07-252-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove use of non-builtin overloaded `InterlockedExhangeSubtract()` for Windows. Moreover, it was wrongly being used as if it hadn't a 64-bit version instead of being overloaded. - Implement exchange-if-greater (as a CAS loop).
* | | | | | | Merge pull request #9886 from bruvzg/3.0-win-num-enter-fixRémi Verschelde2017-07-311-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix Numpad Enter key on Windows (3.0)
| * | | | | | | Fix Numpad Enter key on Windowsbruvzg2017-07-261-1/+6
| | | | | | | |
* | | | | | | | Merge pull request #9909 from kubecz3k/docs-collobject-collshapesRémi Verschelde2017-07-311-0/+122
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | firsts docs for CollisionObject -> collision shape api
| * | | | | | | | firsts docs for CollisionObject -> collision shape apiJakub Grzesik2017-07-271-0/+122
| | | | | | | | |
* | | | | | | | | Merge pull request #9993 from Xrayez/surface-tool-bindRémi Verschelde2017-07-311-4/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bind some useful methods in SurfaceTool to GDScript
| * | | | | | | | | Bind some useful methods in SurfaceTool to GDScriptAndrii Doroshenko (Xrayez)2017-07-311-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These include: * generate_tangents() * add_to_format() * create_from() * append_from() Reordered and grouped the bindings to match the header for improved readability. Removed commented out `generate_flat_normals()` method which wasn't present in the header. Fixes #9946
* | | | | | | | | | Merge pull request #9999 from Noshyaar/pr-xformdialogRémi Verschelde2017-07-311-22/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | SpatialEditor: fix transform dialog
| * | | | | | | | | SpatialEditor: fix transform dialogPoommetee Ketson2017-07-311-22/+26
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9990 from GodotExplorer/pr-fix-stretch-ratioRémi Verschelde2017-07-312-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix errors with stretch ratio
| * | | | | | | | | Fix property type expose of Control.stretch_ratio.Geequlim2017-07-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix set integer value from inspector to round instead of floor.
* | | | | | | | | | Merge pull request #8567 from BastiaanOlij/ar_vr_serverRémi Verschelde2017-07-3125-35/+1745
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | AR/VR base classes and position tracker support
| * | | | | | | | | Adding base classes and structures for ARVR supportBastiaanOlij2017-07-2825-36/+1746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ArVrScriptInterface Added ARVRCamera, ARVRController and ARVROrigin helper objects
* | | | | | | | | | Style: Apply clang-format on all filesRémi Verschelde2017-07-3045-58/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thus fixing some invalid changes that had still made it to the master branch.
* | | | | | | | | | Revert "PropertyEditor: display "Off" if property is false"Rémi Verschelde2017-07-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5adb94e72694fd4c4b80be85b3adf9a4a7d6c45b. It was actually not a bug, see discussion on #9898.
* | | | | | | | | | Merge pull request #9985 from marcelofg55/masterRémi Verschelde2017-07-302-26/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix mutex initialisation in OS X Audio Driver
| * | | | | | | | | | Fix mutex initialisation in OS X Audio DriverMarcelo Fernandez2017-07-302-26/+28
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #9964 from supagu/audio_fixRémi Verschelde2017-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed AudioStreamPlaybackOGGVorbis::_mix_internal getting stuck in in…
| * | | | | | | | | | Fixed AudioStreamPlaybackOGGVorbis::_mix_internal getting stuck in infinite ↵Fabian Mathews2017-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loop causing audio to freeze
* | | | | | | | | | | Merge pull request #9960 from marcelofg55/masterRémi Verschelde2017-07-302-42/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix get_screen_* funcs returning old values after resolution changes on OS X