maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2410 commits 10 branches 35 tags 1.1 GiB
Commit graph

2410 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juan Linietsky 46497c4508 added fallbacks proprty to fonts 2015-12-10 23:02:40 -03:00
Rémi Verschelde 5a60edf1ff Merge pull request #3028 from TheHX/pr-tscn-format 
Fix tscn format not being recongnized by EditorFileSystem
 2015-12-09 19:06:23 +01:00
Franklin Sobrinho afb41b283c Fix tscn format not being recongnized by EditorFileSystem 2015-12-09 13:56:14 -03:00
Rémi Verschelde 2d84943a2b Merge pull request #3027 from TheHX/pr-project-manager-font 
Fix project manager not picking up custom font
 2015-12-09 16:45:45 +01:00
Rémi Verschelde 02d352bfbf Merge pull request #3026 from est31/fix_win_build 
Fix windows build
 2015-12-09 16:42:19 +01:00
Franklin Sobrinho c2ce39c424 Fix project manager not picking custom font 2015-12-09 12:35:20 -03:00
est31 3dbf7dd7fa Fix windows build 2015-12-09 16:06:00 +01:00
Juan Linietsky aadced2f72 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-09 09:10:00 -03:00
Juan Linietsky 6bc6b8fcf2 -ability to change scripts in external editor and still have properties reloaded in godot UI, fixes #3003 2015-12-09 09:08:41 -03:00
Rémi Verschelde db9da15276 Merge pull request #2853 from akien-mga/pr-demos-code-formatting 
Improve demos code formatting and update to 2.0
 2015-12-09 08:49:06 +01:00
Rémi Verschelde 52d515b611 Use get_current_scene() instead of hack 2015-12-09 08:39:12 +01:00
Rémi Verschelde 6315dd4985 Move polygon_path_finder demo to demos/3d since it uses 3D nodes 
Also took the opportunity to "touch" each demo's engine.cfg in reverse alphabetical order to get the listed in natural order in the project manager.
 2015-12-09 08:39:12 +01:00
