aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve code formatting and update to 2.0Rémi Verschelde2015-12-0995-5631/+499
| | | | | | | | | | | 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.
* Merge pull request #2986 from TheHX/pr-shader-editorRémi Verschelde2015-12-091-0/+5
|\ | | | | Fix shader editor focus when switching tabs
| * 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
| * | updated aes256 implementation to newer version from upstream. Also uses ↵romulox_x2015-12-081-65/+105
|/ / | | | | | | faster lookup table implemetation.
* | 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
| |\ \ | | | | | | | | Canvas Clipping fix
| | * | 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 ↵Saracen2015-11-192-1/+1
| | | | | | | | | | | | | | | | small fix to bug causing viewport clipping to be inverted.
| | * | Another clipping fix: default back to using window size to calculate ↵Saracen2015-11-021-4/+17
| | | | | | | | | | | | | | | | clipping on viewports which don't have a rendertarget which fixes clipping on the editor viewport.
| | * | 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
| |\ \ \ | | | | | | | | | | Cleanup calls to _snprintf in ustring
| | * | | Fix call to _snprintf on GCCRémi Verschelde2015-11-201-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a regression from ddbf2ff. This commit also introduce a "#define snprintf _snprintf", so the rest of the file was simplified to make use of this instead of distinguishing between snprintf and _snprintf in the various functions.
| * | | | Merge pull request #2849 from a12n/compobsd2Juan Linietsky2015-12-083-5/+9
| |\ \ \ \ | | | | | | | | | | | | Compile on OpenBSD
| | * | | | 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.
| | * | | | | Added additional token checks for the shader if..else.. statement. Fixes ↵hurikhan2015-11-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issue #2791.
| * | | | | | Merge pull request #2868 from akien-mga/pr-fix-can-move-toJuan Linietsky2015-12-084-22/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix can_move_to and rename it for more clarity
| | * | | | | | Fix wrong index being used to populate r_resultsRémi Verschelde2015-12-041-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Regression from f33d9da.
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2416. The KinematicBody::can_move_to function was likely designed for two behaviours: - discrete: check if the body can "teleport" to the destination - continuous: check if the direct path to the destination is valid The continuous behaviour was however not implemented, and the discrete behaviour was broken too due to a wrong call to intersect_shape. The discrete behaviour has thus been fixed and the function renamed to can_teleport_to for more clarity.
| * | | | | | | Merge pull request #2873 from neikeq/editor_layoutsJuan Linietsky2015-12-084-21/+317
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Editor layouts menu
| | * | | | | | | Editor layouts menuneikeq2015-11-254-21/+317
| | | | | | | | |
| * | | | | | | | Merge pull request #2877 from eska014/remove-builtin-aliasesJuan Linietsky2015-12-081-6/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unexpected GDScript aliases for built-in types
| | * | | | | | | | 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 functional
| | * | | | | | | | 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 Editor
| | * | | | | | | | | 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 CanvasItem
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add way to look for templates at system wide level too
| | * | | | | | | | | | | Make the setting unix-only.est312015-11-308-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For this, put the detection into the OS class and its subclass.
| | * | | | | | | | | | | Add way to look for templates at system wide level tooest312015-11-3010-54/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for everybody wanting to package godot. Fixes #1026. -> Retain the old behaviour: path in error msg only when exporting. -> User templates override system templates
| * | | | | | | | | | | | Merge pull request #2983 from koalefant/vector_ptrJuan Linietsky2015-12-081-18/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector<>::_ptr is now typed and points to the beginning of the array rather than refcounting block
| | * | | | | | | | | | | | Vector<>::_ptr is now typed and points to the beginning of array rather than ↵koalefant2015-12-041-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference count block
| * | | | | | | | | | | | | Merge pull request #2993 from leezh/nrex-v0.1Juan Linietsky2015-12-086-48/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated the RegEx library nrex to v0.1
| | * | | | | | | | | | | | | updated nrex documentationZher Huei Lee2015-12-041-2/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | updated the RegEx library nrex to v0.1Zher Huei Lee2015-12-045-46/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After implementing unit testing to nrex I caught and fixed some errors so it should behave more like Python's RegEx In addition, I've added version numbering so it should be able to tell if the library needs updating. Here are a list of changes: - Fixed zero count quantifiers failing. - Fixed infinite recursion if quantifying zero length token. - Fixed `$` (as a string pattern on its own) not matching. - Fixed look behind rewinding beyond the start of the string. - Added support for alternative back reference format `\g{1}` similar to Python. This allows digits to be used immediately after back references. - Number of capture groups are still limited to 9 by default but can now be manually set, with option for no limit at all. (Python has no limit) - Curly bracket quantifiers `{0}` no longer interpreted as a literal string if previous token is not quantifiable. (Python behaviour)
| * | | | | | | | | | | | | | Merge pull request #3018 from Ovnuniarchos/DampenIntegratorJuan Linietsky2015-12-084-20/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Areas now calculate their dampenings the same way as their gravity.
| | * | | | | | | | | | | | | | Areas now calculate their dampenings the same way as their gravity.Ovnuniarchos2015-12-084-20/+31
| |/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / / made the exclusion of nodes from joints optional, fixes #3015Juan Linietsky2015-12-084-5/+70
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | better unique name resolution, as suggested i #3017Juan Linietsky2015-12-081-5/+1
| | | | | | | | | | | | | |