Commit Graph

428 Commits

Author SHA1 Message Date
Rémi Verschelde 525fb01fd2 Revert "Homogeinize resource formats loaders/savers"
The text format definition needs to stay in `scene/` as it relies
on other scene components, and `core/` must stay self-contained.

This reverts commits a5e27503fd
and 1492fd8460.
2016-07-19 18:15:01 +02:00
Juan Linietsky 7a4d67ae71 Property convert images to RGBA before applying hq2x, fixes #5168 2016-07-18 18:30:30 -03:00
Juan Linietsky f10bd217a2 properly fixed notificaitons for theme changed, closes #5774 2016-07-18 16:41:59 -03:00
Juan Linietsky 254d79a560 Add a function to notify font users that the font changed. Closes #5774 2016-07-18 10:00:26 -03:00
Rémi Verschelde be563a1663 Merge pull request #5757 from Razzlegames/blendIndexFix
Could not use pre multiply alpha for material in editor
2016-07-18 00:54:38 +02:00
Rémi Verschelde 3183834c5d Merge pull request #5657 from Paulb23/block_caret
Added block caret to TextEdit
2016-07-18 00:44:45 +02:00
Kyle Luce 4e69bc3bff Could not use pre multiply alpha for material in editor
- 3 was hard coded, I just changed to 4. Unfortunately this will break every time
  a blend mode is added
2016-07-17 11:09:47 -07:00
Juan Linietsky 24d86e33a6 Merge pull request #5467 from RandomShaper/enhance-tidy-extensions
Enhance/tidy file extensions management
2016-07-16 09:28:49 -03:00
Paulb23 54f720ac06 Added block caret to TextEdit 2016-07-12 16:07:17 +01:00
Paulb23 12e3bb1f01 Removed duplicate color 2016-07-11 15:40:04 +01:00
Paulb23 cc133c9289 Expose colors to theme 2016-07-11 14:57:32 +01:00
Juan Linietsky 49b288d331 Add function to get the list of samples, closes #5561 2016-07-10 13:00:42 -03:00
Rémi Verschelde 3a70d4a072 Merge pull request #5589 from akien-mga/pr-unused-var
Removing some more unused vars and dead code
2016-07-09 14:33:30 +02:00
Rémi Verschelde a15de80942 classref: Fix arg name for is_action_pressed/released
Also position TEXTURE_SPHERE constant properly.
2016-07-08 23:40:43 +02:00
Rémi Verschelde f40f360a2c Remove unused variables (fourth pass) + dead code
Also fix a potential regression from 3fcb9b1ec1.
2016-07-08 16:47:55 +02:00
Juan Linietsky b391306828 Make both signals be ordered and samplelibrary items too, fixes scenes changing for git, closes #5289 2016-06-30 18:43:47 -03:00
Pedro J. Estébanez a5e27503fd Homogeinize resource formats loaders/savers 2016-06-28 18:27:12 +02:00
Juan Linietsky 519fce94e9 Remove error when getting dependencies from tscn files in some cases, closes #3897 2016-06-28 12:35:11 -03:00
Juan Linietsky 8e1c0f287d Fixed bug in instance state ordering, closes #3904 2016-06-28 09:47:03 -03:00
Juan Linietsky efdcf205d2 Make most resources (save for packedscenes and scripts) reload if they change on disk. Closes #4059. 2016-06-27 13:17:20 -03:00
Rémi Verschelde da034f324a Revert "Added toggle for loop interpolation based on adolson's code"
This reverts commits 8884b8f519
bd5c8f2aa0
and 5cb31f6d5b.

<reduz> Akien, I understand the need for the second loop mode, but I think
the current UI is pretty confusing. I think this should be changed for an
enum, both there and in the animation.. otherwise we should revert it
[...]
<reduz> alternatively this could be added per track, which I think should
make it a little less confusing

