Commit graph

834 commits

Author SHA1 Message Date
Rémi Verschelde
d4993b74fc Add missing argument names in GDScript bindings
All classes were reviewed apart from VisualServer for which no argument name is documented at all.
While doing this review, I found quite a few bugs that were fixed either in earlier commits or this one (mostly documentation bugs though, i.e. some arguments were listed at the wrong place).
2015-12-28 02:13:05 +01:00
Rémi Verschelde
fe46b2ac0c Fix wrong getters in ShaderGraph 2015-12-28 01:42:22 +01:00
Rémi Verschelde
9fddc69769 Style fix for rounded_values methods in Range 2015-12-28 00:12:13 +01:00
Juan Linietsky
4dba503fc3 Merge pull request #3140 from neikeq/fix_refresh_icon
Add reload icon to FileDialog's default theme
2015-12-26 15:37:00 -03:00
Ariel Manzur
6387a8e01f fixes crash/deadlock when video is paused and unpaused, might affect audio sync tho 2015-12-26 15:39:49 -03:00
reduz
ddd66c8904 small optimization improvement to rich text label tables 2015-12-26 15:18:01 -03:00
Ignacio Etcheverry
84c5585afe Added reload icon to FileDialog's default theme 2015-12-26 19:15:22 +01:00
MarianoGNU
df5c92c66e Fix RGBA Uniform autogeneration in ShaderGraph (fixes #2606) 2015-12-26 10:44:54 -03:00
reduz
9d9520f227 Merge branch 'master' of https://github.com/okamstudio/godot 2015-12-26 10:27:04 -03:00
reduz
13964f59c1 -Added table support to RichTextLabel
-Made help more readable, closes #2851
2015-12-26 10:25:17 -03:00
Juan Linietsky
acc9db1695 Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners
New and corrected area override modes.
2015-12-22 10:57:39 -03:00
Juan Linietsky
9bf7adfc1f -another approach to solving the deadlock problem :| 2015-12-21 10:51:27 -03:00
Juan Linietsky
49a19f85b8 -different attempt to avod deadlock problem 2015-12-21 10:25:46 -03:00
Juan Linietsky
81f62fb78c -Fix to progress dialog, speding it up
-Fix potential deadlock in stream player
-Fix collada to support broken files from ColladaMaya
2015-12-21 09:05:49 -03:00
Juan Linietsky
f65eb470ae -fix function calls in animationtree, closes #2789 2015-12-16 08:34:57 -03:00
Juan Linietsky
a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Juan Linietsky
035bb03331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-15 09:19:00 -03:00
Juan Linietsky
b12a2f456c -fixes to theora video ending sooner than expected, fixes #3066 2015-12-15 09:17:32 -03:00
Rémi Verschelde
566f8da3cc Merge pull request #3036 from slapin/animation-tree-player
Fix non-looping animations not being reset properly in AnimationTreePlayer
2015-12-14 20:02:01 +01:00
Juan Linietsky
83e0e97214 -implement arrows on tabs, when too many tabs are present, fixes #2806 2015-12-14 10:24:28 -03:00
Juan Linietsky
1312df7fdc implement point cloud function using convex hull for ConvexPolygonShape2D, fixes #2848 2015-12-14 09:06:53 -03:00
Juan Linietsky
f2183a5e09 replaced :var by :Variant in documentation, fixes #2897 2015-12-14 08:28:01 -03:00
Ovnuniarchos
89efebbf56 New and corrected are override modes. 2015-12-14 02:56:49 +01:00
Juan Linietsky
7f96f0603e -scenes are properly reloaded when a dependency changes, fixes #2896
(it's clevery done so local changes to scenes are kept even if unsaved)
2015-12-13 20:39:01 -03:00
Rémi Verschelde
4018ea63c7 Merge pull request #3050 from eska014/fix-tree-cell-slider
Fix editor for TreeItem cells in range mode
2015-12-13 10:10:33 +01:00
Rémi Verschelde
75e88b8b9e Merge pull request #3049 from eska014/fix-exp-slider
Fix setting Sliders in exponential mode
2015-12-13 10:10:25 +01:00
Juan Linietsky
709de124c1 ability to export scene to zip 2015-12-13 01:08:36 -03:00
Juan Linietsky
11eaf019b3 ability to get video player texture 2015-12-12 20:05:26 -03:00
Juan Linietsky
97fe073f33 Merge pull request #2933 from TheHX/pr-shader-loader
Fix shader loading, making possible load .shd and .sgp from editor
2015-12-12 17:36:52 -03:00
Juan Linietsky
101049518a -force exporting of original script exported variables on overriden scripts
-this works around the problem of scripts being reloaded and their properties lost
-fixes #2958
2015-12-12 16:46:25 -03:00
Juan Linietsky
890b462ffb added rotation and scale support to gui controls 2015-12-12 13:54:26 -03:00
Juan Linietsky
ec8f0d7eb9 ability to set occluder mask in tilemap, fixes #3025 2015-12-12 10:45:31 -03:00
Juan Linietsky
e2e6f3ec00 added proper functions to ColorRamp, fixes #3034 2015-12-12 09:45:17 -03:00
Juan Linietsky
29ea399234 -make smoothing respect camera limits, fixes #3037 2015-12-12 09:26:13 -03:00
Juan Linietsky
9a7ff65751 make popup emit index when id is not defined 2015-12-12 09:07:43 -03:00
Juan Linietsky
9251298f46 -collision debug is shown above all else, fixes #2985 2015-12-12 08:11:36 -03:00
Juan Linietsky
990690f9f5 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-11 09:38:41 -03:00
Juan Linietsky
46497c4508 added fallbacks proprty to fonts 2015-12-10 23:02:40 -03:00
eska
a028840ea5 Fix editing TreeItem cells in range mode
- Show slider when editing range mode tree cells per mouse input
- Hide slider after using keyboard controls to edit range mode tree cells
2015-12-10 23:53:19 +01:00
eska
5b03af6b73 Fix exponential sliders 2015-12-10 23:48:03 +01:00
Rémi Verschelde
3b68f0d051 Merge pull request #2306 from dbsGen/patch-1
Fixed the mouse position for control when it is in a canvas_layer.
2015-12-10 17:06:27 +01:00
Rémi Verschelde
5f3c87691e Merge pull request #3019 from neikeq/spinbox_timer
Spinbox update range on mouse held
2015-12-10 15:48:23 +01:00
neikeq
d4051e6eb9 Spinbox: increase/decrease with mouse held 2015-12-10 15:44:16 +01:00
Sergey Lapin
8eff61ca87 This fixes long standing animation bug
When AnimationTreePlayer switches to new animation it never
seeks it to 0 which leads to problems with non-looping animations being
played just once.

This patch is direct approach fixing this problem.
It handles most common cases of occurance.

Closes #2199
2015-12-10 16:39:57 +03:00
Rémi Verschelde
8a94297105 Merge pull request #3029 from neikeq/textedit_select_imp
TextEdit: Scroll while selecting with mouse idle
2015-12-10 11:36:30 +01:00
neikeq
5f739a2660 TextEdit: Scroll while selecting with mouse idle 2015-12-09 19:56:47 +01:00
Franklin Sobrinho
afb41b283c Fix tscn format not being recongnized by EditorFileSystem 2015-12-09 13:56:14 -03:00
Juan Linietsky
428984ec0c -New mask mode for lights, makes using masks MUCH easier. 2015-12-08 20:25:08 -03:00
Juan Linietsky
c650d4e19c Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 17:48:03 -03:00
Juan Linietsky
09ff457185 made the exclusion of nodes from joints optional, fixes #3015 2015-12-08 17:47:12 -03:00
Juan Linietsky
ff936c6b2e Merge pull request #2868 from akien-mga/pr-fix-can-move-to
Fix can_move_to and rename it for more clarity
2015-12-08 17:09:47 -03:00
Juan Linietsky
b6d6c2220f Merge pull request #2922 from romulox-x/set_hidden
Added set_hidden method to Spatial and CanvasItem
2015-12-08 17:06:45 -03:00
Juan Linietsky
ecad3a285f better unique name resolution, as suggested i #3017 2015-12-08 11:33:30 -03:00
Juan Linietsky
9637460331 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-08 11:23:23 -03:00
Juan Linietsky
3c33b705d1 added option to add_child, to use the same deduplication convention as in the editor, closes #3017 2015-12-08 11:21:12 -03:00
Rémi Verschelde
2cc60386d8 Merge pull request #3005 from TheHX/pr-file-dialog
Better hidden folders display preferences for editor file dialogs
2015-12-07 20:40:58 +01:00
Rémi Verschelde
c667bde183 Merge pull request #3007 from neikeq/fix_line_edit
Fix LineEdit cursor
2015-12-07 20:39:43 +01:00
neikeq
f499fb6fcf Fix LineEdit cursor 2015-12-07 20:31:21 +01:00
Franklin Sobrinho
42eef3cdc6 Better hidden folders display preferences for editor file dialogs 2015-12-06 19:35:31 -03:00
Juan Linietsky
3ecc9e07b7 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-05 14:19:19 -03:00
Juan Linietsky
200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
neikeq
71eaa2d547 Add refresh button to file dialogs 2015-12-04 19:33:30 +01:00
Juan Linietsky
35fa048af5 missing pngs 2015-12-04 10:22:45 -03:00
Rémi Verschelde
68d3438a93 Merge pull request #2975 from neikeq/help_scroll_top
Fix help view not scrolling to the top
2015-12-02 16:16:18 +01:00
Juan Linietsky
064fd762fa Merge branch 'master' of https://github.com/godotengine/godot 2015-12-02 11:17:01 -03:00
Juan Linietsky
4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -03:00
neikeq
11b560d6d4 Fix help view not scrolling to the top 2015-12-02 14:01:46 +01:00
Fabio Alessandrelli
3eba84e1d7 Properly update node after clearing shapes in _update_shapes_from_children()
(fix bug causing eg. CircleShape2D.set_radius to generate multiple shapes)
2015-12-02 11:30:48 +01:00
neikeq
c5698fc28e Fix RichTextLabel copy never called 2015-12-02 08:19:33 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
Juan Linietsky
68aaa0f813 Merge branch 'master' of https://github.com/godotengine/godot 2015-11-28 20:57:23 -03:00
Juan Linietsky
7aa39b7cae -Fixed bug with scene inheritance, should work again
-Proper .tscn and .tres parsing, should work, please test well!
2015-11-28 20:56:14 -03:00
Franklin Sobrinho
43e1b879d0 Add container automatic update when moving a child node 2015-11-28 13:05:39 -03:00
Franklin Sobrinho
1138103c63 Fix shader loading, making possible load .shd and .sgp from editor 2015-11-27 21:11:20 -03:00
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
romulox_x
0b4830f3be Added set_hidden method to Spatial and CanvasItem 2015-11-26 13:44:06 -08:00
Juan Linietsky
b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Juan Linietsky
082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	main/main.cpp
2015-11-24 10:52:41 -03:00
Juan Linietsky
ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
2015-11-24 10:42:05 -03:00
Rémi Verschelde
2fbc1445a5 Merge pull request #2870 from neikeq/submenu_pos_fix
Popup submenu position enhancement
2015-11-23 11:53:30 +01:00
Rémi Verschelde
aa30e01f26 Merge pull request #2752 from SaracenOne/shadow_color
New shader feature: change the colour of shadows on a per-material basis
2015-11-23 11:40:52 +01:00
neikeq
9797b6374b Popup submenu position enhancement 2015-11-22 15:53:22 +01:00
Rémi Verschelde
f33d9dab5b Fix can_move_to and rename it for more clarity
Fixes #2416.
The KinematicBody::can_move_to function was likely designed for two behaviours:
 - discrete: check if the body can "teleport" to the destination
 - continuous: check if the direct path to the destination is valid
The continuous behaviour was however not implemented, and the discrete behaviour was broken too due to a wrong call to intersect_shape.

The discrete behaviour has thus been fixed and the function renamed to can_teleport_to for more clarity.
2015-11-22 14:14:07 +01:00
Franklin Sobrinho
5ef23812ac Add more properties to AcceptDialog 2015-11-20 18:25:01 -03:00
Juan Linietsky
fd5ee87c24 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/export/export.h
2015-11-19 10:44:13 -03:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Franklin Sobrinho
bc3b5847b0 Fix SplitContainer bool properties 2015-11-19 09:56:04 -03:00
Juan Linietsky
b6084a8a62 Merge pull request #2364 from neikeq/textedit_select
Some TextEdit selection improvements
2015-11-19 00:30:39 -03: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
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
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
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
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
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
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
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
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
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
Juan Linietsky
f2b43e3ec0 Merge pull request #2769 from TheHX/text_edit_improvements
Implement Ctrl + backspace/delete to delete words
2015-11-18 18:42:37 -03:00
Juan Linietsky
0bbe1e1657 Merge pull request #2779 from bojidar-bg/patch-5
Change popup_menu.cpp to deselect on .clear
2015-11-18 18:36:39 -03:00
Ovnuniarchos
0b05739a8b *Polygon2D now updates on any modification in its point array. ShapeLine2D has now an editor. 2015-11-18 19:20:50 +01:00
Juan Linietsky
b08312b30c -Fixed default theme a little
-Added option to group help pages, fixes #2805
2015-11-18 09:20:46 -03:00
Juan Linietsky
18e014a193 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	drivers/theora/video_stream_theora.cpp
2015-11-18 04:49:28 -03:00
Juan Linietsky
3974fbb852 -fixed tabs 2015-11-18 04:47:41 -03:00
Juan Linietsky
081a236c67 -Merged Script and Help tabs
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
2015-11-17 09:46:08 -03:00
Ariel Manzur
8adc4ef65b windows crash and bind placeholder method 2015-11-14 11:14:17 -03:00
Juan Linietsky
8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -03:00
neikeq
ae65dfa4ec Small PopupMenu changes 2015-11-13 22:03:17 +01:00
Bojidar Marinov
bff8b04f52 Change popup_menu.cpp as proposed in #2011
Closes #2011
2015-11-13 12:16:55 +02:00
Franklin Sobrinho
222d112f49 Implement Ctrl + backspace/delete to delete words 2015-11-12 13:35:48 -03:00
Juan Linietsky
1d7e9c4ba5 -fixes to animatedsprite used with atlas 2015-11-11 17:39:06 -03:00
Saracen
c1d19ad258 New shader feature: change the colour of shadows on a per-material basis.
Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp
2015-11-08 03:54:55 +00:00
neikeq
b70e2b754d TextEdit: Properly scroll vertically when selecting text with mouse drag 2015-11-07 16:04:32 +01:00
MarianoGNU
7828986b1c Add <Select All>(Ctrl+A) shortcut to LineEdit. 2015-11-06 19:02:57 -03:00
Franklin Sobrinho
8d48cf95b9 Add Tree checkbox check/uncheck behavior when pressing enter 2015-11-05 12:20:45 -03:00
Franklin Sobrinho
467ee040c4 Fix Range exp_edit property 2015-11-04 15:38:02 -03:00
Juan Linietsky
dde6396f22 more fixes 2015-11-04 09:54:23 -03:00
Saracen
e3c50ac63d Aligned line edit fix. 2015-11-02 17:37:49 +00:00
Saracen
0006f035eb Added alignment to LineEdit GUI control. 2015-11-02 17:37:47 +00:00
Saracen
e011bcf162 Experimental retooling of AnimationTreePlayer to allow manual advancement. 2015-11-02 17:06:28 +00:00
Saracen
957baf48dc BoneAttachment fix. 2015-11-02 16:58:24 +00:00
Saracen
b54d96ceba Added ability to write directly to 4-dimensional position vector from within custom vertex shader code. Bugfixes to shader graph code generation concerning xforms. 2015-11-02 16:03:31 +00:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
eska
825bc8b293 Add default focus StyleBox to MenuButton 2015-11-01 10:33:28 +01:00
Juan Linietsky
281d6fac1e -some fixes to audio 2015-11-01 01:55:22 -03:00
eska
06e0eba402 Set World2D default angular damp per global physics_2d/default_angular_damp 2015-10-28 18:21:45 +01:00
Juan Linietsky
8f84f4117c -Fixed a bug in scrollcontainer not respecting expand flag
If you relied on this, make sure the children of your scrollcontainer
is set to expand with the expand flag in either vertical or horizontal axis
2015-10-25 20:08:18 -03:00
Brickcaster
4e0511a8a0 Fix for negative coords. Regarding issue #2665
int() of negative numbers rounds up. Needed to add a condition to account for negative values. Thanks to Romulox_x for providing this solution.
2015-10-24 21:47:48 -04:00
MarianoGNU
754908844a Merge branch 'master' of https://github.com/okamstudio/godot into posta 2015-10-24 11:55:00 -03:00
Juan Linietsky
b59c86f6f9 -Ability to debug video memory usage
-Small fix to xml saver (swapping > and <)
2015-10-21 09:50:44 -03:00
Juan Linietsky
f6a790d58c Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-20 23:55:08 -03:00
Juan Linietsky
d241b2ec1b -work in progress implementation of NDEE's theme It's NOT DONE YET 2015-10-20 23:54:24 -03:00
Juan Linietsky
2b12a8109d Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-19 18:48:34 -03:00
Juan Linietsky
5d86a25f4d -some fixes to where screen is read from rasterizer
-fixed bug in ogg vorbis looping
-properly flushing audiostream rb when stopping
2015-10-19 18:47:49 -03:00
MarianoGNU
6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
MarianoGNU
bf4bb3e17b Clamp filling angle instead of normalize 2015-10-19 15:26:00 -03:00
MarianoGNU
4345009a0e add missing default value 2015-10-19 12:21:19 -03:00
Franklin Sobrinho
1e36f36357 Bind missing FixedMaterial constants, fixes #2628 2015-10-19 08:03:29 -03:00
Julian Murgia - StraToN
f256e421b5 Fixed minor bug : quicklty pointing alternatively Script button and Close button on a tab showed both buttons as hovered 2015-10-19 12:26:19 +02:00
MarianoGNU
ede0cf20bb Add fill_degrees to limitate radial filling 2015-10-18 01:21:53 -03:00
MarianoGNU
4452e26253 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 23:38:33 -03:00
MarianoGNU
68fb30aaea Add fill modes. Clockwise, Counter-CW and center-offset 2015-10-17 23:37:39 -03:00
Juan Linietsky
7d8f187c33 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 15:49:27 -03:00
Juan Linietsky
85a611d1cd -fixes disability to remove instanced nodes when reopening scene. Fixes #2610 2015-10-17 15:48:42 -03:00
Juan Linietsky
1db523d0bb Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
2015-10-17 15:31:23 -03:00
MarianoGNU
25324aa506 Fix crash when using a Scalar Uniform node to GraphShader 2015-10-17 15:27:36 -03:00
Juan Linietsky
6f9631fc51 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 12:48:47 -03:00
Juan Linietsky
be0f7563fb Merge pull request #1899 from guilhermefelipecgs/fix_#1897
Fix for scroll_to_line and search functions, fix #1897
2015-10-17 12:14:07 -03:00
Juan Linietsky
88b6e04cc1 Merge pull request #2330 from FEDE0D/parallax_fix
ParallaxBackground: added option to ignore camera zoom
2015-10-17 12:05:27 -03:00
Juan Linietsky
c22b627ee3 Merge pull request #2362 from AlexHolly/update-scene-tab-fix
[UI-FIX] - Update scene tabs on save
2015-10-17 10:51:45 -03:00
Juan Linietsky
c9ff40e140 Merge pull request #2380 from StraToN/tabs-buttons
Tab close button + display policies + application on Scenes Tabs
2015-10-17 10:46:32 -03:00
Juan Linietsky
63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky
ab22203791 misc cleanup 2015-10-17 10:29:54 -03:00
Juan Linietsky
0d2b28377f Merge pull request #2455 from firefly2442/hide-menu-fix
[UI fix] Hide opened menu when click on menu button
2015-10-17 10:28:20 -03:00
Juan Linietsky
7060eaaa1b Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheck
ran cppcheck, fixed cases where array index is used before limits check
2015-10-17 10:23:15 -03:00
Juan Linietsky
f11fdb611e Merge pull request #2556 from volzhs/fix_miss_bind_findnode
fix miss bind for Node::find_node
2015-10-17 10:02:43 -03:00
Juan Linietsky
b3d34bcef4 Merge pull request #2589 from eska014/add-raycast2d-type_mask
Add type mask customization to RayCast2D
2015-10-17 09:45:52 -03:00
Juan Linietsky
426909e26b Merge pull request #2594 from Biliogadafr/PinSoftness
Expose softness parameter of pin joint to the editor.
2015-10-17 09:45:16 -03:00
MarianoGNU
a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
#	tools/editor/property_editor.cpp
2015-10-16 23:21:39 -03:00
reduz
17a90ddc08 Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	scene/resources/packed_scene.h
2015-10-16 19:13:09 -03:00
reduz
078a474135 -fixes and more fixes to new scene system, seems stable now..
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
2015-10-16 19:11:23 -03:00
Juan Linietsky
79e5ced7e6 -A little More control about pixel snapping in 2D 2015-10-13 15:53:34 -03:00
Juan Linietsky
b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/detect.py
2015-10-13 01:19:32 -03:00
Juan Linietsky
52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -03:00
firefly2442
692216b86a ran cppcheck, fixed cases where array index is used before limits check 2015-10-12 09:45:44 -05:00
Biliogadafr
2ffc90d8b4 Expose softness parameter of pin joint to the editor. 2015-10-10 23:28:05 +03:00
reduz
6b20ee4324 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-10 09:09:59 -03:00
reduz
422929e87f Large improvements on scene packing and management
-Ability to edit and keep changes of instanced scenes and sub-scenes
-Ability to inherit from other scenes
2015-10-10 09:09:09 -03:00
eska
793c53122a Add type mask property to RayCast2D 2015-10-10 05:46:47 +02:00
Ariel Manzur
c2532bffb3 Please enter the commit message for your changes. Lines starting
removed locks
2015-10-08 12:59:12 -03:00
volzhs
1630f0ad35 fix miss bind for Node::find_node 2015-09-30 21:55:31 +09:00
Juan Linietsky
8154dff3d0 Merge pull request #2528 from MarianoGnu/sprite-edit
SpriteRegionEditor
2015-09-28 09:32:42 -03:00
MarianoGNU
3e6aaec193 Add SpriteRegionEditor and update Polygon2DUVEditor
Both with snap and grid support
2015-09-28 00:06:06 -03:00
Rémi Verschelde
2caf1548a5 Fix return type of get_reverb_room 2015-09-26 23:58:11 +02:00
Rémi Verschelde
3d7740ba17 Fix default/filter/* parsing in _get
Closes #2542. The actual flaw was identified by @reduz.
Also fix a typo.
2015-09-26 21:06:12 +02:00
Rémi Verschelde
1e147c4945 Fix some copy-paste mistakes in linear/db volume functions 2015-09-26 21:06:12 +02:00
Rémi Verschelde
3bf24eeb6b Rename _voice_count to _polyphony in SamplePlayer to be consistent with SamplePlayer2D 2015-09-26 21:06:12 +02:00
Juan Linietsky
c858515785 Fixed theora playback. Removed theoraplayer.
Still need to get proper audio output latency in some platforms.
2015-09-26 14:50:42 -03:00
Juan Linietsky
d5579b1506 Merge pull request #2458 from TheHX/text_edit_hscroll
Fix HScrollBar of TextEdit
2015-09-26 08:49:47 -03:00
Juan Linietsky
10e7871091 Merge pull request #2533 from eska014/fix-visibility-notification-propagation
Fix propagation of `NOTIFICATION_VISIBILITY_CHANGED`
2015-09-26 00:59:19 -03:00
Juan Linietsky
6f0df4e80c Merge pull request #2534 from eska014/unpress-hidden-buttons
Fix BaseButtons remaining pressed when hiding while pressed down
2015-09-26 00:53:38 -03:00
eska
ce2faae2c5 Fix BaseButtons remaining pressed when hiding them while pressing them down 2015-09-26 03:06:42 +02:00
eska
b9bb2ab9c0 Fix propagation of NOTIFICATION_VISIBILITY_CHANGED 2015-09-26 02:23:19 +02:00
Rémi Verschelde
4abc7f5740 Update documentation for TileSet and Timer 2015-09-25 20:45:00 +02:00
Juan Linietsky
52eebdc001 Merge pull request #2449 from leezh/label-valign-fix
reworked Label class
2015-09-25 11:29:49 -03:00
Juan Linietsky
447c319f2c Merge pull request #2502 from vnen/fix-itemlist-typo
Fix ItemList typo in binding
2015-09-25 11:27:50 -03:00
Juan Linietsky
9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky
82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Zher Huei Lee
c38808b5b1 added alignment to BoxContainer
Allows aligning contents of VBoxContainer and HBoxcontainer without
having to insert expanding spacers.
2015-09-24 14:07:53 +01:00
George Marques
5ff0b69dae
Move the shape test to a little sooner 2015-09-22 21:30:37 -03:00
George Marques
e68f04b9d0 Check if shape is valid before referencing it
See the comment from @MartiniMoe at #2366.
2015-09-22 20:27:48 -03:00
eska
ab3b0c82c8 Add missing return so Visual Studio compiles 2015-09-22 05:59:10 +02:00