| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | removed iconv dependency from pe_bliss | Juan Linietsky | 2015-11-19 | 2 | -34/+11 |
| | | |||||
| * | Merge branch 'master' of https://github.com/okamstudio/godot | Juan Linietsky | 2015-11-19 | 4 | -3/+20 |
| |\ | | | | | | | | | Conflicts: platform/windows/export/export.h | ||||
| | * | Merge pull request #2822 from kurikaesu/master | Juan Linietsky | 2015-11-19 | 3 | -3/+19 |
| | |\ | | | | | | | HTTPClient docs & request functionality + fixes | ||||
| | | * | Fixes https://github.com/godotengine/godot/issues/2821 | Aren Villanueva | 2015-11-19 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fixes the make_doc.sh, <, > and & signs in descriptions that cause the ↵ | Aren Villanueva | 2015-11-19 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | parser to break. Documentation for HTTPClient. Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages. String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method. | ||||
| | * | | Fixes Visual Studio compile error due to pe_bliss | ZuBsPaCe | 2015-11-19 | 1 | -0/+1 |
| | |/ | | | | | | | | | | | | | | | Error: C2039: 'min': is not a member of 'std' Reason: #2518 introduced pe_bliss Fix: Visual Studio 2015 & 2013 need to include algorithm header before string, otherwise std:min cannot be used. See: http://stackoverflow.com/questions/17409956 | ||||
| * / | -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 | Juan Linietsky | 2015-11-19 | 3 | -4/+4 |
| |/ | |||||
| * | Revert "Ignore alpha materials in baked light ray-tracer." | Juan Linietsky | 2015-11-19 | 2 | -106/+66 |
| | | |||||
| * | Merge pull request #2292 from blackwc/can_export | Juan Linietsky | 2015-11-19 | 2 | -11/+25 |
| |\ | | | | | Improve export validation | ||||
| | * | Improve export validation | blackwc | 2015-07-22 | 2 | -11/+25 |
| | | | |||||
| * | | Merge pull request #2349 from neikeq/dock_patch | Juan Linietsky | 2015-11-19 | 1 | -2/+5 |
| |\ \ | | | | | | | Hide right UR and BR dock slots by default | ||||
| | * | | Hide right_r dock slots by default | neikeq | 2015-08-09 | 1 | -2/+5 |
| | | | | |||||
| * | | | Merge pull request #2444 from TheHX/issue_2117 | Juan Linietsky | 2015-11-19 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | Fix for problem when drawing CollisionPolygon when parented (#2117) | ||||
| | * | | | Fix for issue #2117 | Franklin Sobrinho | 2015-09-07 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Merge pull request #2445 from TheHX/issue_2113 | Juan Linietsky | 2015-11-19 | 1 | -6/+3 |
| |\ \ \ \ | | | | | | | | | | | Possible fix for crash on replacing Path2D node (#2113) | ||||
| | * | | | | Possible fix for issue #2113 | Franklin Sobrinho | 2015-09-07 | 1 | -6/+3 |
| | |/ / / | | | | | | | | | | | | | * closes #2113 | ||||
| * | | | | Merge pull request #2447 from TheHX/issue_1275 | Juan Linietsky | 2015-11-19 | 1 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | Fix crash after undo when editing Polygon2D (#1275) | ||||
| | * | | | | Fix issue #1275 | Franklin Sobrinho | 2015-11-02 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #2451 from PeaceSells50/FixForFilesystemAdd | Juan Linietsky | 2015-11-19 | 1 | -4/+24 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixed bug with adding an instance from the FIleSystem dialog. | ||||
| | * | | | | | Fixed bug with adding an instance from the FIleSystem dialog. | Peace Sells | 2015-09-07 | 1 | -4/+24 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #2518 from masoudbh3/godot-icons | Juan Linietsky | 2015-11-19 | 88 | -0/+18200 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add icon to exe file in windows export | ||||
| | * | | | | | add copyright text | masoud bh | 2015-11-09 | 81 | -0/+1703 |
| | | | | | | | |||||
| | * | | | | | change pe_bliss parent directory from /drivers to /tools | masoud bh | 2015-11-09 | 85 | -0/+16445 |
| | | | | | | | |||||
| | * | | | | | Add icon to exe file in windows export | masoud bh | 2015-11-09 | 3 | -0/+52 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add version_info and icon sections in "export to windows platform". add version_info and icon to godot exe file (editor & template exe). fix an problem in image class. change all default icons to android export icon (a little more rounded). create an python script for convert file to cpp byte array for use in 'splash.h'. | ||||
| * | | | | | Merge pull request #2644 from Ovnuniarchos/BBCodeDocs | Juan Linietsky | 2015-11-19 | 1 | -48/+59 |
| |\ \ \ \ \ | | | | | | | | | | | | | BBCode is now allowed anywhere in the inline documentation. | ||||
| | * \ \ \ \ | Merge branch 'master' into BBCodeDocs | Ovnuniarchos | 2015-11-19 | 61 | -1116/+2255 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | BBCode is now allowed anywhere in the inline documentation. | Ovnuniarchos | 2015-10-20 | 1 | -47/+60 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2696 from AlexHolly/restart-feature-on-running | Juan Linietsky | 2015-11-19 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | replay on play if already playing for scene and main + switch icon to… | ||||
| | * | | | | | | | replay on play if already playing for scene and main + switch icon to reload ↵ | Alexander Holland | 2015-10-28 | 1 | -4/+10 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | if running. | ||||
| * | | | | | | | Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation | Juan Linietsky | 2015-11-18 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Visual studio 2015 compilation | ||||
| | * | | | | | | | Fixes Visual Studio 2015 compile error C3688 (invalid literal suffix) | ZuBsPaCe | 2015-10-29 | 2 | -3/+3 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | tools\editor\editor_node.cpp(3037): error C3688: invalid literal suffix 'VERSION_FULL_NAME'; literal operator or literal operator template 'operator ""VERSION_FULL_NAME' not found | ||||
| * | | | | | | | Merge pull request #2786 from neikeq/node_select_menu | Juan Linietsky | 2015-11-18 | 4 | -84/+393 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Added selection menu to spatial and canvas editors | ||||
| | * | | | | | | Added selection menu to spatial and canvas editors | neikeq | 2015-11-19 | 4 | -84/+393 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2702 from TheHX/fix_align_with_view | Juan Linietsky | 2015-11-18 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix 3D editor align with current view | ||||
| | * | | | | | | Fix "Align with view" undo, fixes #1443 | Franklin Sobrinho | 2015-10-29 | 1 | -5/+5 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2707 from akien-mga/master | Juan Linietsky | 2015-11-18 | 11 | -40/+15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Cosmetic fixes to SCons buildsystem | ||||
| | * | | | | | | Cosmetic fixes to SCons buildsystem | Rémi Verschelde | 2015-11-01 | 11 | -40/+15 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check | ||||
| * | | | | | | Merge pull request #2716 from SaracenOne/animation_saving_fix | Juan Linietsky | 2015-11-18 | 2 | -25/+167 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added missing saving support to animation editor. | ||||
| | * | | | | | | Added missing saving support to animation editor. | Saracen | 2015-11-02 | 2 | -25/+167 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2717 from SaracenOne/light_baker_transluscent | Juan Linietsky | 2015-11-18 | 2 | -66/+106 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ignore alpha materials in baked light ray-tracer. | ||||
| | * | | | | | | Ignore alpha materials in baked light ray-tracer. | Saracen | 2015-11-02 | 2 | -66/+106 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #2812 from eska014/split-anim-tracks-button | Juan Linietsky | 2015-11-18 | 2 | -24/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Split up AnimationPlayer tracks editor `Tracks` button | ||||
| | * | | | | | | Split up AnimationPlayer tracks editor `Tracks` button | eska | 2015-11-18 | 2 | -24/+41 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-library | Juan Linietsky | 2015-11-18 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added tooltip for a few buttons in sample library editor | ||||
| | * | | | | | | | Added tooltip for a few buttons in sample library editor | Tybobobo | 2015-11-18 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #2626 from TheHX/editor_dialogs | Juan Linietsky | 2015-11-18 | 6 | -80/+66 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Small fixes in some editor dialogs | ||||
| | * | | | | | | | | Change MeshInstanceEditor outline dialog "Ok" button label | Franklin Sobrinho | 2015-10-18 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Small fixes in some editor dialogs | Franklin Sobrinho | 2015-10-18 | 6 | -79/+65 |
| | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #2631 from firefly2442/duplicate-conditional-fix | Juan Linietsky | 2015-11-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | duplicate conditional check | ||||
| | * | | | | | | | | duplicate conditional check | firefly2442 | 2015-10-18 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