Reopens #959..
2016-06-26 23:45:18 +02:00
Rémi Verschelde b02d67be30 Merge pull request #5307 from MarianoGnu/master
TextureRegion improvements
2016-06-26 09:43:45 +02:00
Rémi Verschelde e4c5a16a2c Merge pull request #5397 from djrm/gizmos_fix
Added high resolution icons for the Gizmos
2016-06-25 10:28:58 +02:00
Daniel J. Ramirez b8190fbef6 Added high resolution icons for the Gizmos, fixes #1638 2016-06-24 22:42:42 -05:00
Rémi Verschelde 001294ed35 Merge pull request #5386 from Paulb23/code_completion_color_theme
Exposed code completion colors to the text edit theme
2016-06-24 21:19:30 +02:00
Paulb23 b643d9af6f Exposed code completion colors to the text edit theme 2016-06-24 16:33:29 +01:00
Rémi Verschelde 0a72f9ccb8 Merge pull request #5362 from J08nY/png
libpng: New version 1.6.27
2016-06-23 07:40:03 +02:00
Juan Linietsky d6225b1e00 Improved binding system (ObjectTypeDB::bind_method) to be friendlier to statically typed languages, should help in the Mono integration.
Disabled by default.
2016-06-22 23:13:41 -03:00
J08nY 0ab05b09e4
Fixed iCCp chunk in pngs
neccesary for libpng 1.6.27 to work silently
2016-06-22 21:13:29 +02:00
Rémi Verschelde 87cb3629f2 Merge pull request #5344 from Paulb23/code_completion_colors
Code completion box colors
2016-06-22 07:51:33 +02:00
Paulb23 45f0dec55c Added code completion existing color setting 2016-06-21 17:34:38 +01:00
Paulb23 706895a922 Added code completion selected color setting 2016-06-21 17:21:55 +01:00
J08nY bd5c8f2aa0
Animation: Fix property loop_interpolation
fixes #5317
2016-06-21 14:11:26 +02:00
Juan Linietsky 6872139300 Add quotes to .tscn keys, solves #4366 2016-06-20 18:41:59 -03:00
Juan Linietsky 6bdd17f07c Fix error storing path for children of instanced nodes in .tscn, fixes #4320 fixes #4579 fixes #4580 2016-06-20 17:09:53 -03:00
MarianoGNU 79c500bee1 Modify margins with mouse input 2016-06-20 17:06:19 -03:00
Juan Linietsky 0db02f26b6 -Added options for scene import plugin to keep materials and user-added tracks to animations, please test! closes #4425 2016-06-20 00:20:30 -03:00
George Marques 5cb31f6d5b
Replace 'or'/'and' keywords
Some compilers do not like this.
2016-06-19 12:36:50 -03:00
Rémi Verschelde c7b425ed9c Merge pull request #5259 from neikeq/pr-textedit-zoom
TextEdit: Change font size with Ctrl+Mouse Wheel Up/Down
2016-06-19 13:04:20 +02:00
Rémi Verschelde 40944ddffb Merge pull request #5085 from RandomShaper/remove-unreachable-code
Remove found dead code
2016-06-19 12:45:36 +02:00
Rémi Verschelde 3520902194 Merge pull request #4724 from Cybolic/optional-loop-interpolation
Added toggle for loop interpolation based on adolson's code
2016-06-19 12:30:22 +02:00
Juan Linietsky 7c20c386c5 -Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc.
-Better interpolation of discrete tracks, fixes #4417
2016-06-19 01:43:02 -03:00
Juan Linietsky 0bbb0d0caa DynamicFontData can be built-in (will still link to a ttf though), closes #4600 2016-06-18 19:03:53 -03:00
Rémi Verschelde c3bf11d4d4 Drop fully commented-out files
Part of #5272
2016-06-18 20:23:49 +02:00
Rémi Verschelde b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Ignacio Etcheverry bc9f9b1c6a TextEdit: Change font size with Ctrl+Mouse Wheel Up/Down 2016-06-18 18:47:11 +02:00
Rémi Verschelde a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
Juan Linietsky 55b83157e7 Keep track of when fonts change, so theme or controls that use fonts as overrides get properly updated.
closes #4622 , probably closes many other issues too
2016-06-17 16:01:30 -03:00
Juan Linietsky 9f2f8c9130 fixes compilation error on visual studio, closes #5249 2016-06-17 10:34:44 -03:00
Juan Linietsky f0d9245ecf -added missing .inc files
-Made it possible to change the editor theme
-Added two options to theme editor plugin to create empty template themes and editor themes
-Make sure that saved themes to .tres keep the null theme fields, to make it easier to keep those when saving/loading the theme
2016-06-17 01:13:23 -03:00
Juan Linietsky 816b3fa94d It is now possible to set a default custom theme, whether you want a hidpi default theme, or just use a custom font for the default theme 2016-06-16 20:05:22 -03:00
UgisBrekis d97e46ffb6 Adds the ability to draw parent-children relationship lines in scene tree editor
Can be turned on/off in editor settings + line color change available as
well
2016-06-15 18:10:19 +01:00
Daniel J. Ramirez 131cd1399c Added some theme icons and its sources 2016-06-14 21:40:24 -05:00
Juan Linietsky 944c7e2603 fix crash when clearing dynamicfontdata, closes #4877 2016-06-13 22:24:11 -03:00
Juan Linietsky 28034190a9 Merge pull request #5176 from marcelofg55/master
Fixed overloaded virtual functions with const vs none warning
2016-06-13 15:45:13 -03:00
Juan Linietsky f0abda999e resolve numerical error when comparing instancing an inheritance to avoid saving changed properties when they didn't, closes 4759 2016-06-12 19:33:07 -03:00
Juan Linietsky c1056a9bfb Fixed ancient bug that prevented proper theme editing, closes #4924 2016-06-12 15:31:38 -03:00
marcelofg55 3787856563 Fixed overloaded virtual functions with const vs none warning 2016-06-12 13:31:22 -03:00
Pedro J. Estébanez 3df26825b4 Remove found dead code 2016-06-07 13:46:31 +02:00
Juan Linietsky be830d10c2 Merge pull request #5026 from Geequlim/patch9frame-extension
Enhanced Patch9Frame
2016-06-06 20:15:33 -03:00
Saracen 1dab0aab7c Bitmask import plugin 2016-06-05 19:14:39 +01:00
Geequlim 5894060abb Enhanced StyleBoxTexture:
Add texture region support for StyleBoxTexture.
  Quick region(texture region and scale region) selection for StyleBoxTexture with TextureRegionEditorPlugin.
