godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,289 Commits 15 Branches 59 Tags 2.2 GiB
46c5fda91d
Commit Graph

685 Commits

Author SHA1 Message Date
eska
ca7cfa9b4c Add all collision shapes to a tile when converting scenes to TileSets 2015-10-25 23:13:46 +01:00
neikeq
cf995d5f07 Tooltip for the Inspector's history button 2015-10-25 18:00:29 +01:00
Julian Murgia - StraToN
d64c89d447 Fix #2623 2015-10-22 00:23:42 +02:00
Juan Linietsky
35959f9c5a -fixes to ring buffer (fixes network error) 
-fixes to invalid disabling of commands on scene tree dock
 2015-10-21 16:52:43 -03:00
firefly2442
96cff3a73b when creating project, save icon using resource location by default 2015-10-21 14:28:23 -05: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
b5011d9bf1 -Fixes on atlas import to save memory if mipmaps are not used 
-Make the video memory visible to improve debugging
 2015-10-20 19:19:19 -03:00
Ovnuniarchos
0f0dc1a5d3 BBCode is now allowed anywhere in the inline documentation. 2015-10-20 17:41:27 +02:00
firefly2442
ad362fbc58 projects in the editor_settings.xml that are no longer found on disk will be removed 2015-10-19 23:14:02 -05:00
MarianoGNU
6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
firefly2442
0a45fb6311 duplicate conditional check 2015-10-18 20:50:32 -05:00
Franklin Sobrinho
ec394950ff Change MeshInstanceEditor outline dialog "Ok" button label 2015-10-18 15:13:17 -03:00
Franklin Sobrinho
abde648e68 Small fixes in some editor dialogs 2015-10-18 13:31:44 -03:00
Juan Linietsky
884d5a0f41 -remove path after inheriting, fixes #2616 2015-10-17 20:55:12 -03:00
Juan Linietsky
fba1842b11 -Propertly restrict renaming of nodes in inherited scenes, fixes #2615 2015-10-17 18:43:52 -03:00
Juan Linietsky
36c874cc45 remove unpexpected revert button, fixes #2614 2015-10-17 18:28:36 -03:00
Juan Linietsky
408c498446 -Added const to a reference, should fix #2613 2015-10-17 17:13:49 -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
Juan Linietsky
6f9631fc51 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 12:48:47 -03:00
Juan Linietsky
7d33895320 Merge pull request #2053 from rodolforg/fix-import-button-label 
Small fix for Import Game dialog labels
 2015-10-17 12:13:33 -03:00
Juan Linietsky
474c72697d Merge pull request #2250 from PeaceSells50/AddedGridMapSettings 
Added GridMap settings which allows the user to enter a pick distance.
 2015-10-17 12:11:13 -03:00
Juan Linietsky
52cc8e6ead Merge pull request #2357 from volzhs/prevent-to-change-tool-mode 
prevent to change tool mode when control key is pressed
 2015-10-17 10:52:50 -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
b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars 
ran cppcheck, found unused variables
 2015-10-17 10:25:36 -03:00
Juan Linietsky
5a14b89c32 Merge pull request #2488 from slapin/remove-unimplemented-exporter-option 
Remove of use_exclude_ctrl_bones option
 2015-10-17 10:11:55 -03:00
Juan Linietsky
f4e93a5137 Merge pull request #2549 from shackra/docdump-openproj 
Documentation Converter from XML to Open Project wiki markup format
 2015-10-17 10:05:31 -03:00
Juan Linietsky
e64874fe20 Merge pull request #2555 from jackmakesthings/class-reference-formatting 
Readability improvements for the in-game class reference
 2015-10-17 10:04:51 -03:00
Juan Linietsky
0b5ac93875 Merge pull request #2569 from TheHX/issue_2567 
Fix bug in EditorPlugin::add_custom_control
 2015-10-17 09:49:00 -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
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
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
reduz
aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
Jorge Araya Navarro
613962d48a Minor changes: Organizing imports 2015-10-07 13:24:52 -06:00
Jorge Araya Navarro
0fb91ef95b Minor changes 2015-10-07 13:15:28 -06:00
Jorge Araya Navarro
68d005760b Internationalization implemented 
Specify which language you want the templates translate to with the
`--language` option and any choice language available. By default
English is used. When class_list.xml is translated to different language
than English this option will be useful to make the template language
match.
 2015-10-07 13:11:17 -06:00
Jorge Araya Navarro
7c843fbc04 Refactoring some strings and ordering imports 2015-10-06 19:50:55 -06:00
Franklin Sobrinho
a609a567ea Fix bug in EditorPlugin::add_custom_control, fixes #2567 2015-10-04 08:29:19 -03:00
George Marques
6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
Juan Linietsky
e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing) 
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
 2015-10-01 16:25:36 -03:00
