aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* version bump to stable1.1-stableJuan Linietsky2015-05-211-1/+1
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-2195-102/+3157
|\
| * Merge pull request #1951 from akien-mga/masterJuan Linietsky2015-05-203-0/+67
| |\
| | * Add input mapping GUI demoRémi Verschelde2015-05-203-0/+67
| |/
| * fixes on sample importingJuan Linietsky2015-05-194-4/+16
| * more fixesJuan Linietsky2015-05-192-2/+9
| * fixed latin separation in label, broke it? for cjkJuan Linietsky2015-05-191-3/+7
| * more fixesJuan Linietsky2015-05-1914-12/+55
| * fix a crash situation when starting a thread and other small fixesJuan Linietsky2015-05-184-7/+39
| * fix a compile errorJuan Linietsky2015-05-183-5/+5
| * -Rename unexisting by nonexistant, closes #1940Juan Linietsky2015-05-1810-12/+30
| * -changed some copyrights to 2015Juan Linietsky2015-05-172-3/+3
| * version bump to rc31.1-rc3Juan Linietsky2015-05-171-1/+1
| * small description improvementJuan Linietsky2015-05-172-3/+4
| * added a built-in scene changer API, closes #1928Juan Linietsky2015-05-178-4/+128
| * reinstante focus into textedit after menu used in code editorJuan Linietsky2015-05-171-0/+6
| * fix crash on help, closes #1873Juan Linietsky2015-05-171-1/+6
| * properly save external resources, fixes #1924Juan Linietsky2015-05-175-34/+84
| * Merge pull request #1927 from antonyjones67/RevertReadmeChangeJuan Linietsky2015-05-171-1/+1
| |\
| | * Put this back to fix web page.Will have to figure something else for mainpage...Antony Jones2015-05-171-1/+1
| |/
| * -Integers and Float should interpolate on animation, maybe fixes #1891, pleas...Juan Linietsky2015-05-161-1/+9
| * sleeping property now should work properly, fixes #1892Juan Linietsky2015-05-164-2/+6
| * Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-1610-7/+2460
| |\
| | * Merge pull request #1901 from guilhermefelipecgs/add_ignore_tagsJuan Linietsky2015-05-161-0/+15
| | |\
| | | * Ignore etags, ctags, gtags and cscope.Guilherme Felipe2015-05-131-0/+15
| | * | Merge pull request #1900 from guilhermefelipecgs/fix_#1898Juan Linietsky2015-05-161-1/+1
| | |\ \
| | | * | Fix #1898Guilherme Felipe2015-05-131-1/+1
| | | |/
| | * | Merge pull request #1881 from NateWardawg/masterJuan Linietsky2015-05-161-3/+2
| | |\ \
| | | * | Removed redundant code in the kinematic 3D demo.Nathan Warden2015-05-101-3/+2
| | * | | Merge pull request #1880 from antonyjones67/DoxyFIleJuan Linietsky2015-05-164-2/+2434
| | |\ \ \
| | | * | | Forgot this. It points Doxyfile to the logo without text.Antony2015-05-101-1/+1
| | | * | | Added Doxyfile for Doxygen documentation. Had to modify codec.h because it al...Antony2015-05-104-2/+2434
| | * | | | Merge pull request #1761 from est31/masterJuan Linietsky2015-05-162-0/+6
| | |\ \ \ \
| | | * | | | Abort when exporting failsest312015-05-051-0/+5
| | | * | | | Set settings directory variable when loading settings failsest312015-05-051-0/+1
| | * | | | | Merge pull request #1908 from vipsbpig/masterJuan Linietsky2015-05-161-1/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | fix multitouch release problemvipsbpig2015-05-151-1/+2
| | |/ / / /
| * | | | | -small motion demo, to better troubleshootJuan Linietsky2015-05-164-0/+42
| * | | | | -bit slower execution in debug, but proper error reporting for get index and ...Juan Linietsky2015-05-161-3/+28
| |/ / / /
| * | | | Fixes problem parsing config files using ConfigFileJuan Linietsky2015-05-121-0/+2
| * | | | -Added lookat/get_angle_to functions in 2D, and a demo, closes #1843Juan Linietsky2015-05-128-0/+71
| * | | | -Fixed bug in translation remaps, also added proper demo, maybe fixes #1729Juan Linietsky2015-05-128-2/+24
| * | | | Translation DemoJuan Linietsky2015-05-1110-0/+53
| * | | | fixs particles on 3d platformer demo, closes #1588Juan Linietsky2015-05-111-0/+0
| * | | | -shadergraph now saved when on external file and modified, fixes #1832Juan Linietsky2015-05-111-1/+7
| * | | | fixed crash on make resources unique menu option, fixes #1874Juan Linietsky2015-05-111-1/+1
* | | | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-11133-979/+2618
|\| | | |
| * | | | -Updated isometric 2d demo to work using the new isometric support, fixes #1849Juan Linietsky2015-05-114-0/+0
| * | | | -improved one-way collision handling in both dynamic and character bodies for...Juan Linietsky2015-05-103-4/+19
| | |_|/ | |/| |
| * | | -fixed some glitches in isometric light demo, closes #1858Juan Linietsky2015-05-103-0/+0