2016-06-05 00:45:53 +08:00
Geequlim fdf914e53e Add texture region support for stylebox render 2016-06-05 00:45:53 +08:00
Rémi Verschelde a068152ba0 Physics2D: Rename default_density to default_linear_damp
Also adds a proper deprecating warning and tries to do some porting automatically.
Supersedes #4109.
2016-06-04 14:05:53 +02:00
Juan Linietsky 33bb0491f8 Merge pull request #4952 from sanikoyes/Pr-fix-stb-font-prop
fix stb font property names
2016-06-01 10:33:28 -03:00
Juan Linietsky df139f57b3 Some cleanup to GDScript
separated GDFunction (VM) from GDScript in two different files
2016-05-31 22:33:43 -03:00
sanikoyes 21bcf4a8aa fix stb font property names 2016-05-31 21:23:51 +08:00
Juan Linietsky 4d6d6fcbfc Merge remote-tracking branch 'origin/master' 2016-05-30 19:53:19 -03:00
Juan Linietsky 0eb6c644b2 changed font system to use fallbacks
this way more than 64k characters can be used
2016-05-30 19:41:32 -03:00
Juan Linietsky 9b1f8230ec -Some fixes to OSX retina scaling for window functions
-Implemented HiDPI detection and support for Godot Editor!
2016-05-30 00:28:29 -03:00
Juan Linietsky 3e8eb396d7 Finalized DynamicFont implementation
-DynamicFont uses Freetype by default
-Editor fonts are now scalable thanks to this
-Cleaned up documentation browser and added fonts for this
2016-05-29 11:37:52 -03:00
Juan Linietsky 8be2fabbe5 Changed import workflow
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
2016-05-27 14:19:11 -03:00
Paulb23 6dd538a7ae Fixed caret color not changing though properties 2016-05-24 15:21:34 +01:00
Hubert Jarosz 33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
Christian Dannie Storgaard 8884b8f519 Added toggle for loop interpolation based on adolson's code 2016-05-20 13:13:32 +03:00
Juan Linietsky c195c0df6b -Added configuration warning system for nodes
-Added a new "add" and "instance" buttons for scene tree
-Added a vformat() function to ease translation work
2016-05-17 18:28:44 -03:00
Juan Linietsky da7a9aae27 Merge pull request #4096 from neikeq/pr-margin-cont-imp
MarginContainer improvements
2016-05-13 13:13:12 -03:00
Juan Linietsky d7318f6965 -begun implementing drag & drop editor wide
-filesystem dock dnd support
-property list dnd support
-scene tree dnd support
2016-05-11 11:59:03 -03:00
Rémi Verschelde 99e31e1005 Merge pull request #4547 from neikeq/pr-wrong-debug-methods
Fix wrong return and argument types in documentation
2016-05-05 09:27:14 +02:00
Ignacio Etcheverry 1e752c0120 Fix wrong return and argument types in documentation 2016-05-04 15:35:09 +02:00
sanikoyes c824781e98 Fix crash in dynamic font 2016-05-03 17:25:33 +08:00
Juan Linietsky 5bb7cef836 Support for dynamic fonts (TTF)
Added support for DynamicFont, which can load a TTF of any size to use
as a font. No import required.
2016-05-01 23:13:06 -03:00
Juan Linietsky 0fa588a830 move Font to BitmapFont
so we can add DynamicFont later..
2016-04-28 22:21:36 -03:00
Aren Villanueva d75856146c Adds a remove class item option in the theme editor.
I've also added a get_stylebox_types helper function to the theme class in order to figure out exactly what types are available to a theme.
2016-04-21 11:58:53 +10:00
Rémi Verschelde c0ec7e933a Merge pull request #4302 from Anarchid/gridmap-navmesh
Navmesh support for GridMaps
2016-04-20 21:12:35 +02:00
Anarchid 73ca831848 Implement GridMap support for navigation meshes 2016-04-20 21:19:05 +03:00
Bojidar Marinov 325a02e4af Add a add_triangle_fan method to SurfaceTool
Closes #4298
2016-04-18 20:33:54 +03:00
Hearto Lazor 08b93da28a Fixed curve baking, now always start at origin point 2016-04-15 00:13:17 -03:00
Ignacio Etcheverry d38454b967 MarginContainer: Add top, right and bottom margins 2016-03-21 00:53:47 +01:00
Rémi Verschelde aec4f57f95 Merge pull request #3528 from SaracenOne/baked_light_realtime_colourize
Ability to colourize baked lighting in real time.
2016-03-15 10:22:09 +01:00
Franklin Sobrinho 5ee67ba498 Automatically create input node when creating a ShaderGraph 2016-03-14 15:24:12 -03:00
Juan Linietsky 8b1dcbfe4d -Made editor support SSL certs by default (embedded them)
-Made asset sharing support https
-Many fixes to HTTPRequest
-Added an asset installer dialog
-Visual cleanups to asset sharing tab
-Fixed some issues in ScrollContainer, hope it does not break things
-Asset sharing tab is not visible (hidden on purpose) for now.
2016-03-12 10:46:38 -03:00
Hubert Jarosz 4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Juan Linietsky 5a9b18b665 -Work on addon editor plugin (disabled by default)
-New HTTPRequest node, to make HTTP requests simpler.
2016-03-04 11:10:48 -03:00
eska 104e008b56 Fix missing dependency resolver in Windows 2016-02-21 22:51:19 +01:00
Juan Linietsky b91b89cf60 Add support for placeholders in tscn, which was missing. Closes #3652 2016-02-21 11:18:31 -03:00
Juan Linietsky 61f03c98c8 -Added missing functions to the doc, fixes #3583 2016-02-09 16:58:03 -03:00
Juan Linietsky 595de75641 -Allow renaming root node of inherited scene 2016-02-09 16:30:50 -03:00
Juan Linietsky 34c022a0a2 -Cleaned up GraphEdit, also fixes #3568 2016-02-08 16:28:12 -03:00
Juan Linietsky 9109e41a20 Property handle rotated controls in 2D editor, fixes #3613 2016-02-08 11:29:32 -03:00
Saracen de5281c398 Ability to colourize baked lighting in real time. 2016-02-06 18:03:20 +00:00
Juan Linietsky 857edbea1c -make animationplayer thinner, also toolbuttons too. fixes #3526 2016-02-02 18:22:37 -03:00
Juan Linietsky 8341038bbe -Increment resources total in scene format text, fixes #3506 2016-01-29 08:51:51 -03:00
Rémi Verschelde 6ceb1c3a9f Merge pull request #3440 from TheHX/issue-2946
Fixed small inconsistencies with the text format
2016-01-25 10:58:50 +01:00
Juan Linietsky 75537c661f Merge pull request #3434 from TheHX/pr-tscn-dependency
Fix .tscn not raising dependency error
2016-01-24 20:07:23 -03:00
Franklin Sobrinho 1cfe20562d Fix .tscn not raising dependency error 2016-01-24 19:05:32 -03:00
Franklin Sobrinho 41ae83e415 Fixed small inconsistencies with the text format 2016-01-24 18:38:37 -03:00
Franklin Sobrinho 2493cb1e26 Fix .tscn format not loading groups 2016-01-24 10:32:46 -03:00
Juan Linietsky a74138a0dc -Some changes to how scenes and scripts are overriden in scene instance and inheritance
-Fixes #3127 and also properly fixes #2958
2016-01-23 21:42:15 -03:00
Juan Linietsky 0c6ffcf7b0 -Added ability to remap dependencies in tscn (forgot to do it..), fixes #3368 2016-01-23 14:09:55 -03:00
Juan Linietsky d59733bd67 -Ability to retrieve state data from PackedScene, closes #3413 2016-01-23 12:01:42 -03:00
MarianoGNU ad2387f0be Add presets.
Also fix some bugs.

