aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2719 from SaracenOne/clipping_fixJuan Linietsky2015-12-082-12/+51
|\
| * Extended clipping fix to missing clipping-related features.Saracen2015-12-071-8/+34
| * Modification to GUI in 3D demo to show resolved viewport clipping bug and sma...Saracen2015-11-192-1/+1
| * Another clipping fix: default back to using window size to calculate clipping...Saracen2015-11-021-4/+17
| * Fixed canvas clipping on offscreen viewports.Saracen2015-11-021-1/+1
* | Merge pull request #2841 from akien-mga/pr-ustring-snprintfJuan Linietsky2015-12-081-15/+7
|\ \
| * | Fix call to _snprintf on GCCRémi Verschelde2015-11-201-15/+7
* | | Merge pull request #2849 from a12n/compobsd2Juan Linietsky2015-12-083-5/+9
|\ \ \
| * | | Disable X11 joystick functions also for OpenBSDAnton Yabchinskiy2015-11-201-2/+2
| * | | Include string.h for memset() on OpenBSDAnton Yabchinskiy2015-11-201-0/+1
| * | | Include stdlib.h for alloca() on OpenBSDAnton Yabchinskiy2015-11-201-1/+1
| * | | Enable ALSA only for LinuxAnton Yabchinskiy2015-11-201-2/+5
* | | | Merge pull request #2865 from hurikhan/pr_fix_2791Juan Linietsky2015-12-081-3/+11
|\ \ \ \
| * | | | Added additional token checks for the shader if..else.. statement. Fixes issu...hurikhan2015-11-221-3/+11
* | | | | Merge pull request #2868 from akien-mga/pr-fix-can-move-toJuan Linietsky2015-12-084-22/+16
|\ \ \ \ \
| * | | | | Fix wrong index being used to populate r_resultsRémi Verschelde2015-12-041-10/+10
| * | | | | Update doc for can_teleport_toRémi Verschelde2015-11-221-3/+2
| * | | | | Fix can_move_to and rename it for more clarityRémi Verschelde2015-11-223-14/+9
* | | | | | Merge pull request #2873 from neikeq/editor_layoutsJuan Linietsky2015-12-084-21/+317
|\ \ \ \ \ \
| * | | | | | Editor layouts menuneikeq2015-11-254-21/+317
* | | | | | | Merge pull request #2877 from eska014/remove-builtin-aliasesJuan Linietsky2015-12-081-6/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unexpected GDScript built-in type aliaseseska2015-11-231-6/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2888 from TheHX/item_list_pluginJuan Linietsky2015-12-084-240/+281
|\ \ \ \ \ \ \
| * | | | | | | Make ItemListEditor plugin functionalFranklin Sobrinho2015-12-034-240/+281
* | | | | | | | Merge pull request #2919 from TheHX/pr-groups-editorJuan Linietsky2015-12-082-111/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Groups EditorFranklin Sobrinho2015-12-062-111/+90
* | | | | | | | | Merge pull request #2922 from romulox-x/set_hiddenJuan Linietsky2015-12-084-0/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added set_hidden method to Spatial and CanvasItemromulox_x2015-11-264-0/+22
* | | | | | | | | | Merge pull request #2956 from est31/add_system_wide_export_pathJuan Linietsky2015-12-0813-54/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make the setting unix-only.est312015-11-308-13/+24
| * | | | | | | | | | Add way to look for templates at system wide level tooest312015-11-3010-54/+128
* | | | | | | | | | | Merge pull request #2983 from koalefant/vector_ptrJuan Linietsky2015-12-081-18/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Vector<>::_ptr is now typed and points to the beginning of array rather than ...koalefant2015-12-041-18/+20
* | | | | | | | | | | | Merge pull request #2993 from leezh/nrex-v0.1Juan Linietsky2015-12-086-48/+111
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | updated nrex documentationZher Huei Lee2015-12-041-2/+3
| * | | | | | | | | | | | updated the RegEx library nrex to v0.1Zher Huei Lee2015-12-045-46/+108
* | | | | | | | | | | | | Merge pull request #3018 from Ovnuniarchos/DampenIntegratorJuan Linietsky2015-12-084-20/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Areas now calculate their dampenings the same way as their gravity.Ovnuniarchos2015-12-084-20/+31
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | better unique name resolution, as suggested i #3017Juan Linietsky2015-12-081-5/+1
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-085-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3005 from TheHX/pr-file-dialogRémi Verschelde2015-12-074-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Better hidden folders display preferences for editor file dialogsFranklin Sobrinho2015-12-064-8/+13
| * | | | | | | | | | | | | | Merge pull request #3007 from neikeq/fix_line_editRémi Verschelde2015-12-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix LineEdit cursorneikeq2015-12-071-1/+1
* | | | | | | | | | | | | | | | added option to add_child, to use the same deduplication convention as in the...Juan Linietsky2015-12-083-19/+22
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-077-7/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | some fixesJuan Linietsky2015-12-064-6/+5
| * | | | | | | | | | | | | | | Merge pull request #3002 from TheHX/pr-script-editorRémi Verschelde2015-12-061-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Script Editor: maintain cursor column after duplicate a lineFranklin Sobrinho2015-12-061-1/+3
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #2999 from TheHX/pr-image-constructorRémi Verschelde2015-12-062-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \