aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix compile error in some msvc version (snprintf not found)Ariel Manzur2015-11-191-1/+6
* Merge pull request #2827 from ZuBsPaCe/error-log-colors-windowsJuan Linietsky2015-11-192-48/+60
|\
| * Added missing \n in script error output.ZuBsPaCe2015-11-192-2/+2
| * Nice error output padding. Code location behind " At: " is now aligned with t...ZuBsPaCe2015-11-192-12/+20
| * Set console background color on windows in SetConsoleTextAttribute, otherwise...ZuBsPaCe2015-11-191-5/+8
| * Set output color of ERR_SCRIPT messages to purple. Same as on linux.ZuBsPaCe2015-11-191-1/+1
| * Removed ANSI error codes from windows terminal error output. Windows does not...ZuBsPaCe2015-11-192-12/+12
| * Inconsistent code formatting in print_error (Newlines and spaces)ZuBsPaCe2015-11-192-45/+46
|/
* removed iconv dependency from pe_blissJuan Linietsky2015-11-192-34/+11
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-11-1910-11/+127
|\
| * Merge pull request #2824 from TheHX/split_container_propertyJuan Linietsky2015-11-191-2/+2
| |\
| | * Fix SplitContainer bool propertiesFranklin Sobrinho2015-11-191-2/+2
| |/
| * Merge pull request #2822 from kurikaesu/masterJuan Linietsky2015-11-198-8/+119
| |\
| | * Fixes https://github.com/godotengine/godot/issues/2821Aren Villanueva2015-11-191-0/+1
| | * Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser...Aren Villanueva2015-11-197-8/+118
| * | Merge pull request #2817 from Ovnuniarchos/DocRegex2Rémi Verschelde2015-11-191-1/+5
| |\ \
| | * | Changed capabilities list.Ovnuniarchos2015-11-191-1/+5
| * | | Merge pull request #2823 from ZuBsPaCe/pe_bliss-vs2015-compile-errorRémi Verschelde2015-11-191-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixes Visual Studio compile error due to pe_blissZuBsPaCe2015-11-191-0/+1
| | |/
| * | Merge pull request #2820 from masoudbh3/fix-windows-exportRémi Verschelde2015-11-192-3/+3
| |\ \ | | |/ | |/|
| | * Fix Windows Exportmasoud bh2015-11-192-3/+3
| |/
* / -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260Juan Linietsky2015-11-1912-16/+16
|/
* Merge pull request #2818 from godotengine/revert-2717-light_baker_transluscentJuan Linietsky2015-11-192-106/+66
|\
| * Revert "Ignore alpha materials in baked light ray-tracer."Juan Linietsky2015-11-192-106/+66
|/
* Merge pull request #2292 from blackwc/can_exportJuan Linietsky2015-11-192-11/+25
|\
| * Improve export validationblackwc2015-07-222-11/+25
* | Merge pull request #2349 from neikeq/dock_patchJuan Linietsky2015-11-191-2/+5
|\ \
| * | Hide right_r dock slots by defaultneikeq2015-08-091-2/+5
* | | Merge pull request #2364 from neikeq/textedit_selectJuan Linietsky2015-11-192-63/+64
|\ \ \
| * | | TextEdit: Properly scroll vertically when selecting text with mouse dragneikeq2015-11-072-19/+14
| * | | textedit selection improvementsneikeq2015-08-132-44/+50
| |/ /
* | | Merge pull request #2444 from TheHX/issue_2117Juan Linietsky2015-11-191-0/+5
|\ \ \
| * | | Fix for issue #2117Franklin Sobrinho2015-09-071-0/+5
* | | | Merge pull request #2445 from TheHX/issue_2113Juan Linietsky2015-11-191-6/+3
|\ \ \ \
| * | | | Possible fix for issue #2113Franklin Sobrinho2015-09-071-6/+3
| |/ / /
* | | | Merge pull request #2447 from TheHX/issue_1275Juan Linietsky2015-11-191-5/+6
|\ \ \ \
| * | | | Fix issue #1275Franklin Sobrinho2015-11-021-5/+6
* | | | | Merge pull request #2451 from PeaceSells50/FixForFilesystemAddJuan Linietsky2015-11-191-4/+24
|\ \ \ \ \
| * | | | | Fixed bug with adding an instance from the FIleSystem dialog.Peace Sells2015-09-071-4/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky2015-11-19103-10/+18782
|\ \ \ \ \
| * | | | | add copyright textmasoud bh2015-11-0981-0/+1703
| * | | | | change pe_bliss parent directory from /drivers to /toolsmasoud bh2015-11-0990-124/+113
| * | | | | Add icon to exe file in windows exportmasoud bh2015-11-09103-11/+17091
* | | | | | Merge pull request #2644 from Ovnuniarchos/BBCodeDocsJuan Linietsky2015-11-191-48/+59
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into BBCodeDocsOvnuniarchos2015-11-19292-2175/+5147
| |\ \ \ \ \ \
| * | | | | | | BBCode is now allowed anywhere in the inline documentation.Ovnuniarchos2015-10-201-47/+60
* | | | | | | | Merge pull request #2696 from AlexHolly/restart-feature-on-runningJuan Linietsky2015-11-191-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | replay on play if already playing for scene and main + switch icon to reload ...Alexander Holland2015-10-281-4/+10
* | | | | | | | | Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilationJuan Linietsky2015-11-184-8/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes Visual Studio 2015 parallel builds (-j switch)ZuBsPaCe2015-10-301-2/+2