summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Multiple scene editing *POTENTIALLY UNSTABLE*Juan Linietsky2015-06-2216-248/+949
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-06-1611-53/+570
|\
| * fixed small refresh issue when moving docksJuan Linietsky2015-06-141-0/+4
| * fixes for dock motionJuan Linietsky2015-06-142-2/+62
| * missing changesJuan Linietsky2015-06-147-11/+35
| * Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-06-131-4/+42
| |\
| * | some editor window changesJuan Linietsky2015-06-134-42/+471
* | | fix "v" pivot adjust functionJuan Linietsky2015-06-161-1/+11
| |/ |/|
* | made changing pivot simpler in 2D nodes (just press v with mouse over position)Juan Linietsky2015-06-121-4/+42
|/
* Merge pull request #2023 from TheJosh/dae-exporter-assimpJuan Linietsky2015-06-071-7/+17
|\
| * Fix DAE exporter - files unreadable by AssimpJosh Heidenreich2015-06-021-7/+17
* | Merge pull request #1973 from Biliogadafr/ColorRampJuan Linietsky2015-06-074-0/+122
|\ \
| * | Replace color phases with color ramp for Particles2D.Biliogadafr2015-05-244-0/+122
* | | -fixed many memory initialization issuesJuan Linietsky2015-06-069-13/+28
* | | Merge remote-tracking branch 'origin/master'Juan Linietsky2015-06-063-38/+340
|\ \ \ | | |/ | |/|
| * | -fixes to navigation, so edge-merging is more flexible on conflictJuan Linietsky2015-06-013-38/+340
* | | new file dialog!Juan Linietsky2015-06-0660-207/+859
|/ /
* | mesh previewreduz2015-05-313-0/+132
* | work in progress, resource previewsJuan Linietsky2015-05-3122-17/+2444
* | -fix bug in animation editorJuan Linietsky2015-05-271-1/+9
* | ability to run 2D physics in a threadJuan Linietsky2015-05-261-3/+3
* | improved animation editorJuan Linietsky2015-05-2522-91/+773
|/
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-2111-46/+87
|\
| * fixes on sample importingJuan Linietsky2015-05-191-2/+3
| * fix a crash situation when starting a thread and other small fixesJuan Linietsky2015-05-181-1/+4
| * fix a compile errorJuan Linietsky2015-05-181-1/+1
| * -Rename unexisting by nonexistant, closes #1940Juan Linietsky2015-05-182-2/+2
| * -changed some copyrights to 2015Juan Linietsky2015-05-172-3/+3
| * reinstante focus into textedit after menu used in code editorJuan Linietsky2015-05-171-0/+6
| * properly save external resources, fixes #1924Juan Linietsky2015-05-172-33/+57
| * Merge pull request #1900 from guilhermefelipecgs/fix_#1898Juan Linietsky2015-05-161-1/+1
| |\
| | * Fix #1898Guilherme Felipe2015-05-131-1/+1
| * | 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
| * | -Fixed bug in translation remaps, also added proper demo, maybe fixes #1729Juan Linietsky2015-05-121-2/+3
| * | 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-1115-29/+79
|\| |
| * | -compatibility option for physicsbody layers, fixes #1842Juan Linietsky2015-05-101-0/+1
| * | corrected copyright date in project manager, fixes #1870Juan Linietsky2015-05-091-1/+1
| * | optional formal changesehriche2015-05-066-8/+10
| * | fixed SpatialEditor::_init_indications. loopcounter "i" used ambiguousehriche2015-05-061-3/+3
| * | fixed issue with format string in PCKPacker::flushehriche2015-05-061-1/+1
| |/
| * fix crash in editor when using alt+arrows to indent, thanks adolson and romul...Juan Linietsky2015-05-051-12/+12
| * Proper support for code editor autosaving (disabled by default)Juan Linietsky2015-05-043-2/+44
| * fix font import path on windows, closes #1675Juan Linietsky2015-05-042-2/+6
| * Merge pull request #1738 from jackmakesthings/masterJuan Linietsky2015-05-031-0/+1
| |\
| | * issue #1715 - menu separatorjack2015-04-251-0/+1
* | | Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-05-01184-594/+728
|\| |
| * | -Fixes from source code analyzizer, closes #1768Juan Linietsky2015-05-013-4/+4