summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-19Merge pull request #2835 from akien-mga/pr-readme-wikiRémi Verschelde
Change wiki links to point to OpenProject website
2015-11-19Change wiki links to point to OpenProject websiteRémi Verschelde
2015-11-19Merge pull request #2827 from ZuBsPaCe/error-log-colors-windowsJuan Linietsky
Improved error log colours in the Windows terminal
2015-11-19Added missing \n in script error output.ZuBsPaCe
2015-11-19Nice error output padding. Code location behind " At: " is now aligned with ↵ZuBsPaCe
the error message above. Also removed the dot after the file location.
2015-11-19Set console background color on windows in SetConsoleTextAttribute, ↵ZuBsPaCe
otherwise text background will be black, which looks strange if the terminal color is not black.
2015-11-19Set output color of ERR_SCRIPT messages to purple. Same as on linux.ZuBsPaCe
2015-11-19Removed ANSI error codes from windows terminal error output. Windows does ↵ZuBsPaCe
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
2015-11-19Inconsistent code formatting in print_error (Newlines and spaces)ZuBsPaCe
2015-11-19removed iconv dependency from pe_blissJuan Linietsky
2015-11-19Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky
Conflicts: platform/windows/export/export.h
2015-11-19-remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260Juan Linietsky
2015-11-19Merge pull request #2824 from TheHX/split_container_propertyJuan Linietsky
Fix SplitContainer bool properties
2015-11-19Fix SplitContainer bool propertiesFranklin Sobrinho
2015-11-19Merge pull request #2822 from kurikaesu/masterJuan Linietsky
HTTPClient docs & request functionality + fixes
2015-11-19Fixes https://github.com/godotengine/godot/issues/2821Aren Villanueva
2015-11-19Fixes the make_doc.sh, <, > and & signs in descriptions that cause the ↵Aren Villanueva
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.
2015-11-19Merge pull request #2817 from Ovnuniarchos/DocRegex2Rémi Verschelde
RegEx class documentation updated to reflect latest changes.
2015-11-19Merge pull request #2823 from ZuBsPaCe/pe_bliss-vs2015-compile-errorRémi Verschelde
Fixes Visual Studio compile error due to pe_bliss
2015-11-19Changed capabilities list.Ovnuniarchos
2015-11-19Fixes Visual Studio compile error due to pe_blissZuBsPaCe
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
2015-11-19Merge pull request #2820 from masoudbh3/fix-windows-exportRémi Verschelde
Fix Windows Export
2015-11-19Fix Windows Exportmasoud bh
2015-11-19Merge pull request #2818 from godotengine/revert-2717-light_baker_transluscentJuan Linietsky
Revert "Ignore alpha materials in baked light ray-tracer."
2015-11-19Revert "Ignore alpha materials in baked light ray-tracer."Juan Linietsky
2015-11-19Merge pull request #2292 from blackwc/can_exportJuan Linietsky
Improve export validation
2015-11-19Merge pull request #2349 from neikeq/dock_patchJuan Linietsky
Hide right UR and BR dock slots by default
2015-11-19Merge pull request #2364 from neikeq/textedit_selectJuan Linietsky
Some TextEdit selection improvements
2015-11-19Merge pull request #2444 from TheHX/issue_2117Juan Linietsky
Fix for problem when drawing CollisionPolygon when parented (#2117)
2015-11-19Merge pull request #2445 from TheHX/issue_2113Juan Linietsky
Possible fix for crash on replacing Path2D node (#2113)
2015-11-19Merge pull request #2447 from TheHX/issue_1275Juan Linietsky
Fix crash after undo when editing Polygon2D (#1275)
2015-11-19Merge pull request #2451 from PeaceSells50/FixForFilesystemAddJuan Linietsky
Fixed bug with adding an instance from the FIleSystem dialog.
2015-11-19Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky
Add icon to exe file in windows export
2015-11-19Merge pull request #2644 from Ovnuniarchos/BBCodeDocsJuan Linietsky
BBCode is now allowed anywhere in the inline documentation.
2015-11-19Merge pull request #2696 from AlexHolly/restart-feature-on-runningJuan Linietsky
replay on play if already playing for scene and main + switch icon to…
2015-11-18Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilationJuan Linietsky
Visual studio 2015 compilation
2015-11-18Merge pull request #2786 from neikeq/node_select_menuJuan Linietsky
Added selection menu to spatial and canvas editors
2015-11-19Merge branch 'master' into BBCodeDocsOvnuniarchos
2015-11-19Added selection menu to spatial and canvas editorsneikeq
2015-11-18Merge pull request #2702 from TheHX/fix_align_with_viewJuan Linietsky
Fix 3D editor align with current view
2015-11-18Merge pull request #2706 from phobos-tro/main_memleaksJuan Linietsky
Fixing memleaks in main/main.cpp
2015-11-18Merge pull request #2707 from akien-mga/masterJuan Linietsky
Cosmetic fixes to SCons buildsystem
2015-11-18Merge pull request #2709 from eska014/fix-default-menubutton-styleboxesJuan Linietsky
Fix default StyleBoxes of MenuButton
2015-11-18Merge pull request #2711 from akien-mga/parameters-parsingJuan Linietsky
Fix arguments parsing in the main function
2015-11-18Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky
Change handling of invalid JSON escape sequences.
2015-11-18Merge pull request #2715 from SaracenOne/shader_fix_and_enhancementJuan Linietsky
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18Merge pull request #2716 from SaracenOne/animation_saving_fixJuan Linietsky
Added missing saving support to animation editor.
2015-11-18Merge pull request #2717 from SaracenOne/light_baker_transluscentJuan Linietsky
Ignore alpha materials in baked light ray-tracer.
2015-11-18Merge pull request #2718 from SaracenOne/audio_system_crash_fixJuan Linietsky
Fixed Audio System Crash
2015-11-18Merge pull request #2720 from SaracenOne/bone_attachment_fixJuan Linietsky
BoneAttachment fix.