aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8502 from karroffel/multiscriptRémi Verschelde2017-04-247-2/+1049
|\ | | | | re-added MultiScript
| * re-added MultiScriptKarroffel2017-04-247-2/+1049
|/ | | | | | | | The very first Godot version (when it was open sourced) had "MultiScript" which lets you use multiple scripts on one object. With the addition of mulitple new scripting languages (VisualScript, soon C# and GDNative) it can be of use to combine scripts rather than delegating (with huge maintainance cost) or creating child nodes which could impact performance. I used the code from 0b806ee as the base and made it work with the current master.
* i18n: Add more assetlib strings to translateRémi Verschelde2017-04-2036-1859/+6922
| | | | Fixes #8463.
* i18n: Sync translation templates with current sourceRémi Verschelde2017-04-2034-800/+1940
|
* Merge pull request #8464 from karroffel/gdnative-msvc-fixThomas Herzog2017-04-201-2/+2
|\ | | | | [GDNative] fixed msvc build
| * [GDNative] fixed msvc buildKarroffel2017-04-201-2/+2
|/
* Move VERSION_MKSTRING logic to version.hRémi Verschelde2017-04-205-12/+41
| | | | | | | Fixes a bug where the VERSION_PATCH define is not yet in scope if typedefs.h is included before version.h at compilation time. (cherry picked from commit 3b687c5474113b64f186388883ca85cdfe6523d4)
* Merge pull request #8417 from neikeq/hello-thereRémi Verschelde2017-04-2011-66/+74
|\ | | | | External editor improvements and fixes
| * External editor improvements and fixesIgnacio Etcheverry2017-04-1711-66/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes: - Now ScriptLanguages have the option to override the global external editor setting. If `ScriptLanguage::open_in_external_editor()` returns `ERR_UNAVAILABLE` (which it does by default), then the global external editor option will be used. - Added formatting to the external editor execution arguments. Now it's possible to write something like this: `{project} -g {file}:{line}:{col}`. - `VisualScript::get_member_line()` now can return the line of functions (well, it returns the id of the _Function_ node of the function). I guess there is nothing else we can get a "line" from. Fixes: - Fixes a bug where `ScriptEditor::script_goto_method()` would not work if the script is not already open in the built-in editor. - Fixes wrong DEFVAL for `cursor_set_column` and `cursor_set_line` in TextEdit. - `Script::get_member_line()` now returns -1 ("found nothing") by default.
* | Merge pull request #8376 from RayKoopa/fix_stylebox_expand_marginRémi Verschelde2017-04-203-33/+33
|\ \ | | | | | | Respect the expand margin for StyleBoxTextures again.
| * | Respect the expand margin for StyleBoTextures again.Ray Koopa2017-04-133-33/+33
| | |
* | | Merge pull request #8359 from volzhs/script-filename-masterRémi Verschelde2017-04-201-2/+6
|\ \ \ | | | | | | | | Show script filename instead of thumbnail
| * | | Show script filename instead of thumbnailvolzhs2017-04-121-2/+6
| | | |
* | | | gitignore: Add version_generated.hRémi Verschelde2017-04-201-1/+1
| | | |
* | | | Clarification of degrees/radians in angle methodsChris Bradfield2017-04-201-7/+18
| | | |
* | | | Merge pull request #8455 from karroffel/gdnative-calling-convThomas Herzog2017-04-192-15/+29
|\ \ \ \ | | | | | | | | | | [GDNative] explicit calling convention
| * | | | [GDNative] explicit calling conventionKarroffel2017-04-192-15/+29
|/ / / /
* | | | Merge pull request #8447 from Melix19/patch-1Rémi Verschelde2017-04-181-1/+1
|\ \ \ \ | | | | | | | | | | Fixed that playing the project opens the project manager
| * | | | Fixed that playing the project opens the project managerMarco Melorio2017-04-181-1/+1
|/ / / / | | | | | | | | Fixes #8445
* | | | Merge pull request #8424 from Paulb23/convert_indentRémi Verschelde2017-04-1813-34/+313
|\ \ \ \ | | | | | | | | | | Support for space indentation
| * | | | Convert indent on savePaulb232017-04-184-0/+47
| | | | |
| * | | | Added support for space indentationPaulb232017-04-189-40/+168
| | | | |
| * | | | Added ability to convert indent typePaulb232017-04-162-0/+104
| | | | |
* | | | | Merge pull request #8441 from tagcup/seed_fixRémi Verschelde2017-04-183-6/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix PRNG randomization.
| * | | | | Fix PRNG randomization.Ferenc Arn2017-04-173-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCG32 doesn't like small seeds, which leads to zero random values (prior to #7532, zero values were handled as special cases). Use a large default seed, and also add a shift in Math::randomize. Fixes #8423.
* | | | | | Merge pull request #8388 from Dobbias/fix_#8381Rémi Verschelde2017-04-181-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix gles3-particles shader not compiling
| * | | | | | replaced incompatible keywords/functionDobbias2017-04-131-6/+6
| | | | | | |
* | | | | | | Drop EXEC PATHP?? super verbose info messageRémi Verschelde2017-04-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems to give nightmares to Windows users.
* | | | | | | Merge pull request #8375 from Hinsbart/project_extensionRémi Verschelde2017-04-177-45/+148
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use .godot as file extension for project files.
| * | | | | | | Use .godot as file extension for project files.Andreas Haas2017-04-167-45/+148
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now project files don't have to be named "godot.cfg" anymore, they can have any name so as long as it ends with *.godot. Also godot will automatically start the editor now if launched with a project file as an argument. This allows for double-clicking of projects to open them :) Code-wise this should be complete, but there's still work to do: - Make a nice icon for godot projects. - Work on installers/packaging -> register the extension and icon with godot. - Update the 2.1 to 3.0 exporter. Tested on linux and windows so far.
* | | | | | | Merge pull request #8440 from karroffel/gdnative-new-methodThomas Herzog2017-04-173-0/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [GDNative] added "new" method and fixed headers
| * | | | | | | [GDNative] added "new" method and fixed headersKarroffel2017-04-173-0/+54
| |/ / / / / /
* | | | | | | Merge pull request #8439 from touilleMan/correct_gdnative_signaturesThomas Herzog2017-04-176-413/+611
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Correct gdnative signatures
| * | | | | | gdnative: Implement missing function for godot_basis.Emmanuel Leblond2017-04-172-32/+180
| | | | | | |
| * | | | | | gdnative: modify vector2&vector3 functions signature to use value passing ↵Emmanuel Leblond2017-04-174-381/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of ptr.
* | | | | | | Merge pull request #8437 from touilleMan/gdnative-godot_string_unicode_strThomas Herzog2017-04-172-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add godot_string_unicode_str to GDnative
| * | | | | | Add godot_string_unicode_str to GDnativeEmmanuel Leblond2017-04-172-0/+6
|/ / / / / /
* | | | | | Merge pull request #8433 from neikeq/pr-fix-smthAndreas Haas2017-04-171-19/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | ScriptEditor: Fixes bug where menu option would be handled twice
| * | | | | | ScriptEditor: Fixes bug where menu option would be handled twiceIgnacio Etcheverry2017-04-171-19/+20
| | | | | | |
* | | | | | | Merge pull request #8426 from Shockblast/masterAndreas Haas2017-04-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [GD 3.0] Fix stretch mode 2d... again
| * | | | | | [GD 3.0] Fix stretch mode 2d... againShockblast2017-04-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects on the screen were not displayed when the project was played, because it looked for the values of width and height of menus with old names (godot 2.1?) For that reason delivered value (0, 0).
* / / / / / Editor: decrease blending time for dialog dimming a little.Andreas Haas2017-04-161-1/+1
|/ / / / / | | | | | | | | | | | | | | | Feels snappier now.
* | | | | Merge pull request #8394 from eska014/fbo-depth-formatAndreas Haas2017-04-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix FBO depth texture format
| * | | | | Fix FBO depth texture formatL. Krause2017-04-151-2/+2
| |/ / / /
* | | | | Merge pull request #8411 from touilleMan/gdnative-vector2-vector3Thomas Herzog2017-04-155-96/+346
|\ \ \ \ \ | | | | | | | | | | | | [GDnative] Implement missing functions in gdnative vector2 and vector3 bindings
| * | | | | Correct indentation in gdnative vector2/3Emmanuel Leblond2017-04-154-139/+168
| | | | | |
| * | | | | Implement missing functions in gdnative vector2 and vector3 bindingsEmmanuel Leblond2017-04-155-82/+303
|/ / / / /
* | | | | Merge pull request #8389 from volzhs/inspector-button-margin-masterAndreas Haas2017-04-141-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Make buttons closer in Inspector panel
| * | | | | Make buttons closer in Inspector panelvolzhs2017-04-141-0/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #8370 from volzhs/fix-stylebox-masterAndreas Haas2017-04-141-10/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix editor style box for ToolButton