neikeq
|
f84dc8e59d
|
Added selection menu to spatial and canvas editors
|
2015-11-19 00:19:00 +01:00 |
Saracen
|
dd00452997
|
Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
Conflicts:
drivers/gles2/shader_compiler_gles2.cpp
|
2015-11-18 23:18:10 +00:00 |
Juan Linietsky
|
94fdd01241
|
Merge pull request #2702 from TheHX/fix_align_with_view
Fix 3D editor align with current view
|
2015-11-18 19:58:52 -03:00 |
|
Juan Linietsky
|
fe9f4eda9e
|
Merge pull request #2706 from phobos-tro/main_memleaks
Fixing memleaks in main/main.cpp
|
2015-11-18 19:43:45 -03:00 |
|
Juan Linietsky
|
0c3386b2ed
|
Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
|
2015-11-18 19:43:28 -03:00 |
|
Juan Linietsky
|
3337191d5a
|
Merge pull request #2709 from eska014/fix-default-menubutton-styleboxes
Fix default StyleBoxes of MenuButton
|
2015-11-18 19:43:02 -03:00 |
|
Juan Linietsky
|
1a473e42d5
|
Merge pull request #2711 from akien-mga/parameters-parsing
Fix arguments parsing in the main function
|
2015-11-18 19:42:44 -03:00 |
|
Juan Linietsky
|
63e84e1824
|
Merge pull request #2798 from bojidar-bg/patch-6
Change handling of invalid JSON escape sequences.
|
2015-11-18 19:41:46 -03:00 |
|
Juan Linietsky
|
f0aeb036d1
|
Merge pull request #2715 from SaracenOne/shader_fix_and_enhancement
Write to 4-dimensional position access and shader graph code generation fix.
|
2015-11-18 19:36:47 -03:00 |
|
Juan Linietsky
|
fce4c6eecb
|
Merge pull request #2716 from SaracenOne/animation_saving_fix
Added missing saving support to animation editor.
|
2015-11-18 19:35:57 -03:00 |
|
Juan Linietsky
|
ba9ebe6b03
|
Merge pull request #2717 from SaracenOne/light_baker_transluscent
Ignore alpha materials in baked light ray-tracer.
|
2015-11-18 19:35:42 -03:00 |
|
Juan Linietsky
|
067c96d26f
|
Merge pull request #2718 from SaracenOne/audio_system_crash_fix
Fixed Audio System Crash
|
2015-11-18 19:35:22 -03:00 |
|
Juan Linietsky
|
734e3751c6
|
Merge pull request #2720 from SaracenOne/bone_attachment_fix
BoneAttachment fix.
|
2015-11-18 19:33:28 -03:00 |
|
Juan Linietsky
|
6de941f21c
|
Merge pull request #2721 from SaracenOne/animation_tree_player_manual_control
Experimental retooling of AnimationTreePlayer to allow manual advancement
|
2015-11-18 19:32:37 -03:00 |
|
Juan Linietsky
|
0fd3e18818
|
Merge pull request #2724 from SaracenOne/disable_baked_light_sampling_on_shadeless
Disable baked lighting sampling on shadeless materials.
|
2015-11-18 19:31:18 -03:00 |
|
Juan Linietsky
|
18ab04c102
|
Merge pull request #2812 from eska014/split-anim-tracks-button
Split up AnimationPlayer tracks editor `Tracks` button
|
2015-11-18 19:25:16 -03:00 |
|
Juan Linietsky
|
5fb95859e1
|
Merge pull request #2814 from masoudbh3/android-fa-locale
Android add FA(persian) locale strings
|
2015-11-18 19:21:54 -03:00 |
|
Juan Linietsky
|
3b2c25e77d
|
Merge pull request #2815 from akien-mga/pr-tooltip-buttons-sample-library
Added tooltip for a few buttons in sample library editor
|
2015-11-18 19:21:29 -03:00 |
|
Juan Linietsky
|
f5af623cd4
|
Merge pull request #2700 from neikeq/demo_icons
Added project icon to some demos
|
2015-11-18 19:20:21 -03:00 |
|
Juan Linietsky
|
551925475b
|
Merge pull request #2626 from TheHX/editor_dialogs
Small fixes in some editor dialogs
|
2015-11-18 19:17:55 -03:00 |
|
Juan Linietsky
|
e82afd9c50
|
Merge pull request #2629 from firefly2442/float-to-bool
float to bool variable type, fixes: #2478
|
2015-11-18 19:17:29 -03:00 |
|
Juan Linietsky
|
536daca8f6
|
Merge pull request #2631 from firefly2442/duplicate-conditional-fix
duplicate conditional check
|
2015-11-18 19:17:01 -03:00 |
|
Juan Linietsky
|
e8435cc721
|
Merge pull request #2632 from firefly2442/duplicate-inherited-vars
remove child variable that is duplicated from parent class
|
2015-11-18 19:16:35 -03:00 |
|
Juan Linietsky
|
75922c57d6
|
Merge pull request #2635 from StraToN/tabs-buttons
Fixed bug : both tab buttons appearing hovered
|
2015-11-18 19:15:13 -03:00 |
|
Juan Linietsky
|
326781f4c9
|
Merge pull request #2636 from TheHX/fixed_material
Bind missing FixedMaterial constants, fixes #2628
|
2015-11-18 19:14:48 -03:00 |
|
Juan Linietsky
|
762a76630c
|
Merge pull request #2638 from MarianoGnu/master
add missing default value
|
2015-11-18 19:14:37 -03:00 |
|
Juan Linietsky
|
a8f18e1bae
|
Merge pull request #2639 from MarianoGnu/origin
Fix ButtonGroup broken layout
|
2015-11-18 19:14:25 -03:00 |
|
Juan Linietsky
|
cba634c608
|
Merge pull request #2640 from firefly2442/settings-xml-missing-proj
projects in the editor_settings.xml that are no longer found on disk will be removed
|
2015-11-18 19:14:12 -03:00 |
|
Juan Linietsky
|
474822b6db
|
Merge pull request #2642 from leezh/nrex-update
Updated nrex with new features
|
2015-11-18 19:13:57 -03:00 |
|
Juan Linietsky
|
6aa95e77f3
|
Merge pull request #2652 from firefly2442/fix-icons
Fix icons (default location and in demos)
|
2015-11-18 19:13:05 -03:00 |
|
Juan Linietsky
|
1ceefd4759
|
Merge pull request #2661 from romulox-x/lowMem2D
Added low_memory_2d_mode
|
2015-11-18 19:12:34 -03:00 |
Tybobobo
|
c1c2fef23e
|
Added tooltip for a few buttons in sample library editor
|
2015-11-18 23:12:23 +01:00 |
masoud bh
|
f2704eb162
|
Android add FA(persian) locale strings
|
2015-11-19 01:40:29 +03:30 |
|
Juan Linietsky
|
d38fd747ab
|
Merge pull request #2672 from Brickcaster/patch-1
Fix for world_to_map() with negative coords. Fixes issue #2665
|
2015-11-18 19:07:53 -03:00 |
|
Juan Linietsky
|
5db5255260
|
Merge pull request #2676 from neikeq/inspector_history_tooltip
Tooltip for the Inspector's history button
|
2015-11-18 19:04:16 -03:00 |
|
Juan Linietsky
|
3c1fdedc9d
|
Merge pull request #2679 from eska014/set-all-tileset-shapes
Add all collision shapes to a tile when converting scenes to TileSets
|
2015-11-18 19:03:59 -03:00 |
|
Juan Linietsky
|
34a558ee8d
|
Merge pull request #2691 from volzhs/android_payment
improve android payments
|
2015-11-18 19:02:40 -03:00 |
|
Juan Linietsky
|
f1156b7c48
|
Merge pull request #2693 from TheHX/memory_leak
Fix small memory leak
|
2015-11-18 19:02:05 -03:00 |
|
Juan Linietsky
|
c0170d3891
|
Merge pull request #2695 from eska014/add-default-angular-damp
Set World2D default angular damp per global `physics_2d/default_angular_damp`
|
2015-11-18 19:01:49 -03:00 |
|
Juan Linietsky
|
b0d3c27d31
|
Merge pull request #2725 from SaracenOne/line_edit_alignment
nice!
|
2015-11-18 19:01:04 -03:00 |
|
Juan Linietsky
|
7f5eb40c19
|
Merge pull request #2726 from SaracenOne/set_loop_restart_time_fix
Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis
|
2015-11-18 19:00:38 -03:00 |
|
Juan Linietsky
|
8bbde9e6cc
|
Merge pull request #2730 from TheHX/fix_exp_property
Fix Range exp_edit property
|
2015-11-18 19:00:19 -03:00 |
|
Juan Linietsky
|
ee944e0da2
|
Merge pull request #2734 from neikeq/popupmenu_imp
Small PopupMenu behaviour changes
|
2015-11-18 18:59:56 -03:00 |
|
Juan Linietsky
|
b4f88eb4b6
|
Merge pull request #2735 from TheHX/fix_tree_checkbox
Fix Tree checkbox check/uncheck behavior
|
2015-11-18 18:59:02 -03:00 |
|
Juan Linietsky
|
f738906519
|
Merge pull request #2737 from akien-mga/type-specific-error-output
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
|
2015-11-18 18:58:22 -03:00 |
|
Juan Linietsky
|
ef6fab88be
|
Merge pull request #2747 from MarianoGnu/line_edit
Add <Select All>(Ctrl+A) shortcut to LineEdit. Fixes #1094
|
2015-11-18 18:55:59 -03:00 |
|
Juan Linietsky
|
9827c3cd26
|
Merge pull request #2748 from vnen/fix-2744
Fix Opus driver build for VS2010 and VS2012
|
2015-11-18 18:55:19 -03:00 |
eska
|
7f5cb7512d
|
Split up AnimationPlayer tracks editor `Tracks` button
|
2015-11-18 22:55:05 +01:00 |
|
Juan Linietsky
|
5dcfdb3435
|
Merge pull request #2749 from TheHX/fix_string_content_test
Fix String content test
|
2015-11-18 18:55:01 -03:00 |
|
Juan Linietsky
|
e84fa04141
|
Merge pull request #2764 from guilhermefelipecgs/fix_camera2d_set_zoom
Fix for smoothing camera2D when you change zoom.
|
2015-11-18 18:44:50 -03:00 |