Jack Gold
f36d0fe4c5 Small readability fixes for the in-game class reference - fixes #2515 and #2393 (text spacing and top/left padding for the text area, respectively). 2015-09-29 22:38:23 -04: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
Jorge Araya Navarro
7a008afc67 XML to Open Project Wiki implemented 2015-09-27 19:25:13 -06:00
Jorge Araya Navarro
f95f099eb2 Adding the new Python file 
This script works different compared to the other, for instance, it
requires Python 3.x to run. It also have more sophisticate flags to
run. And finally this file conforms to PEP8.

This script is not finished yet, though.
 2015-09-26 23:55:00 -06: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
Bojidar Marinov
38a5e023af Fix a bug with doctool (" >") 
Please test, this was made from GitHub GUI, so couldn't test it myself.
 2015-09-23 17:16:39 +03:00
Juan Linietsky
83d9a692be Ability to visually debug geometry visually: 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
 2015-09-20 13:03:46 -03:00
Sergey Lapin
4210d5e459 Remove of use_exclude_ctrl_bones option 
use_exclude_ctrl_bones option is not implemented.
This option is supposed to filter-out unneeded skeleton bones.
This option was never implemented (in repository) and confuses
users that feature exists.
This commit removes this option as this option implementation
is not happenning any time soon and claim it exists
confuses users into thinking the feature is supported.

Closes #2476
 2015-09-18 12:52:34 +03:00
firefly2442
afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
Juan Linietsky
889d21e004 Merge pull request #2352 from xodene/patch-6/script-file-new 
Add "New" script button to Script Editor Popup Menu
 2015-09-16 09:55:10 -03:00
George Marques
1add3b3dac
Set AnimationEditor UndoRedo reference on creation 
Fix #2418
 2015-09-13 16:21:09 -03:00
Juan Linietsky
3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky
0fb7b5aa0c HTML5 exporter Improvements 
-Better template handling
-Voice support
-Stream support
 2015-09-10 00:10:54 -03:00
Juan Linietsky
9741374617 Rewrite of the AudioStream API 
-Fixes long-standing issues regarding to playing a single stream multiple times simultanteously
-Fixes wrong-looping, starting, caching, etc. Issues resulting from bad original design
-Allows more interesting kinds of streams (stream graphs with streams inside streams!) in the future
 2015-09-09 18:50:52 -03:00
Peace Sells
fca36207e3 Fixed bug with adding an instance from the FIleSystem dialog. 2015-09-07 19:55:47 -06:00
Franklin Sobrinho
b3e60585c2 Possible fix for issue #2113 
* closes #2113
 2015-09-07 10:13:29 -03:00
Franklin Sobrinho
d6aed94651 Fix for issue #2117 2015-09-07 08:20:33 -03:00
Juan Linietsky
b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky
688047a4c9 -removed resources dock, good bye old friend 2015-09-01 00:49:47 -03:00
Juan Linietsky
cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Mariano Javier Suligoy
553edf1f25 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	scene/gui/spin_box.cpp
#	scene/gui/tree.cpp
 2015-08-30 19:39:36 -03:00
Mariano Javier Suligoy
680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -03:00
Juan Linietsky
cb6839c5c1 make moving up&down items from the autoload list work 2015-08-30 17:48:29 -03:00
Juan Linietsky
947b283248 -fix compile issue (pow) 
-ask user for track to call nodes when adding call track
 2015-08-30 10:10:51 -03:00
Mariano Javier Suligoy
c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
 2015-08-30 02:48:45 -03:00
Mariano Javier Suligoy
a19a653e2c Compile shaders using default values. 2015-08-30 02:44:49 -03:00
Juan Linietsky
1bad27e1f8 -Properly keep animation editor and viewport state while switching scene tabs 2015-08-29 22:59:25 -03:00
Mariano Javier Suligoy
ea448cb779 Edit default values. WARNING!!! 
Do not merge these changes, default values are not compiled into shaders yet!
 2015-08-29 21:09:11 -03:00
Juan Linietsky
b4acd18f32 -display/emulate_touchscreen now really emulates a touchscreen 
-icons to show node menus
 2015-08-29 17:16:11 -03:00
Juan Linietsky
1fecba6b5b -added hints to sprite v/hframes, fixes truncation problem 
-removed an error being printed often unnecesarly about missing child
 2015-08-29 13:02:56 -03:00
Juan Linietsky
b0be30d9ef make sure array is created if not existing, as noted by Guilherme Felipe 2015-08-25 23:09:41 -03:00
Juan Linietsky
d50921b550 Show documentation for properties on hover. 
This works if the property has been documented (about half are at this point)
 2015-08-25 23:00:11 -03:00
