aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* up version to rc21.1-rc2Juan Linietsky2015-05-051-1/+1
* avoid crash on some cases of richtextlabel fill, but odd behavior persists, #...Juan Linietsky2015-05-051-1/+3
* Merge pull request #1814 from sanikoyes/Pr-Tween-fixJuan Linietsky2015-05-052-11/+226
|\
| * Spine: add feature to insert/remove interpolates while updatingsanikoyes2015-05-052-11/+226
* | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-051-82/+25
|\ \
| * \ Merge pull request #1807 from SuperUserNameMan/fix_windows_unicode_path2Juan Linietsky2015-05-041-82/+25
| |\ \
| | * | fixes issue #1693 winmain and main unicodeyg2f2015-05-041-82/+25
* | | | fix crash in editor when using alt+arrows to indent, thanks adolson and romul...Juan Linietsky2015-05-052-12/+15
|/ / /
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-042-3/+3
|\ \ \ | | |/ | |/|
| * | Merge pull request #1804 from ricpelo/ricpelo-patch-2Juan Linietsky2015-05-041-2/+2
| |\ \
| | * | Wrong use of | instead of ||Ricardo Pérez2015-05-041-2/+2
| * | | Merge pull request #1810 from ricpelo/ricpelo-patch-3Juan Linietsky2015-05-041-1/+1
| |\ \ \
| | * | | Fixes Theora buildRicardo Pérez2015-05-041-1/+1
| | |/ /
* | / / Proper support for code editor autosaving (disabled by default)Juan Linietsky2015-05-043-2/+44
|/ / /
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-046-11/+21
|\ \ \
| * | | fix font import path on windows, closes #1675Juan Linietsky2015-05-044-6/+14
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/master'Juan Linietsky2015-05-041229-5303/+9957
| |\ \
| * | | small unicode fixesJuan Linietsky2015-05-042-7/+8
* | | | -More strict argument type-checking, will make many bugs visible, fixes #1809Juan Linietsky2015-05-047-9/+263
| |/ / |/| |
* | | -invalidated string -> int automatic conversion, fixes #1788Juan Linietsky2015-05-041-3/+3
* | | -corrected frac() and hyperbolic sin,cos,tan when running on PC (GLSL120), fi...Juan Linietsky2015-05-043-5/+65
* | | -vec3 uniforms should now work, fixes #1773Juan Linietsky2015-05-044-20/+49
* | | solve invalid pointer, fixes #1793Juan Linietsky2015-05-041-0/+1
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-0417-153/+238
|\ \ \
| * \ \ Merge pull request #1738 from jackmakesthings/masterJuan Linietsky2015-05-035-1/+5
| |\ \ \
| | * | | issue #1715 - menu separatorjack2015-04-251-0/+1
| | * | | Set name on window management demo's engine.cfgjack2015-04-251-1/+1
| | * | | Set name on rich text bbcode demo's engine.cfgjack2015-04-251-0/+1
| | * | | Set name on truck-town demo's engine.cfgjack2015-04-251-0/+1
| | * | | Set name on isometric-light demo's engine.cfgjack2015-04-251-0/+1
| * | | | Merge pull request #1755 from dbsGen/masterJuan Linietsky2015-05-032-33/+58
| |\ \ \ \
| | * | | | Optimize the code.Gen2015-05-011-66/+31
| | * | | | fixed a autowrap bug when word is too length.Gen2015-04-301-6/+5
| | * | | | Update label.cppGen2015-04-301-1/+20
| | * | | | space is only skipped when autowrap.Gen2015-04-291-3/+2
| | * | | | record the number of space before a word.Gen2015-04-291-2/+2
| | * | | | record the number of space before a words.Gen2015-04-291-16/+26
| | * | | | Update label.hGen2015-04-281-1/+2
| | * | | | Update label.cppGen2015-04-281-5/+37
| * | | | | Merge pull request #1772 from Biliogadafr/TripleclickJuan Linietsky2015-05-031-1/+1
| |\ \ \ \ \
| | * | | | | Triple click doesn't select line if click was done on different lines. Fix #1727Biliogadafr2015-05-021-1/+1
| * | | | | | Merge pull request #1784 from NateWardawg/sa_fixesJuan Linietsky2015-05-032-3/+3
| |\ \ \ \ \ \
| | * | | | | | Fixed some items caught in cppcheckNathan Warden2015-05-022-3/+3
| * | | | | | | Merge pull request #1792 from swenner/static_analysis_fixesJuan Linietsky2015-05-034-24/+25
| |\ \ \ \ \ \ \
| | * | | | | | | fixed uninitialized name pointers (cppcheck)Simon Wenner2015-05-031-2/+2
| | * | | | | | | fixed memory leak: triangulated (cppcheck)Simon Wenner2015-05-031-0/+1
| | * | | | | | | fixed broken comment blockSimon Wenner2015-05-031-1/+1
| | * | | | | | | removed unnecessary semicolonsSimon Wenner2015-05-031-20/+20
| | * | | | | | | fixed uninitialized variable (cppcheck)Simon Wenner2015-05-031-1/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #1798 from ricpelo/ricpelo-patch-1Juan Linietsky2015-05-031-1/+1
| |\ \ \ \ \ \ \