aboutsummaryrefslogtreecommitdiff
path: root/tools (follow)
Commit message (Expand)AuthorAgeFilesLines
* removed iconv dependency from pe_blissJuan Linietsky2015-11-192-34/+11
* Merge branch 'master' of https://github.com/okamstudio/godotJuan Linietsky2015-11-194-3/+20
|\
| * Merge pull request #2822 from kurikaesu/masterJuan Linietsky2015-11-193-3/+19
| |\
| | * 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-192-3/+18
| * | Fixes Visual Studio compile error due to pe_blissZuBsPaCe2015-11-191-0/+1
| |/
* / -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260Juan Linietsky2015-11-193-4/+4
|/
* 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 #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-1988-0/+18200
|\ \ \ \ \
| * | | | | add copyright textmasoud bh2015-11-0981-0/+1703
| * | | | | change pe_bliss parent directory from /drivers to /toolsmasoud bh2015-11-0985-0/+16445
| * | | | | Add icon to exe file in windows exportmasoud bh2015-11-093-0/+52
| | |/ / / | |/| | |
* | | | | Merge pull request #2644 from Ovnuniarchos/BBCodeDocsJuan Linietsky2015-11-191-48/+59
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into BBCodeDocsOvnuniarchos2015-11-1961-1116/+2255
| |\ \ \ \ \
| * | | | | | 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-182-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fixes Visual Studio 2015 compile error C3688 (invalid literal suffix)ZuBsPaCe2015-10-292-3/+3
| |/ / / / / /
* | | | | | | Merge pull request #2786 from neikeq/node_select_menuJuan Linietsky2015-11-184-84/+393
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added selection menu to spatial and canvas editorsneikeq2015-11-194-84/+393
| |/ / / / /
* | | | | | Merge pull request #2702 from TheHX/fix_align_with_viewJuan Linietsky2015-11-181-5/+5
|\ \ \ \ \ \
| * | | | | | Fix "Align with view" undo, fixes #1443Franklin Sobrinho2015-10-291-5/+5
| |/ / / / /
* | | | | | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-1811-40/+15
|\ \ \ \ \ \
| * | | | | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-0111-40/+15
| |/ / / / /
* | | | | | Merge pull request #2716 from SaracenOne/animation_saving_fixJuan Linietsky2015-11-182-25/+167
|\ \ \ \ \ \
| * | | | | | Added missing saving support to animation editor.Saracen2015-11-022-25/+167
| |/ / / / /
* | | | | | Merge pull request #2717 from SaracenOne/light_baker_transluscentJuan Linietsky2015-11-182-66/+106
|\ \ \ \ \ \
| * | | | | | Ignore alpha materials in baked light ray-tracer.Saracen2015-11-022-66/+106
| |/ / / / /
* | | | | | Merge pull request #2812 from eska014/split-anim-tracks-buttonJuan Linietsky2015-11-182-24/+41
|\ \ \ \ \ \
| * | | | | | Split up AnimationPlayer tracks editor `Tracks` buttoneska2015-11-182-24/+41
* | | | | | | Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-libraryJuan Linietsky2015-11-181-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Added tooltip for a few buttons in sample library editorTybobobo2015-11-181-0/+4
* | | | | | | | Merge pull request #2626 from TheHX/editor_dialogsJuan Linietsky2015-11-186-80/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | Change MeshInstanceEditor outline dialog "Ok" button labelFranklin Sobrinho2015-10-181-1/+1
| * | | | | | | | Small fixes in some editor dialogsFranklin Sobrinho2015-10-186-79/+65
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2631 from firefly2442/duplicate-conditional-fixJuan Linietsky2015-11-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | duplicate conditional checkfirefly24422015-10-181-1/+1
| |/ / / / / / /