| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix compile error in some msvc version (snprintf not found) | Ariel Manzur | 2015-11-19 | 1 | -1/+6 |
| | | |||||
| * | Merge pull request #2827 from ZuBsPaCe/error-log-colors-windows | Juan Linietsky | 2015-11-19 | 2 | -48/+60 |
| |\ | | | | | Improved error log colours in the Windows terminal | ||||
| | * | Added missing \n in script error output. | ZuBsPaCe | 2015-11-19 | 2 | -2/+2 |
| | | | |||||
| | * | Nice error output padding. Code location behind " At: " is now aligned with ↵ | ZuBsPaCe | 2015-11-19 | 2 | -12/+20 |
| | | | | | | | | | the error message above. Also removed the dot after the file location. | ||||
| | * | Set console background color on windows in SetConsoleTextAttribute, ↵ | ZuBsPaCe | 2015-11-19 | 1 | -5/+8 |
| | | | | | | | | | otherwise text background will be black, which looks strange if the terminal color is not black. | ||||
| | * | Set output color of ERR_SCRIPT messages to purple. Same as on linux. | ZuBsPaCe | 2015-11-19 | 1 | -1/+1 |
| | | | |||||
| | * | Removed ANSI error codes from windows terminal error output. Windows does ↵ | ZuBsPaCe | 2015-11-19 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | not support them. See: http://stackoverflow.com/questions/16755142/how-to-make-win32-console-recognize-ansi-vt100-escape-sequences See: http://stackoverflow.com/questions/22777142/is-there-a-way-to-make-windows-output-ansi-escape-sequences?lq=1 | ||||
| | * | Inconsistent code formatting in print_error (Newlines and spaces) | ZuBsPaCe | 2015-11-19 | 2 | -45/+46 |
| |/ | |||||
| * | 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 | 10 | -11/+127 |
| |\ | | | | | | | | | Conflicts: platform/windows/export/export.h | ||||
| | * | Merge pull request #2824 from TheHX/split_container_property | Juan Linietsky | 2015-11-19 | 1 | -2/+2 |
| | |\ | | | | | | | Fix SplitContainer bool properties | ||||
| | | * | Fix SplitContainer bool properties | Franklin Sobrinho | 2015-11-19 | 1 | -2/+2 |
| | |/ | |||||
| | * | Merge pull request #2822 from kurikaesu/master | Juan Linietsky | 2015-11-19 | 8 | -8/+119 |
| | |\ | | | | | | | 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 | 7 | -8/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Merge pull request #2817 from Ovnuniarchos/DocRegex2 | Rémi Verschelde | 2015-11-19 | 1 | -1/+5 |
| | |\ \ | | | | | | | | | RegEx class documentation updated to reflect latest changes. | ||||
| | | * | | Changed capabilities list. | Ovnuniarchos | 2015-11-19 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | Merge pull request #2823 from ZuBsPaCe/pe_bliss-vs2015-compile-error | Rémi Verschelde | 2015-11-19 | 1 | -0/+1 |
| | |\ \ \ | | |/ / | |/| | | Fixes Visual Studio compile error due to pe_bliss | ||||
| | | * | | 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 | ||||
| | * | | Merge pull request #2820 from masoudbh3/fix-windows-export | Rémi Verschelde | 2015-11-19 | 2 | -3/+3 |
| | |\ \ | | |/ | |/| | Fix Windows Export | ||||
| | | * | Fix Windows Export | masoud bh | 2015-11-19 | 2 | -3/+3 |
| | |/ | |||||
| * / | -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 | Juan Linietsky | 2015-11-19 | 12 | -16/+16 |
| |/ | |||||
| * | Merge pull request #2818 from godotengine/revert-2717-light_baker_transluscent | Juan Linietsky | 2015-11-19 | 2 | -106/+66 |
| |\ | | | | | Revert "Ignore alpha materials in baked light ray-tracer." | ||||
| | * | 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 #2364 from neikeq/textedit_select | Juan Linietsky | 2015-11-19 | 2 | -63/+64 |
| |\ \ \ | | | | | | | | | Some TextEdit selection improvements | ||||
| | * | | | TextEdit: Properly scroll vertically when selecting text with mouse drag | neikeq | 2015-11-07 | 2 | -19/+14 |
| | | | | | |||||
| | * | | | textedit selection improvements | neikeq | 2015-08-13 | 2 | -44/+50 |
| | |/ / | | | | | | | | | | | | | allows using shift and pointer selection together, and selecting text while scrolling. tried to make it as similar as possible to most editors. | ||||
| * | | | 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 | 103 | -10/+18782 |
| |\ \ \ \ \ | | | | | | | | | | | | | 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 | 90 | -124/+113 |
| | | | | | | | |||||
| | * | | | | | Add icon to exe file in windows export | masoud bh | 2015-11-09 | 103 | -11/+17091 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 292 | -2175/+5147 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 4 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Visual studio 2015 compilation | ||||
| | * | | | | | | | | | Fixes Visual Studio 2015 parallel builds (-j switch) | ZuBsPaCe | 2015-10-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: http://stackoverflow.com/questions/284778/what-are-the-implications-of-using-zi-vs-z7-for-visual-studio-c-projects fatal error C1041: cannot open program database 'C:\godot\vc140.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS | ||||