Rémi Verschelde 6cfc3eec97 Remove systematic "Init(i)alization here" from _ready() 2015-12-09 08:39:12 +01:00
Rémi Verschelde 7589b2bf60 Improve code formatting 
The scripts were streamlined using more or less the following conventions:
 - space after a comma in lists of arguments
 - spaces around weak operators (+, -), no spaces around strong operators (*, /)
 - spaces around comparison operators and compound assignment operators
 - space after a comment start (#)
 - removed trailing spaces or tabs, apart from those that delimit the function indentation level (those could be removed too but since they are added automatically by the editor when typing code, keeping them for now)
 - function blocks separate by two newlines
 - comment sentences start with an upper-case letter
 2015-12-09 08:39:12 +01:00
Rémi Verschelde 323dde7f31 Update 2D demos scenes for 2.0 format 2015-12-09 08:39:12 +01:00
Rémi Verschelde 8c4f19e79d Use upper-cased first letter at the start of comment sentences 2015-12-09 08:39:12 +01:00
Rémi Verschelde 8639cecf4c Improve code formatting and update to 2.0 
The scripts were streamlined using more or less the following conventions:
 - space after a comma in lists of arguments
 - space around weak operators (+, -), no space around strong operators (*, /)
 - space after a comment start (#)
 - removed trailing spaces or tabs, apart from those that delimit the function indentation level (those could be removed too but since they are added automatically by the editor when typing code, keeping them for now)
 - function blocks separate by two newlines

The scene files were resaved with the (current) 2.0 format, and some scenes that were in XML format were converted to SCN, to be consistent across all demos.
 2015-12-09 08:38:23 +01:00
Rémi Verschelde efbb834936 Merge pull request #2986 from TheHX/pr-shader-editor 
Fix shader editor focus when switching tabs
 2015-12-09 07:48:51 +01:00
Juan Linietsky f86477ce93 Merge pull request #3022 from romulox-x/aes256 
Updated aes256 implementation
 2015-12-08 21:16:32 -03:00
romulox_x 2cc8340594 updated aes256 implementation to newer version from upstream. Also uses faster lookup table implemetation. 2015-12-08 16:13:06 -08:00
Juan Linietsky 708ff381d6 changed a bit to use system() 2015-12-08 20:36:48 -03:00
Juan Linietsky 78b5404434 improve detection of linux, fixes #3201 2015-12-08 20:35:40 -03:00
Juan Linietsky 428984ec0c -New mask mode for lights, makes using masks MUCH easier. 2015-12-08 20:25:08 -03:00
Juan Linietsky 88c653a9e5 -made it add the node name from the file, closes #3010 2015-12-08 18:35:42 -03:00
Juan Linietsky c650d4e19c Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 17:48:03 -03:00
Juan Linietsky 09ff457185 made the exclusion of nodes from joints optional, fixes #3015 2015-12-08 17:47:12 -03:00
Juan Linietsky e176bb6a7c Merge pull request #2719 from SaracenOne/clipping_fix 
Canvas Clipping fix
 2015-12-08 17:18:19 -03:00
Juan Linietsky 176916524d Merge pull request #2841 from akien-mga/pr-ustring-snprintf 
Cleanup calls to _snprintf in ustring
 2015-12-08 17:17:49 -03:00
Juan Linietsky ac414c5581 Merge pull request #2849 from a12n/compobsd2 
Compile on OpenBSD
 2015-12-08 17:16:45 -03:00
Juan Linietsky 38ab47d2f9 Merge pull request #2865 from hurikhan/pr_fix_2791 
Added additional token checks for the shader if..else.. statement.
 2015-12-08 17:09:58 -03:00
Juan Linietsky ff936c6b2e Merge pull request #2868 from akien-mga/pr-fix-can-move-to 
Fix can_move_to and rename it for more clarity
 2015-12-08 17:09:47 -03:00
Juan Linietsky c26f66abde Merge pull request #2873 from neikeq/editor_layouts 
Editor layouts menu
 2015-12-08 17:09:38 -03:00
Juan Linietsky 17927cb705 Merge pull request #2877 from eska014/remove-builtin-aliases 
Remove unexpected GDScript aliases for built-in types
 2015-12-08 17:09:22 -03:00
Juan Linietsky f93fbbe1d2 Merge pull request #2888 from TheHX/item_list_plugin 
Make ItemListEditor plugin functional
 2015-12-08 17:07:32 -03:00
Juan Linietsky ee09c5dbd9 Merge pull request #2919 from TheHX/pr-groups-editor 
Update Groups Editor
 2015-12-08 17:07:05 -03:00
Juan Linietsky b6d6c2220f Merge pull request #2922 from romulox-x/set_hidden 
Added set_hidden method to Spatial and CanvasItem
 2015-12-08 17:06:45 -03:00
Juan Linietsky eff81965af Merge pull request #2956 from est31/add_system_wide_export_path 
Add way to look for templates at system wide level too
 2015-12-08 17:04:24 -03:00
Juan Linietsky a6ac1fcd94 Merge pull request #2983 from koalefant/vector_ptr 
Vector<>::_ptr is now typed and points to the beginning of the array rather than refcounting block
 2015-12-08 17:02:13 -03:00
Juan Linietsky afb895f197 Merge pull request #2993 from leezh/nrex-v0.1 
updated the RegEx library nrex to v0.1
 2015-12-08 17:00:27 -03:00
Juan Linietsky 1bcdea0804 Merge pull request #3018 from Ovnuniarchos/DampenIntegrator 
Areas now calculate their dampenings the same way as their gravity.
 2015-12-08 17:00:05 -03:00
Ovnuniarchos 43b2c9c7a4 Areas now calculate their dampenings the same way as their gravity. 2015-12-08 18:45:14 +01:00
Juan Linietsky ecad3a285f better unique name resolution, as suggested i #3017 2015-12-08 11:33:30 -03:00
Juan Linietsky 9637460331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 11:23:23 -03:00
Juan Linietsky 3c33b705d1 added option to add_child, to use the same deduplication convention as in the editor, closes #3017 2015-12-08 11:21:12 -03:00
Rémi Verschelde 2cc60386d8 Merge pull request #3005 from TheHX/pr-file-dialog 
Better hidden folders display preferences for editor file dialogs
 2015-12-07 20:40:58 +01:00
Rémi Verschelde c667bde183 Merge pull request #3007 from neikeq/fix_line_edit 
Fix LineEdit cursor
 2015-12-07 20:39:43 +01:00
neikeq f499fb6fcf Fix LineEdit cursor 2015-12-07 20:31:21 +01:00
Juan Linietsky 5e2f327d4b Merge branch 'master' of https://github.com/godotengine/godot 2015-12-07 11:51:01 -03:00
Juan Linietsky 8bdf2be4a6 -Webp include paths are broken, hacked them to work, fixes #2995 2015-12-07 11:50:00 -03:00
Saracen 157b97b087 Extended clipping fix to missing clipping-related features. 2015-12-07 13:59:42 +00:00