Juan Linietsky
04cb3c9eb1 Ability to edit all kinds of arrays from the property editor. 
Yes, I'm trying to convince you to test the alpha release by adding all these now :)
 2015-08-25 20:45:51 -03:00
Mariano Javier Suligoy
cbf05355ed Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-25 18:33:21 -03:00
Juan Linietsky
eff2931b2a Multiple, simultaneous node editing spuport!! 
..but will you be brave enough to try it? :)
 2015-08-25 00:08:45 -03:00
Mariano Javier Suligoy
54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -03:00
Juan Linietsky
0d77277a86 missing type icon 2015-08-24 09:40:48 -03:00
Juan Linietsky
5850b6b58a beautiful visual menu to change anchors 
will you dare to try it? :)
because, I'd check previous commit msgs if I were you..
 2015-08-24 01:00:39 -03:00
Juan Linietsky
4b40f9228b Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-23 20:22:08 -03:00
Juan Linietsky
07e9741425 **WARNING BEFORE PULLING** 
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
 2015-08-23 20:15:56 -03:00
Julian Murgia - StraToN
17fbd20673 Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy. 2015-08-18 20:27:01 +02:00
Alexander Holland
f6eff87793 update scene tabs on save - fix 2015-08-12 22:35:37 +02:00
volzhs
edabbcd064 remove shift key check because shift + v in use with tool mode 2015-08-11 22:52:43 +09:00
volzhs
80943d77a4 prevent to change tool mode when control or shift key is pressed 2015-08-11 22:39:59 +09:00
Maximillian
bc9952f1c7 Fix create script dialog title(s) 2015-08-09 16:55:59 -07:00
Maximillian
8f83f6c675 Add create new script button to script editor menu 2015-08-09 16:39:59 -07:00
neikeq
d097d1081d Hide right_r dock slots by default 2015-08-09 21:59:13 +02:00
Mariano Javier Suligoy
3a83337420 Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-09 16:33:02 -03:00
Juan Linietsky
b3dff195e0 Merge pull request #2316 from StraToN/clearconsole 
Clear output console (Button + clear on Play)
 2015-08-08 11:07:36 -03:00
Juan Linietsky
9d185ccc30 -Merged the file server with the live editing and remote debug 
-It is now really easy to deploy an android build with debug, and debug it
 2015-08-06 02:37:40 -03:00
Juan Linietsky
8280bb0de0 more debugger fixes 
-setting/clearing breakpoints during run-time now works
-multi-line strings resulted in wrong line numbers in bytecode, fixed
 2015-08-04 20:17:39 -03:00
Juan Linietsky
d1da2c2995 error debugger 
shows the list of errors that happened during running the game, traces
can be analyzed
 2015-08-04 09:47:32 -03:00
Mariano Javier Suligoy
c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Juan Linietsky
cbee679bd7 live debug fixes 
removing node in live debugging fixed
 2015-08-02 20:28:10 -03:00
Juan Linietsky
59961c9914 Live edit WORK IN PROGRESS 
1) press the heart while the game is running
2) select a scene to live edit from the opened scenes
3) edit/add/remove nodes or resources, change their properties, etc.
4) watch changes reflected in running game, in all places this scene is
edited
5) It's not perfect obviously, but the aim of it is to try to reflect
your changes as best as possible in the running game.
 2015-08-02 12:30:01 -03:00
Julian Murgia - StraToN
e6a711282a Damnit, forgot one more debug line >< 2015-07-30 00:10:21 +02:00
Julian Murgia - StraToN
6e608bd499 forgot to remove a method declaration... 2015-07-30 00:08:11 +02:00
Julian Murgia - StraToN
c5941ab57a include not necessary anymore 2015-07-30 00:05:37 +02:00
Julian Murgia - StraToN
4ad590b92f Added automatic clear output on Play in Godot Settings 2015-07-30 00:03:25 +02:00
Julian Murgia - StraToN
f46e340ab5 Added "Clear" button top right of output debug console in editor 2015-07-29 00:41:24 +02:00
Juan Linietsky
ed85339bcb Merge pull request #2248 from romulox-x/colladaImagePath 
fixed image path problem in bettercollada
 2015-07-27 22:21:53 -03:00
