aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Fixes Visual Studio 2015 linker error (___iob_func)ZuBsPaCe2015-10-301-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 #2706 from phobos-tro/main_memleaksJuan Linietsky2015-11-181-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing memleaks in main/main.cppPhobos Tro2015-10-301-2/+3
* | | | | | | | | | Merge pull request #2707 from akien-mga/masterJuan Linietsky2015-11-1865-159/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cosmetic fixes to SCons buildsystemRémi Verschelde2015-11-0165-159/+46
* | | | | | | | | | | Merge pull request #2709 from eska014/fix-default-menubutton-styleboxesJuan Linietsky2015-11-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add default focus StyleBox to MenuButtoneska2015-11-011-0/+1
* | | | | | | | | | | | Merge pull request #2711 from akien-mga/parameters-parsingJuan Linietsky2015-11-181-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix arguments parsing in the main functionRémi Verschelde2015-11-011-14/+20
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky2015-11-181-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change handling of invalid JSON escape sequences.Bojidar Marinov2015-11-161-6/+6
* | | | | | | | | | | | | Merge pull request #2715 from SaracenOne/shader_fix_and_enhancementJuan Linietsky2015-11-185-114/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added ability to write directly to 4-dimensional position vector from within ...Saracen2015-11-025-114/+143
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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 #2718 from SaracenOne/audio_system_crash_fixJuan Linietsky2015-11-186-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Moved deleting sample player in OS finalize methods to before deleting audio ...Saracen2015-11-026-6/+12
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2720 from SaracenOne/bone_attachment_fixJuan Linietsky2015-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BoneAttachment fix.Saracen2015-11-021-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2721 from SaracenOne/animation_tree_player_manual_controlJuan Linietsky2015-11-182-10/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Experimental retooling of AnimationTreePlayer to allow manual advancement.Saracen2015-11-022-10/+105
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #2724 from SaracenOne/disable_baked_light_sampling_on_shad...Juan Linietsky2015-11-181-46/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Disable baked lighting sampling on shadeless materials.Saracen2015-11-021-46/+50
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | 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 #2814 from masoudbh3/android-fa-localeJuan Linietsky2015-11-181-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Android add FA(persian) locale stringsmasoud bh2015-11-191-0/+16
* | | | | | | | | | | | | | | 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 #2700 from neikeq/demo_iconsJuan Linietsky2015-11-1831-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added some demo iconsneikeq2015-10-2931-0/+15
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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 #2629 from firefly2442/float-to-boolJuan Linietsky2015-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | float to bool variable type, fixes: #2478firefly24422015-10-181-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #2631 from firefly2442/duplicate-conditional-fixJuan Linietsky2015-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | duplicate conditional checkfirefly24422015-10-181-1/+1
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #2632 from firefly2442/duplicate-inherited-varsJuan Linietsky2015-11-182-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | remove child variable that is duplicated from parent classfirefly24422015-10-182-5/+0
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #2635 from StraToN/tabs-buttonsJuan Linietsky2015-11-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed minor bug : quicklty pointing alternatively Script button and Close but...Julian Murgia - StraToN2015-10-191-0/+2
* | | | | | | | | | | | | | | | | | Merge pull request #2636 from TheHX/fixed_materialJuan Linietsky2015-11-181-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \