aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* -remove (can be added back in editor settings) icons from property editorJuan Linietsky2015-12-113-26/+55
* added fallbacks proprty to fontsJuan Linietsky2015-12-102-23/+32
* Merge pull request #3028 from TheHX/pr-tscn-formatRémi Verschelde2015-12-091-0/+4
|\
| * Fix tscn format not being recongnized by EditorFileSystemFranklin Sobrinho2015-12-091-0/+4
|/
* Merge pull request #3027 from TheHX/pr-project-manager-fontRémi Verschelde2015-12-091-4/+13
|\
| * Fix project manager not picking custom fontFranklin Sobrinho2015-12-091-4/+13
* | Merge pull request #3026 from est31/fix_win_buildRémi Verschelde2015-12-091-5/+7
|\ \
| * | Fix windows buildest312015-12-091-5/+7
|/ /
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-09210-9757/+4197
|\ \
| * \ Merge pull request #2853 from akien-mga/pr-demos-code-formattingRémi Verschelde2015-12-09208-9692/+4087
| |\ \
| | * | Use get_current_scene() instead of hackRémi Verschelde2015-12-091-6/+2
| | * | Move polygon_path_finder demo to demos/3d since it uses 3D nodesRémi Verschelde2015-12-094-0/+0
| | * | Remove systematic "Init(i)alization here" from _ready()Rémi Verschelde2015-12-0939-39/+0
| | * | Improve code formattingRémi Verschelde2015-12-0940-1100/+840
| | * | Update 2D demos scenes for 2.0 formatRémi Verschelde2015-12-0969-2839/+2683
| | * | Use upper-cased first letter at the start of comment sentencesRémi Verschelde2015-12-0930-164/+150
| | * | Improve code formatting and update to 2.0Rémi Verschelde2015-12-0995-5631/+499
| |/ /
| * | Merge pull request #2986 from TheHX/pr-shader-editorRémi Verschelde2015-12-091-0/+5
| |\ \
| | * | Fix shader editor focus when switching tabsFranklin Sobrinho2015-12-061-0/+5
| * | | Merge pull request #3022 from romulox-x/aes256Juan Linietsky2015-12-081-65/+105
| |\ \ \
| | * | | updated aes256 implementation to newer version from upstream. Also uses fast...romulox_x2015-12-081-65/+105
| |/ / /
* / / / -ability to change scripts in external editor and still have properties reloa...Juan Linietsky2015-12-097-19/+117
|/ / /
* | | changed a bit to use system()Juan Linietsky2015-12-081-1/+1
* | | improve detection of linux, fixes #3201Juan Linietsky2015-12-081-1/+1
| |/ |/|
* | -New mask mode for lights, makes using masks MUCH easier.Juan Linietsky2015-12-088-18/+71
* | -made it add the node name from the file, closes #3010Juan Linietsky2015-12-081-8/+21
* | Merge branch 'master' of https://github.com/godotengine/godotJuan Linietsky2015-12-0849-575/+1105
|\ \
| * \ 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
| |\ \ \ \ \ \ \ \