summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-19Fixes Visual Studio compile error due to pe_blissZuBsPaCe
Error: C2039: 'min': is not a member of 'std' Reason: #2518 introduced pe_bliss Fix: Visual Studio 2015 & 2013 need to include algorithm header before string, otherwise std:min cannot be used. See: http://stackoverflow.com/questions/17409956
2015-11-19Merge pull request #2818 from godotengine/revert-2717-light_baker_transluscentJuan Linietsky
Revert "Ignore alpha materials in baked light ray-tracer."
2015-11-19Revert "Ignore alpha materials in baked light ray-tracer."Juan Linietsky
2015-11-19Merge pull request #2292 from blackwc/can_exportJuan Linietsky
Improve export validation
2015-11-19Merge pull request #2349 from neikeq/dock_patchJuan Linietsky
Hide right UR and BR dock slots by default
2015-11-19Merge pull request #2364 from neikeq/textedit_selectJuan Linietsky
Some TextEdit selection improvements
2015-11-19Merge pull request #2444 from TheHX/issue_2117Juan Linietsky
Fix for problem when drawing CollisionPolygon when parented (#2117)
2015-11-19Merge pull request #2445 from TheHX/issue_2113Juan Linietsky
Possible fix for crash on replacing Path2D node (#2113)
2015-11-19Merge pull request #2447 from TheHX/issue_1275Juan Linietsky
Fix crash after undo when editing Polygon2D (#1275)
2015-11-19Merge pull request #2451 from PeaceSells50/FixForFilesystemAddJuan Linietsky
Fixed bug with adding an instance from the FIleSystem dialog.
2015-11-19Merge pull request #2518 from masoudbh3/godot-iconsJuan Linietsky
Add icon to exe file in windows export
2015-11-19Merge pull request #2644 from Ovnuniarchos/BBCodeDocsJuan Linietsky
BBCode is now allowed anywhere in the inline documentation.
2015-11-19Merge pull request #2696 from AlexHolly/restart-feature-on-runningJuan Linietsky
replay on play if already playing for scene and main + switch icon to…
2015-11-18Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilationJuan Linietsky
Visual studio 2015 compilation
2015-11-18Merge pull request #2786 from neikeq/node_select_menuJuan Linietsky
Added selection menu to spatial and canvas editors
2015-11-19Merge branch 'master' into BBCodeDocsOvnuniarchos
2015-11-19Added selection menu to spatial and canvas editorsneikeq
2015-11-18Merge pull request #2702 from TheHX/fix_align_with_viewJuan Linietsky
Fix 3D editor align with current view
2015-11-18Merge pull request #2706 from phobos-tro/main_memleaksJuan Linietsky
Fixing memleaks in main/main.cpp
2015-11-18Merge pull request #2707 from akien-mga/masterJuan Linietsky
Cosmetic fixes to SCons buildsystem
2015-11-18Merge pull request #2709 from eska014/fix-default-menubutton-styleboxesJuan Linietsky
Fix default StyleBoxes of MenuButton
2015-11-18Merge pull request #2711 from akien-mga/parameters-parsingJuan Linietsky
Fix arguments parsing in the main function
2015-11-18Merge pull request #2798 from bojidar-bg/patch-6Juan Linietsky
Change handling of invalid JSON escape sequences.
2015-11-18Merge pull request #2715 from SaracenOne/shader_fix_and_enhancementJuan Linietsky
Write to 4-dimensional position access and shader graph code generation fix.
2015-11-18Merge pull request #2716 from SaracenOne/animation_saving_fixJuan Linietsky
Added missing saving support to animation editor.
2015-11-18Merge pull request #2717 from SaracenOne/light_baker_transluscentJuan Linietsky
Ignore alpha materials in baked light ray-tracer.
2015-11-18Merge pull request #2718 from SaracenOne/audio_system_crash_fixJuan Linietsky
Fixed Audio System Crash
2015-11-18Merge pull request #2720 from SaracenOne/bone_attachment_fixJuan Linietsky
BoneAttachment fix.
2015-11-18Merge pull request #2721 from SaracenOne/animation_tree_player_manual_controlJuan Linietsky
Experimental retooling of AnimationTreePlayer to allow manual advancement
2015-11-18Merge pull request #2724 from ↵Juan Linietsky
SaracenOne/disable_baked_light_sampling_on_shadeless Disable baked lighting sampling on shadeless materials.
2015-11-18Merge pull request #2812 from eska014/split-anim-tracks-buttonJuan Linietsky
Split up AnimationPlayer tracks editor `Tracks` button
2015-11-18Merge pull request #2814 from masoudbh3/android-fa-localeJuan Linietsky
Android add FA(persian) locale strings
2015-11-18Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-libraryJuan Linietsky
Added tooltip for a few buttons in sample library editor
2015-11-18Merge pull request #2700 from neikeq/demo_iconsJuan Linietsky
Added project icon to some demos
2015-11-18Merge pull request #2626 from TheHX/editor_dialogsJuan Linietsky
Small fixes in some editor dialogs
2015-11-18Merge pull request #2629 from firefly2442/float-to-boolJuan Linietsky
float to bool variable type, fixes: #2478
2015-11-18Merge pull request #2631 from firefly2442/duplicate-conditional-fixJuan Linietsky
duplicate conditional check
2015-11-18Merge pull request #2632 from firefly2442/duplicate-inherited-varsJuan Linietsky
remove child variable that is duplicated from parent class
2015-11-18Merge pull request #2635 from StraToN/tabs-buttonsJuan Linietsky
Fixed bug : both tab buttons appearing hovered
2015-11-18Merge pull request #2636 from TheHX/fixed_materialJuan Linietsky
Bind missing FixedMaterial constants, fixes #2628
2015-11-18Merge pull request #2638 from MarianoGnu/masterJuan Linietsky
add missing default value
2015-11-18Merge pull request #2639 from MarianoGnu/originJuan Linietsky
Fix ButtonGroup broken layout
2015-11-18Merge pull request #2640 from firefly2442/settings-xml-missing-projJuan Linietsky
projects in the editor_settings.xml that are no longer found on disk will be removed
2015-11-18Merge pull request #2642 from leezh/nrex-updateJuan Linietsky
Updated nrex with new features
2015-11-18Merge pull request #2652 from firefly2442/fix-iconsJuan Linietsky
Fix icons (default location and in demos)
2015-11-18Merge pull request #2661 from romulox-x/lowMem2DJuan Linietsky
Added low_memory_2d_mode
2015-11-18Added tooltip for a few buttons in sample library editorTybobobo
2015-11-19Android add FA(persian) locale stringsmasoud bh
2015-11-18Merge pull request #2672 from Brickcaster/patch-1Juan Linietsky
Fix for world_to_map() with negative coords. Fixes issue #2665
2015-11-18Merge pull request #2676 from neikeq/inspector_history_tooltipJuan Linietsky
Tooltip for the Inspector's history button