Fix a crash and a minor bug
2016-01-15 17:23:19 -03:00
MarianoGNU 1f3d6824c8 Move shaders to default theme and add shader_override related methods to Control class 2016-01-15 17:23:19 -03:00
MarianoGNU dc7755ffcd Add a visual editor to color picker. 2016-01-15 17:23:19 -03:00
Juan Linietsky 4248c84e20 -Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201 2016-01-14 11:06:20 -03:00
Juan Linietsky f2ae6f87a4 Fix situation where TSCN format might crash, closes #3062 2016-01-12 07:07:36 -03:00
Rémi Verschelde c8849c0b79 Merge pull request #3136 from MarianoGnu/bug_fixing
Fix RGBA Uniform autogeneration in ShaderGraph
2016-01-06 21:10:48 +01:00
Franklin Sobrinho 69240aa243 Fix .tscn format not loading signal binds 2016-01-06 08:56:06 -03:00
Rémi Verschelde 52e18accf2 Merge pull request #3159 from neikeq/tab_close_icon
Add tab close icon to the default theme
2016-01-06 11:58:52 +01:00
Juan Linietsky e8fbf39f88 -Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
2016-01-03 17:14:28 -03:00
Juan Linietsky 757b8c4206 -Restore mouse on X11 when debugger break happens, closes #2232 2016-01-02 12:58:59 -03:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky 335c52ba03 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-31 00:33:07 -03:00
Juan Linietsky fd836cad27 -Ensure .tscn and .tres always save in a deterministic way, fixes #2495
-Scene edit state is saved outside the scene now, to avoid changes .tscn files when nothing really changed
-Created a VariantWriter helper to unify all variant to text writing
-Moved SceneFormatText writing to VariantWriter
-Moved ConfigFile to use VariantWriter and VariantParser, added compatibility mode for old .cfg files that use engine.cfg format
2015-12-31 00:31:00 -03:00
Ignacio Etcheverry 563c761c8c Add tab close icon to the default theme 2015-12-29 12:09:41 +01:00
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
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
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 13964f59c1 -Added table support to RichTextLabel
-Made help more readable, closes #2851
2015-12-26 10:25:17 -03: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
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
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 e2e6f3ec00 added proper functions to ColorRamp, fixes #3034 2015-12-12 09:45:17 -03:00
Juan Linietsky 46497c4508 added fallbacks proprty to fonts 2015-12-10 23:02:40 -03:00
Franklin Sobrinho afb41b283c Fix tscn format not being recongnized by EditorFileSystem 2015-12-09 13:56:14 -03:00
Juan Linietsky 35fa048af5 missing pngs 2015-12-04 10:22:45 -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
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 1138103c63 Fix shader loading, making possible load .shd and .sgp from editor 2015-11-27 21:11:20 -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
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