aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* -ability to set default textures in shader (needed for visual shader editing)Juan Linietsky2014-12-2123-44/+351
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2014-12-2015-131/+503
|\
| * Merge pull request #1000 from sanikoyes/Pr-tween-fixJuan Linietsky2014-12-193-98/+146
| |\
| | * 1.Change interpolate_callback:p_times_in_sec argument before p_callback argum...sanikoyes2014-12-193-98/+146
| * | Merge pull request #1002 from astillich/pulseaudioJuan Linietsky2014-12-198-1/+313
| |\ \ | | |/ | |/|
| | * Implemented PulseAudio backend and fixed audio driver selection on X11Alexander Stillich2014-12-198-1/+313
| |/
| * Merge pull request #985 from adolson/toggle-comment-shortcut-fixJuan Linietsky2014-12-182-22/+1
| |\
| | * change shortcut for toggle-comment to Ctrl+KDana Olson2014-12-172-22/+1
| * | Merge pull request #986 from TheoXD/_tree_multiselect_moveJuan Linietsky2014-12-181-9/+42
| |\ \
| | * | Small clean-up..TheoXD2014-12-181-7/+4
| | * | Restricted to same parent, seem to work better now.TheoXD2014-12-181-8/+11
| | * | Selected node(s) can now be moved up and down in scene tree dock.TheoXD2014-12-181-10/+43
| | |/
| * | Merge pull request #987 from sanikoyes/Pr-crash-in-scrip-initJuan Linietsky2014-12-181-1/+1
| |\ \ | | |/ | |/|
| | * Fix crash when gd-script _init failsanikoyes2014-12-181-1/+1
| |/
* | WIP work on graph nodes and editingJuan Linietsky2014-12-203-0/+245
* | -improved completion options for InputEvent, shows all event types nowJuan Linietsky2014-12-184-28/+98
|/
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2014-12-171-1/+1
|\
| * Merge pull request #984 from orbitcowboy/masterJuan Linietsky2014-12-171-1/+1
| |\
| | * xml_parser: check array length index before accessing the array.orbitcowboy2014-12-161-1/+1
* | | oops, C++11 makes me screw upJuan Linietsky2014-12-171-2/+2
|/ /
* / -removed annoying pragmaJuan Linietsky2014-12-171-2/+2
|/
* -added brace matching to go with the new code completionJuan Linietsky2014-12-177-1/+151
* -fixed crash reported by n-pigeonJuan Linietsky2014-12-162-1/+12
* -fix compilation issueJuan Linietsky2014-12-162-33/+21
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2014-12-1624-53/+350
|\
| * Merge pull request #980 from UsernameIsAReservedWord/fix-demo-3d-mousepickJuan Linietsky2014-12-161-1/+1
| |\
| | * fix demo 3d mousepick testyg2f2014-12-161-1/+1
| |/
| * Update README.mdJuan Linietsky2014-12-151-5/+0
| * version bump to stable1.0-stableJuan Linietsky2014-12-151-1/+1
| * Small batch of fixesJuan Linietsky2014-12-1521-46/+348
* | New Code CompletionJuan Linietsky2014-12-1630-773/+2089
|/
* compilation fixJuan Linietsky2014-12-081-1/+6
* version update for rc21.0-rc2Juan Linietsky2014-12-081-1/+1
* Small FixesJuan Linietsky2014-12-085-27/+290
* Merge pull request #916 from quabug/commitJuan Linietsky2014-12-082-0/+7
|\
| * use tab instead of spacequabug2014-12-031-1/+1
| * Add move_child_notify method in Node classquabug2014-12-032-0/+7
* | Merge pull request #939 from marynate/PR-tween-demo-iconJuan Linietsky2014-12-081-0/+0
|\ \
| * | Add missing icon.png to tween demomarynate2014-12-081-0/+0
* | | Merge pull request #940 from marynate/PR-fix-isim-buildJuan Linietsky2014-12-081-4/+8
|\ \ \
| * | | Update ios simulator build config file to build under new ios SDKmarynate2014-12-081-4/+8
| |/ /
* | | Merge pull request #941 from adolson/confirm-insert-trackJuan Linietsky2014-12-082-12/+15
|\ \ \ | |/ / |/| |
| * | remove old unused pref, added new confirm insert trackDana Olson2014-12-082-12/+15
|/ /
* | More FixesJuan Linietsky2014-12-073-8/+12
* | Merge pull request #933 from adolson/alt-arrows-editor-fixJuan Linietsky2014-12-073-30/+103
|\ \
| * | now undo/redo supportedDana Olson2014-12-071-8/+5
| * | apply patch #882 from dcubixDana Olson2014-12-073-30/+106
|/ /
* | more bugfixesJuan Linietsky2014-12-071-0/+2
* | missing fix in fileJuan Linietsky2014-12-071-1/+1
* | Batch of BugfixesJuan Linietsky2014-12-0735-115/+491