Mariano Javier Suligoy
d7279ddaf2 Delete selected nodes with the Delete key 2015-07-26 21:57:27 -03:00
Juan Linietsky
07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy
add0105c4e Little fix: don't create an empty undo/redo command when trying to add a second Input GraphNode 2015-07-25 22:05:45 -03:00
Mariano Javier Suligoy
5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Juan Linietsky
d50ebbb441 -added icons for root node types on tabs 2015-07-24 14:18:02 -03:00
blackwc
31fa1bb8bd Improve export validation 2015-07-22 12:51:17 -04:00
Mariano Javier Suligoy
2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Mariano Javier Suligoy
bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -03:00
Mariano Javier Suligoy
5b71fc45b7 Use popup menu to add new nodes to the shader graph editor in the last clicked location. 2015-07-16 22:38:12 -03:00
Peace Sells
a009fadfff Added GridMap settings which allows the user to enter a pick distance. 2015-07-09 20:51:49 -06:00
romulox_x
1efeb8b956 when copy images enabled, 'images' path prefix was only being written to file if the destination file didn't exist. so it only worked the first time. 2015-07-09 17:34:12 -07:00
Juan Linietsky
95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources. 
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
 2015-06-29 00:29:49 -03:00
Juan Linietsky
a67486a39e improved get_node(), connect(), etc code completion. 
-properly completes text arguments
-includes the "/root" autoloads
 2015-06-26 01:14:49 -03:00
Juan Linietsky
29b2e811f6 added a tiny bit more space to docks and script tab 2015-06-24 18:57:14 -03:00
Juan Linietsky
30a94bcc9f fix connection dialog bug 2015-06-24 18:26:34 -03:00
Juan Linietsky
48f1d02da4 added ability to define signals in script 
closes #2175
 2015-06-24 13:29:45 -03:00
Franklin Sobrinho
5688b6157f CollisionShape2D visual editor 2015-06-23 12:20:34 -03:00
Juan Linietsky
8b61a3c358 Merge pull request #1907 from tommy3/show-hidden-files 
set initial flag 'show_hidden_files' for file dialogs in project manager initialization
 2015-06-23 00:01:55 -03:00
Juan Linietsky
5092cc46b4 Merge pull request #2070 from Krzycho666/AnimationPlayer_fix 
Animation player set_steps fix
 2015-06-22 23:57:28 -03:00
Juan Linietsky
6154cff93f Merge pull request #2101 from sanikoyes/Pr-script-editor-save-state 
Pr-Script editor
 2015-06-22 23:54:04 -03:00
Juan Linietsky
8f9f03e374 Merge pull request #2132 from gber/master 
Fix typo that produced invalid markup for images
 2015-06-22 23:45:21 -03:00
Juan Linietsky
29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix 
added GDscript bidings for UndoRedo class
 2015-06-22 23:42:13 -03:00
Franklin Sobrinho
0159cecd69 Small fixes for Grid/Tile map editor palette 2015-06-22 11:10:13 -03:00
Franklin Sobrinho
d68a33b473 Grid/Tile map editor new item palette 2015-06-22 10:05:03 -03:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE* 
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
 2015-06-22 00:04:15 -03:00
krzycho
d65455185a - added GDscript bidings for UndoRedo class mechanizm 
- registered UndoRedo
 2015-06-21 22:23:09 +02:00
Guido Berhoerster
acbaefcc02 Fix typo that produced invalid markup for images 2015-06-20 14:47:06 +02:00
Juan Linietsky
37af8b4136 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-16 16:39:20 -03:00
Juan Linietsky
669f5c994b fix "v" pivot adjust function 2015-06-16 16:15:01 -03:00
sanikoyes
14cd70faf3 Script editor: restore line/column after script reload 2015-06-16 15:15:10 +08:00
Juan Linietsky
f2a29aadc6 fixed small refresh issue when moving docks 2015-06-14 01:09:58 -03:00
Juan Linietsky
7674bad6c4 fixes for dock motion 2015-06-14 00:41:08 -03:00
Juan Linietsky
8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky
edf1f27118 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-13 22:14:36 -03:00
Juan Linietsky
9a58960d28 some editor window changes 
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
 2015-06-13 22:12:53 -03:00
Juan Linietsky
8945670bc0 made changing pivot simpler in 2D nodes (just press v with mouse over position) 2015-06-12 13:53:18 -03:00
krzycho
2287d030a2 fixed problem with crashing godot when changing number of steps while no animation added 2015-06-11 14:39:50 +02:00
Rodolfo Ribeiro Gomes
310f061a4a Small fix for Import Game dialog labels 2015-06-08 23:19:52 -03:00
Juan Linietsky
0351e3ae17 Merge pull request #2023 from TheJosh/dae-exporter-assimp 
Fix Blender DAE exporter - files are unreadable by Assimp
 2015-06-07 00:30:07 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp 
Replace color phases with color ramp for Particles2D. (need some review/guidance)
 2015-06-07 00:26:35 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues 
-fixed deadlock on previews thread
-fixed compilation errors on unix
 2015-06-06 22:06:58 -03:00
Juan Linietsky
6974823288 Merge remote-tracking branch 'origin/master' 
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
 2015-06-06 10:12:09 -03:00